Squashed commit of the following:
authorRudolf Polzer <divverent@alientrap.org>
Fri, 14 Jan 2011 05:53:40 +0000 (06:53 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 14 Jan 2011 05:53:40 +0000 (06:53 +0100)
commit3fdeff0fc4ab67a00e6425d00f25734a22975dff
tree483e1c53804c5c13bec317609d2c46c39596d676
parentb72676508614c6ec9a3cf93e6d54072fe937cb99
Squashed commit of the following:

commit 6c08d17afadaab2ee4ef745a7f15878b3ef12507
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Jan 13 17:50:44 2011 +0100

    Modified mapimage and map description.

commit 2752dba0231bb069a4666b83d83b612dfd9ae71c
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Wed Jan 12 01:20:17 2011 +0100

    Fixed screen shaders, should blur not pixelate. Also, reworked all func_door entities to fonc_wall should generate less traffic and more FPS (might not be noticable).

commit c350a9a68e68344988dc4fb6e0e9882db00cc479
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Jan 2 19:01:57 2011 +0100

    Compile it lol

commit a134a2b004fbaa22c9fe7d16856ae615c016b3b8
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Jan 2 18:51:42 2011 +0100

    Modified mapimage

commit 7fdcd0acd778284f05f771bebaaf3a90a41d4939
Merge: 95e66f6 b726765
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Jan 2 18:40:35 2011 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit 95e66f65d29564e262e72a35f747e8e4af055bb9
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Wed Dec 8 00:03:35 2010 +0100

    Fixed a small brush issue. Bugs, bugs, when will I crush all of them?

commit 793ecbadf42aab6c04d0954b2a3e8cd2f4492dee
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Dec 6 22:32:35 2010 +0100

    Simplified trigger connections, and made the centerprint messages team dependent.

commit b06ac1cd84d3f4b7186ec79cd397f71120bbf38a
Merge: 9b0e802 d518789
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Dec 6 18:21:00 2010 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into cbrutail/map-space_ctf

commit 9b0e8025ac94a641bee9c0c40eea570969f051a7
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Dec 6 01:25:10 2010 +0100

    Rails, rails, and even more rails. With the previous commits in mind, I don't think I can make the map even more user friendly.

commit 6b74e7ee24a1e3ae32f79b7f8d8b3fc21dc180e2
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Dec 6 01:08:16 2010 +0100

    Moved the screens so they are more visible. Added sounds for deactivations.

commit 5ed22ee50c95d952674c157d4d45b5b52c96084c
Merge: 612b750 d46183b
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Dec 5 19:21:25 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit 612b75089803e04d011636116130f9946d596fdb
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Dec 5 18:31:33 2010 +0100

    Trying to add sounds for electric arcs.

commit d744dd148d41dd61c6387b447688ea5bb3839585
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Dec 5 16:46:27 2010 +0100

    dunno, but I need this :P

commit 5f06ef9f265c3e5165571e9889da6ecb83a820f3
Merge: aaa5e99 96fbd27
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Dec 5 16:35:41 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit aaa5e998bab6fef6c101306fcd070fe1972e11be
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Dec 5 14:02:50 2010 +0100

    Fixed all jumppad/launchpad models, and added some ambient sound.

commit f25199fc3680da115749483323aff59f10429997
Merge: 7beabf8 b78699a
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Dec 4 23:53:45 2010 +0100

    Merge branch 'cbrutail/lodmodelsfix01' into cbrutail/map-space_ctf

commit b78699a65bee1fa5653c9bef49e325c930215897
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Dec 4 23:51:28 2010 +0100

    Fixed red/blue glowmap a bit, and added textures/skin files for all color variants

commit 7beabf8f16cbd9aa6d4515ba48cc99125cbfcb97
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Dec 4 22:11:19 2010 +0100

    According to suggestions, changed jumppad and launchramp colors. Also, made a centerprint message. Fixed texture issues.
    Recoloring not ready, I have to make lodded jumppads/launchramps in green.

commit 72154e01e82c35d5141a453fc4a7fe358712e136
Merge: 97e30dd fbde317
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Dec 4 20:31:31 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit 97e30dd1c7fc55ef699f9b055e19e30e44ccd9fb
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 28 19:21:34 2010 +0100

    Modified the map shader, should work now flawlessly.

commit f19452fd337f201f588452637e543d13adb97988
Merge: 1f2cd1d 36a9f8f
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 28 18:57:58 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit 1f2cd1d806d6ec174094461151d18f281a6d6f9a
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Wed Nov 24 00:48:46 2010 +0100

    Renamed a texture. modified shader. added mapimage

commit cb19a861bc805f96edd5070deff783e89f6f79f2
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Tue Nov 23 23:51:59 2010 +0100

    Added screens for more easy recognition of generator status. Renamed map and all other stuff

commit 2b5224045d36a94dcaadf9c1ff5d185cc43240ea
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 21 11:29:54 2010 +0100

    Darn non surfacelighted textures... Also, rotated some weapons to face the player.

commit b6ae8906a38558e6013a4edb4ca6a28677792754
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Nov 20 15:24:17 2010 +0100

    Fixed a red warpzone. Made laser thicker.

commit a499e8bcdcc25bb9457c879c751523a88d79336c
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Nov 20 14:26:16 2010 +0100

    Dunno. Foo. Bar. Obey. WTF. I'm just pretty much fed up now.

commit db66586d6ff2a92b9c6dbe3f0be273f72c1231d0
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Nov 20 14:03:02 2010 +0100

    Fixing warpzone Z fighting. Also, looks a lot better now :D

commit e666fd9310eb0f7407b1b2b60a69ff5612a75a91
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Nov 20 01:29:40 2010 +0100

    Forgot to fix red side, doh!

commit 1349b90834951de94cb006ced0c13374350dd464
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Nov 20 01:17:17 2010 +0100

    Some final touches here and there.

commit de8c665369308ecd696892baafc238538364b78d
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 19 22:06:34 2010 +0100

    Added some more ammo.

commit 9414e354a38bd969959c8064971f729c1cce0706
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 19 21:52:12 2010 +0100

    I've modified the map according to last playtest. Added rtlights, so the map really kills FPS now :D

commit 857707bdcd90b32a32e7bed0d45ec4298e103f9a
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 19 10:19:36 2010 +0100

    Modified to playerclips, was bit bumpy last time. Now it works like charm. Also, added some very small detail here and there.

commit de274e9b9d6cf7ac29a524589f45aed0487064b3
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 18 23:25:34 2010 +0100

    Modified a lot things acording to my conversation with FruitieX. Obey, obey, obey!

commit d1d1d4401f213fbf64e53e8d5a3247a5962b2dab
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 18 13:16:36 2010 +0100

    Merged master, and raised version number

commit 44d66dc0125a66410f682c2efa884f1cbd977568
Merge: 959098a 1844e22
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 18 13:15:46 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit 959098a8fbc3824133cc2d9e72312d156a731a9e
Merge: b02d47f d10b9e7
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 18 12:22:26 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit b02d47f406ac71e8eb6ca2ddd9213b37776d3f07
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 18 12:13:09 2010 +0100

    Fixing shader names for new forcefileds effects.

commit 556ec886ff343fc3ec559d7ebf92ce314411d869
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 18 12:05:38 2010 +0100

    I obey the divVerent, making the forcefields luminate! Also, reverted the warpzones.

commit 9d04156eeddb67f1dba84b0445951faca7f17380
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 18 11:38:02 2010 +0100

    Obeying the FruitieX:
    -removed teamdependent jumppads on the bases
    -retextured stairs on middle platform, to make things more obvious
    -tried to make arrow effect more noticable
    -added light source to warpzones (might need chnage)
    -modified warpzone texture (and totally b0rk3d it, needs fixing)
    -fixed jumppad issue, might introduced a new one
    -removed duplicated face of forcefield texture

commit f1f07cc8296e45ecdb9bf2f7185b1d457c8ebecb
Merge: 3d866b7 4c3f2c8
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 18 09:46:46 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit 3d866b72fd4e002b74ade42879213a17c35d6f45
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Wed Nov 17 07:09:35 2010 +0100

    Removed MG in favour of electro. Some more detail on the central platform.

commit 986045b43b31a08ecb621d8a8c01aecb2d82955b
Merge: d91642d ceb1f04
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 15 20:48:40 2010 +0100

    Merge branch 'cbrutail/xonotic_launchpad01_fix' into cbrutail/map-space_ctf

commit d91642d04a499e8f19930f4b109712b571b981f1
Merge: d600cfc 7259010
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 15 20:44:31 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit d600cfc11732158ee057da4bbf902faee402e448
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 15 00:56:12 2010 +0100

    Given some nice effect to warn users that the launchramps are offline.

commit 035f93d8269425e002a0abab375f313aebd82907
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 14 14:59:32 2010 +0100

    I obey too the FruitieX, it's annoying to bump in the launchramps.

commit a70d70b72d9d7e9116ad1b0634cdfffb0de5f0d0
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 14 14:00:39 2010 +0100

    Fixed generator models. I hope.

commit 30b6217e53a018a1b4c8ddb9dc4d4f6540afc9e0
Merge: a3b8420 42dd285
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 14 13:48:46 2010 +0100

    Merge branch 'cbrutail/generatormodel-fix' into cbrutail/map-space_ctf

commit a3b8420c230e76438c505f4f2e824f667e81748c
Merge: 0a4093c 91603fe
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 14 13:42:19 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit 42dd285e2964e63c1f2e1b75d8a4b4f0903de011
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 14 13:40:50 2010 +0100

    Model fix for space ctf generators. Might not work. However, it should imho.

commit 0a4093c730aaec83ac9197ad1bc78d8d5e4dbf80
Merge: d16bbee 6e89a94
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 7 21:55:33 2010 +0100

    Merge branch 'cbrutail/xonotic_launchpad01_fix' into cbrutail/map-space_ctf

commit d16bbee7737ec2b5eac39f711063f306a7ed54bf
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 7 20:52:22 2010 +0100

    Added LOD models. Changed skybox. Reworked central area. Will break map even more in next commit j/k.

commit d6a6ccd8740043ab57690a3c46f14c4569d12b20
Merge: 4a6e015 8e26861
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 7 11:41:52 2010 +0100

    Merge branch 'master' into cbrutail/map-space_ctf

commit 4a6e0153c47811c88934f99281252b98ca71380c
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Oct 29 12:30:48 2010 +0200

    Made teleporter jumppads team aware. Fixed blue warpzone. Lowered render distance on Central warpzones. Removed unnecessary high poly grids, replaced by texture

commit 1402b7766fdab69ab820f5e74d26cdf399ad75e4
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Oct 28 23:07:28 2010 +0200

    Modified the warzone area.

commit 735e94b8874607cf9f92829689a12f343bffa762
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Oct 28 11:50:11 2010 +0200

    Modified certain jumppads to be aware of teams. Added jumppad fx eye candy.

commit 437a6ef2cc1c6e2352df574b2c963ec9ba8e92ee
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Wed Oct 27 19:32:45 2010 +0200

    Added team aware laser fences. Added back some hint brushes. Added fade to warpzones.

commit c741b4667eef31a37679d941d4e83440d25070ec
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Wed Oct 27 01:29:54 2010 +0200

    Removed all HINT magic... Bad juju.

commit a7fc1c79e7ec6716f921d4752974865370b7a93e
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 24 20:41:56 2010 +0200

    Removed lasers. Adding something other in next commit.

commit e35eb24dad4133a0e5519a847d035ffcd2139dd3
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 24 18:40:22 2010 +0200

    Modified hints a bit, following div0's guides.

commit d6b8ef575328d50c114eef9593b9ff8af26cf271
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 24 18:16:24 2010 +0200

    Trying some HINT magic. Might not work :S

commit c4c279ae2557af0231a944e56de00bade3b709e5
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 24 17:45:32 2010 +0200

    Merged morphed's teleporter branch. Added new teleporter models.

commit ae9cf27f29746a379563c9c71a538d475411ca55
Merge: aeeba1d a1599d2
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 24 17:21:23 2010 +0200

    Merge remote branch 'origin/morphed/tele' into cbrutail/map-space_ctf

commit aeeba1dc81d079c6ac1771bdfd2b34ef6853d140
Merge: 5c18f9e 431497d
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 24 16:56:50 2010 +0200

    Merge branch 'master' into cbrutail/map-space_ctf

commit a1599d28aaa528560d91b39badc52a5e279b3a49
Author: Morphed <Morphed@o2.pl>
Date:   Sun Oct 24 01:12:00 2010 +0200

    giant teleporter for cubeowls map with placeholder textures

commit 5c18f9ed323d903e5a644bd1b0af422597b9dc5a
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 24 00:58:17 2010 +0200

    Fixed those damned warpzones now for real.

commit a403c5507a5bea182542a16764b307c1f5eaf2fe
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Oct 23 23:25:30 2010 +0200

    Fixed warpzones. Ooops.

commit 68b5ad91dcbfdfce1a6849b287fdf26301736388
Merge: ef8e730 f69728b
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Oct 23 23:07:49 2010 +0200

    Merge branch 'cbrutail/map-space_ctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir into cbrutail/map-space_ctf

commit ef8e7304209138d745f38192adf30870f8b99a6d
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Oct 23 23:00:55 2010 +0200

    Complete rethink of several parts of the map. Moved generators, removed/moved lasers, added warpzones. Removed Nex and added Riffle.

commit 2128aa7d7933cd59cd124a3f675cd2274a3c8c9b
Merge: 8febdfa 4e47c2a
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Oct 23 22:48:16 2010 +0200

    Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into cbrutail/map-space_ctf

commit f69728b8ea1565c6689d25924cbafa0db4525855
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Fri Oct 22 19:53:15 2010 +0300

    space_ctf waypoints by Calinou (some links may still be broken)

commit 0e75378539078d0e745fb9090129c4a46ec566b6
Merge: 8febdfa ccbf613
Author: FruitieX <rasse@rasse-laptop.(none)>
Date:   Fri Oct 22 19:41:30 2010 +0300

    Merge branch 'master' into cbrutail/map-space_ctf

commit 8febdfadb9b395d604605ab6d7859c19ebc437f6
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Oct 21 14:35:16 2010 +0200

    Removed ALL patches, to see how much it helps.

commit c176ff9ab5ea5dfa7d969c498a4580d7777105f7
Merge: 46c5c7b c0f2f95
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Oct 21 10:19:06 2010 +0200

    Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into cbrutail/map-space_ctf

commit 46c5c7bef05f01acf4f1d95e5f378b897b1c2d87
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Tue Oct 19 00:23:47 2010 +0200

    Fixed a jumppad on the RED side (thx FruitieX).

commit 6847c4175c3933d5add082f6e24fab593097dff4
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Oct 18 10:33:52 2010 +0200

    Retextured the rails, and removed some unnecessary eyecandy stuff.

commit dcfb844c296daeeb3b85fe39fb0c5e37f21ac47a
Merge: 01865de cb44adb
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Oct 18 10:06:24 2010 +0200

    Merge branch 'cbrutail/mapmodel-spaceteleport' into cbrutail/map-space_ctf

commit cb44adb8dbbc13c61ba65fb7fee9203a9cfb0fbc
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Oct 18 10:04:58 2010 +0200

    Removed map files.

commit 01865dec348d4d6d84d5a6a5da677a11d9695820
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Oct 18 10:03:14 2010 +0200

    Fixed some textures, modified teleporter models (PLACESHOLDERS), and also set laser to spawnflags "7".

commit e5e4814351b1b6f81af69c6177cf98e3799d5b26
Merge: 7859691 a534edc
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Oct 18 00:02:06 2010 +0200

    Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into cbrutail/map-space_ctf

commit 7859691548a414475dd583181eec4b69aff0034f
Merge: fcf198d ba2ccc6
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 17 23:45:23 2010 +0200

    Merge branch 'cbrutail/mapmodel-spaceteleport' into cbrutail/map-space_ctf

commit ba2ccc61585ac699127ea2f0621c9b9e26c9707b
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 17 23:43:50 2010 +0200

    Created map files and ASE files. PLACEHOLDER models, need replacement ASAP.

commit aab2cb02cb98d8d956d2176473c01f990cbe1d91
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 17 22:57:14 2010 +0200

    Model files for ASE models. Will generate them later.

commit fcf198d75e9d87bd2081a310e0fa135e72a3f2c0
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 17 22:09:07 2010 +0200

    Removing teleport fx circles

commit dd46a8dc4a955157189f34807f173a6d503d6432
Merge: e1e5ca2 44d72b2
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Oct 16 14:51:11 2010 +0200

    Merge branch 'master' into cbrutail/map-space_ctf

commit e1e5ca2441d173787f0027c51c58eea9c54ee96b
Merge: 54e37b1 903f016
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Oct 16 00:07:43 2010 +0200

    Merge branch 'cbrutail/map-space_ctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir into cbrutail/map-space_ctf

commit 54e37b17bcf74c4df953d0e9132bd1e2b2353b40
Merge: b5bfc65 005a029
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Oct 15 23:30:01 2010 +0200

    Merge branch 'master' into cbrutail/map-space_ctf

commit 903f016557c7ca8045c5ef44bab529b9e485fb8f
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Sep 28 21:47:17 2010 +0200

    oops, I accidentally a targetname

commit 42a4cb087c571111d5f01881ec52d5ff84c1d280
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Sep 28 21:32:29 2010 +0200

    make the jumppads more "friendly": in non-ctf, they work for anyone, and in ctf, they "reject" by pushing back to the previous platform

commit 78de690f42d566d0fc570b840d2a15ca93415eb0
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Sep 25 15:37:26 2010 +0200

    remove a stupid textures/ prefix I added

commit af25d656f7ffea0f882e3084be047d83259868a2
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Sep 25 15:22:37 2010 +0200

    update options file

commit 6090c8ba5626cc82415a0b836f712d81af5a5f36
Merge: 74b1724 b5b4ccf
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Sep 25 15:22:21 2010 +0200

    Merge branch 'cbrutail/shaders_fx_xonotic2' into cbrutail/map-space_ctf

commit 74b1724c695d5fb5721a96ef436c37c7db1fa670
Merge: 631e345 acd08f5
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Sep 25 15:19:50 2010 +0200

    Merge branch 'cbrutail/shaders_fx_xonotic2' into cbrutail/map-space_ctf

commit 631e34568203adc23eddbc6f0ac85881298e1dfd
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Sep 25 15:17:56 2010 +0200

    adapt map file to shader convention

commit e85d7cc70ef753cc1ecb4a1c3b99e467aa7bcbc1
Merge: 1c6863b f5a0250
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Sep 25 15:14:53 2010 +0200

    Merge branch 'cbrutail/textures-space_ctf' into cbrutail/map-space_ctf

commit 1c6863b78c9496135110c78745ffef862f01f762
Merge: b5bfc65 b447b23
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Sep 25 15:14:45 2010 +0200

    Merge branch 'cbrutail/shaders_fx_xonotic2' into cbrutail/map-space_ctf

commit f5a02501ba42edcbddd8f8685ee54d8295bd48e4
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Sep 25 14:22:58 2010 +0200

    make this branch fulfill the convention

commit fb4a2833a7f1cc00b6bb39c6284b824f258a6e38
Merge: 65ff966 668b692
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Sep 25 14:21:22 2010 +0200

    Merge branch 'master' into cbrutail/textures-space_ctf

commit b5bfc65f6f2515ad76d87e98be90555587fa7f45
Merge: 29262dd 65ff966
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Aug 23 08:40:01 2010 +0200

    Merge remote branch 'origin/cbrutail/textures-space_ctf' into cbrutail/map-space_ctf

commit 65ff9669ebead17d68cb2c4cc9a95426de004d66
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Aug 23 08:38:40 2010 +0200

    We don't need these textures anymore

commit 8b88e2ef9e03325e87e9504379ec90969f7554db
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Aug 23 08:35:32 2010 +0200

    Wrong directory added in previous commit. Doh.

commit 29262dd0b1aa4d754880c7e0738e2b61c8d26e90
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Aug 23 08:34:12 2010 +0200

    Retexturing to meet shader name conventions.

commit 054af99cfd5a16c495c542fdc10740de7ce202e5
Merge: 05aafee 7ed1662
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Aug 22 18:33:47 2010 +0200

    Merge branch 'cbrutail/textures-space_ctf' into cbrutail/map-space_ctf

commit 7ed166295814773bc5e01aa771d63578e74942f6
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Aug 22 18:32:15 2010 +0200

    Map specific textures and shader for Space CTF. Normalmaps might not be the best, someone should investigate.

commit 05aafeee4598bba001a733cd5aa104d31956b941
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Aug 22 13:25:47 2010 +0200

    Oops. Forgot to remove testing RL from Red base :F

commit d756d121c7d38171aa77aef9cacf7ae5bd6bd6af
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Aug 22 12:23:14 2010 +0200

    Here we go with the .map.options file. YEEHAAA!

commit 67404b773085ac7e7235e40b85c5e9a84e44710e
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Aug 22 12:19:14 2010 +0200

    Added author info to the .map file, and added mapinfo and .jpg.

commit 503c46620a8cce28a963f81765b3803837df095e
Merge: a0b5479 6de90e8
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Aug 22 02:17:26 2010 +0200

    Merge branch 'master' into cbrutail/map-space_ctf

commit a0b547933ab24442fb129cf0dca2f12b6ce6c290
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Aug 22 02:12:43 2010 +0200

    Push. Just push it already. Destroyable jumppads implemented.

commit 7c2a60f3f0f47e917a9b187b2c3797e5090e4e10
Merge: 4d3d86d 4768c37
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Wed Jul 21 13:10:50 2010 +0200

    Merge branch 'master' into cbrutail/map-space_ctf

commit 4d3d86da0c00a1a1fed9bf9c2c50cf3059d206c7
Merge: a62d2e5 53ec6ce
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Wed Jul 21 12:15:59 2010 +0200

    Merge remote branch 'origin/master' into cbrutail/map-space_ctf

commit a62d2e57ca99b433211fd71258b201d54786af92
Merge: 515efaa c9ade67
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Wed Jul 21 12:00:59 2010 +0200

    Merge branch 'origin/master' (early part) into cbrutail/map-space_ctf

commit 515efaa66e60b36beb2cad97037cddf8bd697818
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Wed Jul 7 14:16:22 2010 +0200

    Removed a model. Don't know why it was there in the first place...

commit 1c7fc3664ec852ed1027fcb8b7ea864199307bff
Merge: ddb6865 48c1112
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Wed Jul 7 14:15:05 2010 +0200

    Merge remote branch 'origin/cbrutail/textures-trak5xlights2' into cbrutail/map-space_ctf

commit ddb6865e88fa12db14117cff96777218358719a0
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Wed Jul 7 13:39:35 2010 +0200

    Cleaning up this repo too. I'll use this one from now on for Space CTF.
59 files changed:
maps/newtonian-nightmare.map [new file with mode: 0644]
maps/newtonian-nightmare.map.options [new file with mode: 0644]
maps/newtonian-nightmare.mapinfo [new file with mode: 0644]
maps/newtonian-nightmare.rtlights [new file with mode: 0644]
maps/newtonian-nightmare.tga [new file with mode: 0644]
maps/newtonian-nightmare.waypoints [new file with mode: 0644]
maps/space_ctf.waypoints.cache [new file with mode: 0644]
models/space_ctf/generator.md3 [new file with mode: 0644]
models/space_ctf/generator_dead.md3 [new file with mode: 0644]
models/teleporters/gianttele.md3 [new file with mode: 0644]
models/teleporters/gianttele.tga [new file with mode: 0644]
models/teleporters/gianttele_gloss.tga [new file with mode: 0644]
models/teleporters/gianttele_glow.tga [new file with mode: 0644]
models/teleporters/gianttele_norm.tga [new file with mode: 0644]
models/teleporters/thrust.tga [new file with mode: 0644]
models/xonotic_jumppad01/jumppad2lod_green.tga [new file with mode: 0644]
models/xonotic_jumppad01/jumppad2lod_green_glow.tga [new file with mode: 0644]
models/xonotic_jumppad01/jumppad2lod_purple.tga [new file with mode: 0644]
models/xonotic_jumppad01/jumppad2lod_purple_glow.tga [new file with mode: 0644]
models/xonotic_jumppad01/jumppad2lod_yellow.tga [new file with mode: 0644]
models/xonotic_jumppad01/jumppad2lod_yellow_glow.tga [new file with mode: 0644]
models/xonotic_jumppad01/launchpad2lod_blue_glow.tga
models/xonotic_jumppad01/launchpad2lod_green.tga [new file with mode: 0644]
models/xonotic_jumppad01/launchpad2lod_green_glow.tga [new file with mode: 0644]
models/xonotic_jumppad01/launchpad2lod_purple.tga [new file with mode: 0644]
models/xonotic_jumppad01/launchpad2lod_purple_glow.tga [new file with mode: 0644]
models/xonotic_jumppad01/launchpad2lod_red_glow.tga
models/xonotic_jumppad01/launchpad2lod_yellow.tga [new file with mode: 0644]
models/xonotic_jumppad01/launchpad2lod_yellow_glow.tga [new file with mode: 0644]
models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_2.skin [new file with mode: 0644]
models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_3.skin [new file with mode: 0644]
models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_4.skin [new file with mode: 0644]
models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_2.skin [new file with mode: 0644]
models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_3.skin [new file with mode: 0644]
models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_4.skin [new file with mode: 0644]
models/xonotic_teleporter01/mapmdl_spaceteleport.ase [new file with mode: 0644]
models/xonotic_teleporter01/mapmdl_spaceteleport_blue.ase [new file with mode: 0644]
models/xonotic_teleporter01/mapmdl_spaceteleport_red.ase [new file with mode: 0644]
scripts/map_newtonian-nightmare.shader [new file with mode: 0644]
scripts/teleporters.shader [new file with mode: 0644]
sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg [new file with mode: 0644]
sound/map-newtonian-nightmare/nn-electrified_looped.ogg [new file with mode: 0644]
sound/map-newtonian-nightmare/nn-robotic_laser.ogg [new file with mode: 0644]
sound/map-newtonian-nightmare/nn-robotic_launchpad.ogg [new file with mode: 0644]
textures/map_newtonian-nightmare/screens/.directory [new file with mode: 0644]
textures/map_newtonian-nightmare/screens/offline.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/screens/offline_b.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/screens/offline_glow.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/screens/online.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/screens/online_glow.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/trims/trimlight_blue.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/trims/trimlight_blue_glow.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/trims/trimlight_blue_norm.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/trims/trimlight_green.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/trims/trimlight_green_glow.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/trims/trimlight_green_norm.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/trims/trimlight_red.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/trims/trimlight_red_glow.tga [new file with mode: 0644]
textures/map_newtonian-nightmare/trims/trimlight_red_norm.tga [new file with mode: 0644]