Merge branch 'Spike29/bromine' into 'master'

Bromine: disable the grass shadows + minor fixes

See merge request xonotic/xonotic-maps.pk3dir!179

diff --git a/maps/go.jpg b/maps/go.jpg
index 50e9b21cd53b4e3f9b59641747375a05aae62b91..9b1c26ed95ba0a850687680874a9b05092b57108 100644 (file)
Binary files a/maps/go.jpg and b/maps/go.jpg differ

diff --git a/maps/trident.map b/maps/trident.map
index fc84806fb861bff449b6e023365e2533e969eda5..2ae9c00369a1ae06f1db36adfd03a1bf1cca6c04 100644 (file)
--- a/maps/trident.map
+++ b/maps/trident.map
@@ -4531,9 +4531,9 @@ patchDef2
 trak4x/wall-brick1
 ( 3 3 0 0 0 )
 (
-( ( -1280 -640.0000610352 -127.9999847412 0 0 ) ( -1280 -640.0000610352 159.9999847412 0 -2.2499997616 ) ( -1280 -640.0000610352 448 0 -4.5 ) )
-( ( -1280 -768.0001220703 -127.9999847412 1.0000004768 0 ) ( -1280 -768.0001220703 159.9999847412 1.0000004768 -2.2499997616 ) ( -1280 -768.0001220703 448 1.0000004768 -4.5 ) )
-( ( -1152 -768.0001831055 -127.9999847412 2.0000004768 0 ) ( -1152 -768.0001831055 159.9999847412 2.0000004768 -2.2499997616 ) ( -1152 -768.0001831055 448 2.0000004768 -4.5 ) )
+( ( -1280 -640 -128 0 0 ) ( -1280 -640 160 0 -2.2499997616 ) ( -1280 -640 448 0 -4.5 ) )
+( ( -1280 -768 -128 1.0000004768 0 ) ( -1280 -768 160 1.0000004768 -2.2499997616 ) ( -1280 -768 448 1.0000004768 -4.5 ) )
+( ( -1152 -768 -128 2.0000004768 0 ) ( -1152 -768 160 2.0000004768 -2.2499997616 ) ( -1152 -768 448 2.0000004768 -4.5 ) )
 )
 }
 }
