From: Mirio Date: Thu, 28 Feb 2019 22:23:51 +0000 (+0100) Subject: Hopefully final jumppad fix X-Git-Tag: xonotic-v0.8.5~60 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=05b9e38f8bfe7e4836008d7f9a0326ca575c0751 Hopefully final jumppad fix --- diff --git a/maps/atelier.map b/maps/atelier.map index f9bfc691..4c604f6f 100644 --- a/maps/atelier.map +++ b/maps/atelier.map @@ -28125,7 +28125,7 @@ exx/wall-metal01 } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "1452.000000 428.000000 320.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "angle" "-45.000008" diff --git a/maps/atelier.map.options b/maps/atelier.map.options index a89233e0..424842ec 100644 --- a/maps/atelier.map.options +++ b/maps/atelier.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 6d \ No newline at end of file +Version: 6e \ No newline at end of file diff --git a/maps/courtfun.map b/maps/courtfun.map index d7141bea..8429737f 100644 --- a/maps/courtfun.map +++ b/maps/courtfun.map @@ -27926,7 +27926,7 @@ map_courtfun/screenanim_xon "origin" "-672.000000 152.000000 352.000000" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "1632.000000 352.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -27934,7 +27934,7 @@ map_courtfun/screenanim_xon "solid" "4" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "96.000000 2360.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -27942,7 +27942,7 @@ map_courtfun/screenanim_xon "solid" "4" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-224.000000 -736.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -27950,7 +27950,7 @@ map_courtfun/screenanim_xon "solid" "4" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "1632.000000 -736.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -27958,7 +27958,7 @@ map_courtfun/screenanim_xon "solid" "4" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-224.000000 352.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -31281,7 +31281,7 @@ map_courtfun/screenanim_xon "angle" "-179.999985" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-5728.000000 3616.000244 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -31290,7 +31290,7 @@ map_courtfun/screenanim_xon "angle" "-179.999985" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-4192.000000 1608.000244 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -31299,7 +31299,7 @@ map_courtfun/screenanim_xon "angle" "-179.999985" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-3872.000000 4704.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -31308,7 +31308,7 @@ map_courtfun/screenanim_xon "angle" "-179.999985" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-5728.000000 4704.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -31317,7 +31317,7 @@ map_courtfun/screenanim_xon "angle" "-179.999985" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-3872.000000 3616.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -35087,7 +35087,7 @@ map_courtfun/screenanim_xon } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-1664.000000 2640.000000 320.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "modelscale" "2.000000" diff --git a/maps/courtfun.map.options b/maps/courtfun.map.options index dd245d04..64bd4a2c 100644 --- a/maps/courtfun.map.options +++ b/maps/courtfun.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 13b \ No newline at end of file +Version: 13c \ No newline at end of file diff --git a/maps/dance.map b/maps/dance.map index aae64cbe..16ddc12a 100644 --- a/maps/dance.map +++ b/maps/dance.map @@ -21688,7 +21688,7 @@ effects_jumppad/jumppadfx1_a "origin" "-1792.000000 -1088.000000 -256.000000" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "32.000000 -1504.000000 -324.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "_castshadows" "1" @@ -22055,7 +22055,7 @@ effects_jumppad/jumppadfx1_a "light" "142" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-32.000000 1504.000000 -324.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "_castshadows" "1" diff --git a/maps/dance.map.options b/maps/dance.map.options index d77489bd..bd71a837 100644 --- a/maps/dance.map.options +++ b/maps/dance.map.options @@ -3,4 +3,4 @@ -light + -bounce 8 -dirtscale 2 -gamma 0.7 -minimap + -sRGB -Version: 8b \ No newline at end of file +Version: 8c \ No newline at end of file diff --git a/maps/drain.map b/maps/drain.map index 3ecc1521..bd1269d5 100644 --- a/maps/drain.map +++ b/maps/drain.map @@ -9808,7 +9808,7 @@ trak5x/base-pipe1d "_castshadows" "0" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "223.999985 351.999939 128.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "angle" "-44.606369" @@ -10326,7 +10326,7 @@ trak5x/base-pipe1d "origin" "-752.000000 -1232.000000 -96.000000" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-940.000000 -1180.000000 -240.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "2" diff --git a/maps/drain.map.options b/maps/drain.map.options index 92082da0..1d5bb911 100644 --- a/maps/drain.map.options +++ b/maps/drain.map.options @@ -4,4 +4,4 @@ -light + -gamma 0.75 -dirtscale 2 -bounce 8 -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128 -minimap + -sRGB -Version: 15b \ No newline at end of file +Version: 15c \ No newline at end of file diff --git a/maps/implosion.map b/maps/implosion.map index cc21c5b3..39a307d5 100644 --- a/maps/implosion.map +++ b/maps/implosion.map @@ -78396,62 +78396,62 @@ exomorphx/base-metal02 "angle" "180.000000" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "704.000000 -3456.000000 632.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "angle" "105.206871" +"scale" "2" "skin" "0" -"modelscale" "2" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "1048.000000 -928.000000 256.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" } { -"classname" "misc_model" -"origin" "-640.000000 -2048.000000 0.000000" +"classname" "misc_gamemodel" +"origin" "-648.000000 -2048.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "128.000000 -1152.000000 -384.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "2208.000000 -2944.000000 -400.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "5" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "4288.000000 -4736.000000 -384.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "3360.000000 -4960.000000 256.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "5056.000000 -3840.000000 0.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "3712.000244 -2424.000000 632.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "angle" "-73.246773" +"scale" "2" "skin" "1" -"modelscale" "2" } { "classname" "light" @@ -78976,7 +78976,7 @@ exomorphx/base-metal02 "targetname" "t2" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "4384.000000 -1664.000000 -4.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -79000,7 +79000,7 @@ exomorphx/base-metal02 "angle" "180.000000" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "32.000000 -4224.000000 -4.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "angle" "-179.999985" @@ -79103,7 +79103,7 @@ exomorphx/base-metal02 "targetname" "t13" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-704.000000 -3072.000000 -384.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -79133,7 +79133,7 @@ exomorphx/base-metal02 "angle" "-179.999985" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "5120.000000 -2816.000000 -384.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "angle" "-179.999985" @@ -79425,20 +79425,20 @@ exomorphx/base-metal02 } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "1663.999878 -2944.000000 -384.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "angle" "-86.101440" "skin" "0" -"modelscale" "2" +"scale" "2" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "2752.000000 -2944.000244 -384.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "angle" "94.612640" "skin" "1" -"modelscale" "2" +"scale" "2" } { "classname" "trigger_push" diff --git a/maps/implosion.map.options b/maps/implosion.map.options index 88a8d709..d68ef86b 100644 --- a/maps/implosion.map.options +++ b/maps/implosion.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 4b \ No newline at end of file +Version: 4c \ No newline at end of file diff --git a/maps/leave_em_behind.map b/maps/leave_em_behind.map index 9c801d5e..c8b0f55d 100644 --- a/maps/leave_em_behind.map +++ b/maps/leave_em_behind.map @@ -10186,7 +10186,7 @@ exx/trim-simple01 "target" "trigger_race_checkpoint1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-1424.000000 -528.000000 64.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "3" @@ -10196,7 +10196,7 @@ exx/trim-simple01 "_cs" "1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-1184.000000 560.000000 64.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.750000" @@ -10205,7 +10205,7 @@ exx/trim-simple01 "_cs" "1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "1424.000000 528.000000 64.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "3" diff --git a/maps/leave_em_behind.map.options b/maps/leave_em_behind.map.options index 439cd93d..52e8d973 100644 --- a/maps/leave_em_behind.map.options +++ b/maps/leave_em_behind.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 8a \ No newline at end of file +Version: 8b \ No newline at end of file diff --git a/maps/space-elevator.map b/maps/space-elevator.map index 05cacb2d..a001f593 100644 --- a/maps/space-elevator.map +++ b/maps/space-elevator.map @@ -28912,7 +28912,7 @@ trak5x/base-pipe1c "origin" "-224.000000 0.000000 -512.000000" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "384.000000 -2320.000000 -128.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -28920,7 +28920,7 @@ trak5x/base-pipe1c "skin" "0" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-384.000000 -2320.000000 -128.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -28928,7 +28928,7 @@ trak5x/base-pipe1c "skin" "0" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "144.000000 -3520.000000 320.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -28951,7 +28951,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-144.000000 -3520.000000 320.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -28963,7 +28963,7 @@ trak5x/base-pipe1c "angle" "-179.999985" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-383.999878 -752.000122 -128.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -28971,7 +28971,7 @@ trak5x/base-pipe1c "skin" "0" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "384.000000 -751.999756 -128.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -29009,7 +29009,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-383.999878 -240.000122 384.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -29017,7 +29017,7 @@ trak5x/base-pipe1c "skin" "0" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "384.000000 -239.999756 384.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -29860,7 +29860,7 @@ trak5x/base-pipe1c "origin" "216.000000 96.000000 -496.000000" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-384.000122 2320.000000 -128.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -29868,7 +29868,7 @@ trak5x/base-pipe1c "skin" "1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "383.999878 2320.000000 -128.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -29876,7 +29876,7 @@ trak5x/base-pipe1c "skin" "1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-143.999939 3520.000000 320.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -29901,7 +29901,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "144.000061 3520.000000 320.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -29914,7 +29914,7 @@ trak5x/base-pipe1c "angle" "0.000016" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "384.000000 752.000000 -128.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -29922,7 +29922,7 @@ trak5x/base-pipe1c "skin" "1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-384.000000 752.000000 -128.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -29960,7 +29960,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "384.000000 240.000000 384.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -29968,7 +29968,7 @@ trak5x/base-pipe1c "skin" "1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-383.999756 240.000000 384.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "frame" "2" @@ -30474,7 +30474,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-448.000000 -192.000000 -128.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -30493,7 +30493,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "448.000000 -192.000000 -128.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -30512,7 +30512,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "0.000000 -560.000000 -448.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "0" @@ -30549,7 +30549,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "448.000031 191.999969 -128.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -30568,7 +30568,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "-447.999969 191.999969 -128.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" @@ -30587,7 +30587,7 @@ trak5x/base-pipe1c } } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "0.000000 560.000000 -448.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "skin" "1" diff --git a/maps/space-elevator.map.options b/maps/space-elevator.map.options index 19c397ef..50a73f4d 100644 --- a/maps/space-elevator.map.options +++ b/maps/space-elevator.map.options @@ -3,4 +3,4 @@ -light + -bounce 8 -minimap + -sRGB -Version: 8b +Version: 8c diff --git a/maps/warfare.map b/maps/warfare.map index afd4660d..e77d271d 100644 --- a/maps/warfare.map +++ b/maps/warfare.map @@ -31758,7 +31758,7 @@ exx/base-metal05rust "spawnflags" "6" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "1144.000000 672.000000 190.000000" "model" "models/map_warfare/jumppad.md3" } @@ -31780,7 +31780,7 @@ exx/base-metal05rust "targetname" "jump1" } { -"classname" "misc_model" +"classname" "misc_gamemodel" "origin" "648.000000 -544.000000 190.000000" "model" "models/map_warfare/jumppad.md3" "angle" "-180.000000" diff --git a/maps/warfare.map.options b/maps/warfare.map.options index 0e6e6256..0b5ff288 100644 --- a/maps/warfare.map.options +++ b/maps/warfare.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 9b \ No newline at end of file +Version: 9c \ No newline at end of file