@@ -5301,20 +5301,20 @@ brushDef
 {
 brushDef
 {
-( 265.3917236328 830.2580566406 157.6121673584 ) ( 149.6401062012 837.8451538086 157.6121673584 ) ( 270.729675293 911.6954345703 75.1776123047 ) ( ( 0.00390625 0 1022.6361083984 ) ( 0 0.00390625 0.1510286331 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 342.7615966797 815.2196044922 121.6951904297 ) ( 269.6286621094 905.26171875 121.6951904297 ) ( 378.2313232422 844.0283813477 15.0745849609 ) ( ( 0.00390625 -0.0000000001 1023.2301635742 ) ( 0.0000000001 0.00390625 0.4514823854 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 326.1549682617 825.3137207031 131.6965942383 ) ( 238.0170898438 900.7306518555 131.6965942383 ) ( 362.3658447266 867.6325073242 29.9425354004 ) ( ( 0.0039062495 0.0000000001 1023.0365600586 ) ( 0.0000000001 0.00390625 0.4748261571 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 247.2282104492 799.0852050781 179.3594665527 ) ( 134.6919555664 770.950012207 179.3594665527 ) ( 222.1589355469 899.3583984375 126.7019042969 ) ( ( 0.00390625 0 1022.6357421875 ) ( 0 0.00390625 1023.8109130859 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 370.6288452148 746.0158691406 110.8327789307 ) ( 372.708984375 861.9971923828 110.8327789307 ) ( 405.4560546875 745.3912353516 0.1861572266 ) ( ( 0.00390625 0 0.1496367157 ) ( 0 0.00390625 0.4121494293 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 202.4176635742 848.6323242188 72.3380737305 ) ( 101.735168457 791.0212402344 72.3380737305 ) ( 204.236328125 845.453918457 -43.6041107178 ) ( ( 0.0039062498 -0 1022.7445068359 ) ( 0 0.0039062498 0.0181327835 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 350.7221069336 819.0294799805 62.5718231201 ) ( 279.2119140625 910.3656005859 62.5718231201 ) ( 340.1490478516 810.7514648438 -52.6483306885 ) ( ( 0.00390625 0 1023.250793457 ) ( 0 0.00390625 1023.8657226562 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 277.6628417969 792.2689208984 -157.7557983398 ) ( 169.9220581055 835.2564086914 -157.7557983398 ) ( 238.4716796875 694.04296875 -205.4182739258 ) ( ( 0.0039062498 0.0000000001 1022.7692260742 ) ( -0.0000000002 0.00390625 1023.2241821289 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 268.5412597656 728.9390258789 190.1040039062 ) ( 374.3991699219 776.374206543 190.1040039062 ) ( 315.2011108398 624.8112792969 169.2168121338 ) ( ( 0.00390625 0 1.3058969975 ) ( 0 0.0039062498 0.4408738613 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 361.3139648438 746.27734375 -108.4669342041 ) ( 363.2860717773 862.260559082 -108.4669342041 ) ( 304.8551635742 747.2373046875 -209.7955322266 ) ( ( 0.0039062498 0 0.148358196 ) ( -0 0.00390625 1022.8950195312 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 330.9879150391 778.5114746094 162.520324707 ) ( 285.1815185547 885.0843505859 162.520324707 ) ( 410.4768676758 812.6768188477 85.253036499 ) ( ( 0.00390625 -0.0000000001 1023.5718994141 ) ( 0 0.00390625 0.9790343046 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 265.3917236328 830.2580566406 157.6121673584 ) ( 149.6401062012 837.8451538086 157.6121673584 ) ( 270.729675293 911.6954345703 75.1776123047 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 342.7615966797 815.2196044922 121.6951904297 ) ( 269.6286621094 905.26171875 121.6951904297 ) ( 378.2313232422 844.0283813477 15.0745849609 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 326.1549682617 825.3137207031 131.6965942383 ) ( 238.0170898438 900.7306518555 131.6965942383 ) ( 362.3658447266 867.6325073242 29.9425354004 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 247.2282104492 799.0852050781 179.3594665527 ) ( 134.6919555664 770.950012207 179.3594665527 ) ( 222.1589355469 899.3583984375 126.7019042969 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 370.6288452148 746.0158691406 110.8327789307 ) ( 372.708984375 861.9971923828 110.8327789307 ) ( 405.4560546875 745.3912353516 0.1861572266 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 202.4176635742 848.6323242188 72.3380737305 ) ( 101.735168457 791.0212402344 72.3380737305 ) ( 204.236328125 845.453918457 -43.6041107178 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 350.7221069336 819.0294799805 62.5718231201 ) ( 279.2119140625 910.3656005859 62.5718231201 ) ( 340.1490478516 810.7514648438 -52.6483306885 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 277.6628417969 792.2689208984 -157.7557983398 ) ( 169.9220581055 835.2564086914 -157.7557983398 ) ( 238.4716796875 694.04296875 -205.4182739258 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 268.5412597656 728.9390258789 190.1040039062 ) ( 374.3991699219 776.374206543 190.1040039062 ) ( 315.2011108398 624.8112792969 169.2168121338 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 361.3139648438 746.27734375 -108.4669342041 ) ( 363.2860717773 862.260559082 -108.4669342041 ) ( 304.8551635742 747.2373046875 -209.7955322266 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 330.9879150391 778.5114746094 162.520324707 ) ( 285.1815185547 885.0843505859 162.520324707 ) ( 410.4768676758 812.6768188477 85.253036499 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( 256 800 -64 ) ( 256 864 -64 ) ( 256 800 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 352 768 -64 ) ( 288 768 -64 ) ( 352 768 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 352 64 -128 ) ( 256 64 -128 ) ( 352 -64 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 352 64 -128 ) ( 256 64 -128 ) ( 352 -64 -128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 {
@@ -7607,6 +7607,17 @@ brushDef
 ( 256 -64 256 ) ( 96 64 256 ) ( 256 64 256 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) common/caulk 0 0 0
 }
 }
+{
+brushDef
+{
+( -80 512 856 ) ( -80 512 824 ) ( -80 1280 824 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.0625 ) ) exx/base-metal03 134217728 0 0
+( -80 1024 832 ) ( -16 1024 832 ) ( -80 896 832 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -16 896 840 ) ( -16 896 872 ) ( -16 1024 840 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.0625 ) ) exx/base-metal03 134217728 0 0
+( -80 1120 824 ) ( -16 1184 824 ) ( -80 1184 824 ) ( ( 0.015625 0 118.5 ) ( 0 0.015625 63.75 ) ) phillipk2x/lights-pk02_light01a-surfacelight 134217728 0 0
+( 112 608 840 ) ( 240 608 872 ) ( 240 608 840 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.0625 ) ) exx/base-metal03 134217728 0 0
+( 240 672 840 ) ( 240 672 872 ) ( 112 672 840 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.0625 ) ) exx/base-metal03 134217728 0 0
+}
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -9155,23 +9166,23 @@ brushDef
 {
 brushDef
 {
-( 240 240 92 ) ( 240 240 -164 ) ( 240 -16 92 ) ( ( 0.125 -0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
-( 240 300 196 ) ( 240 308 196 ) ( 232 308 196 ) ( ( 0.125 -0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
-( 232 308 204 ) ( 232 308 196 ) ( 240 308 196 ) ( ( 0.125 -0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
-( 232 300 196 ) ( 232 308 196 ) ( 232 308 204 ) ( ( 0.125 -0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
+( 240 240 92 ) ( 240 240 -164 ) ( 240 -16 92 ) ( ( 0.125 0 -0.5 ) ( -0 0.0078125 0.65625 ) ) exx/trim-vert01 134217728 0 0
+( 240 300 196 ) ( 240 308 196 ) ( 232 308 196 ) ( ( 0.125 0 -0.5 ) ( -0 0.0078125 0.109375 ) ) exx/trim-vert01 134217728 0 0
+( 232 308 204 ) ( 232 308 196 ) ( 240 308 196 ) ( ( 0.125 0 -0 ) ( -0 0.0078125 0.65625 ) ) exx/trim-vert01 134217728 0 0
+( 232 300 196 ) ( 232 308 196 ) ( 232 308 204 ) ( ( 0.125 0 -0.5 ) ( -0 0.0078125 0.65625 ) ) exx/trim-vert01 134217728 0 0
 ( 240 308 204 ) ( 240 300 204 ) ( 232 300 204 ) ( ( 0.125 -0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
-( 240 300 204 ) ( 240 300 196 ) ( 232 300 196 ) ( ( 0.125 -0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
+( 240 300 204 ) ( 240 300 196 ) ( 232 300 196 ) ( ( 0.125 0 -0 ) ( -0 0.0078125 0.65625 ) ) exx/trim-vert01 134217728 0 0
 }
 }
 {
 brushDef
 {
-( 452 256 292 ) ( 452 256 548 ) ( 452 0 292 ) ( ( 0.125 -0 -0.5 ) ( 0 0.0078125 0.15625 ) ) exx/trim-vert01 134217728 0 0
+( 452 256 292 ) ( 452 256 548 ) ( 452 0 292 ) ( ( 0.125 0 -0.5 ) ( -0 0.0078125 0.15625 ) ) exx/trim-vert01 134217728 0 0
 ( 452 324 396 ) ( 452 316 396 ) ( 460 316 396 ) ( ( -0.125 0 0.5 ) ( 0 -0.0078125 509.65625 ) ) exx/trim-vert01 134217728 0 0
-( 460 316 404 ) ( 460 316 396 ) ( 452 316 396 ) ( ( 0 -0.1249998808 27.5000419617 ) ( 0.0078125 0.00000001 509.65625 ) ) exx/trim-vert01 134217728 0 0
-( 460 324 396 ) ( 460 316 396 ) ( 460 316 404 ) ( ( 0 -0.124999702 27.5001125336 ) ( -0.00781248 0.00000004 2.1563103199 ) ) exx/trim-vert01 134217728 0 0
+( 460 316 404 ) ( 460 316 396 ) ( 452 316 396 ) ( ( 0.125 0 -0.5 ) ( -0 0.0078125 0.15625 ) ) exx/trim-vert01 134217728 0 0
+( 460 324 396 ) ( 460 316 396 ) ( 460 316 404 ) ( ( 0.125 0 -0.5 ) ( -0 0.0078125 0.15625 ) ) exx/trim-vert01 134217728 0 0
 ( 460 324 404 ) ( 460 316 404 ) ( 452 316 404 ) ( ( -0.125 0 0.5 ) ( 0 0.0078125102 509.65625 ) ) exx/trim-vert01 134217728 0 0
-( 452 324 404 ) ( 452 324 396 ) ( 460 324 396 ) ( ( 0 -0.125 27.5 ) ( -0.0078125 0 509.65625 ) ) exx/trim-vert01 134217728 0 0
+( 452 324 404 ) ( 452 324 396 ) ( 460 324 396 ) ( ( 0.125 -0 -0.5 ) ( -0 -0.0078125 0.96875 ) ) exx/trim-vert01 134217728 0 0
 }
 }
 {
@@ -9352,12 +9363,12 @@ brushDef
 {
 brushDef
 {
-( 240 308 196 ) ( 240 300 196 ) ( 232 308 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 240 308 196 ) ( 232 308 196 ) ( 240 308 188 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 240 308 196 ) ( 240 308 188 ) ( 240 300 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 232 300 188 ) ( 240 300 188 ) ( 232 308 188 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 232 300 188 ) ( 232 300 196 ) ( 240 300 188 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 232 300 188 ) ( 232 308 188 ) ( 232 300 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 240 308 196 ) ( 240 300 196 ) ( 232 308 196 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 240 308 196 ) ( 232 308 196 ) ( 240 308 188 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 240 308 196 ) ( 240 308 188 ) ( 240 300 196 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 232 300 188 ) ( 240 300 188 ) ( 232 308 188 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 232 300 188 ) ( 232 300 196 ) ( 240 300 188 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 232 300 188 ) ( 232 308 188 ) ( 232 300 196 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 }
@@ -9381,3 +9392,8 @@ brushDef
 "classname" "item_health_big"
 "origin" "928.000000 64.000000 0.000000"
 }
+{
+"classname" "light"
+"origin" "-48.000000 640.000000 816.000000"
+"light" "500"
+}

diff --git a/maps/trident.map.options b/maps/trident.map.options
index ad7793918e4bb0f4ef134568a98f2c30337f47c9..77ef8396ebce20ed4a92151e2cc71f479025f202 100644 (file)
--- a/maps/trident.map.options
+++ b/maps/trident.map.options
@@ -3,4 +3,4 @@
 -light + -bounce 8
 -minimap +
 -sRGB
-Version: 1a
+Version: 1c