xonotic/xonotic-maps.pk3dir.git
9 years agointroduce common/waternodraw, common/slimenodraw and common/lavanodraw
Maik Merten [Sat, 16 Apr 2011 10:59:37 +0000 (12:59 +0200)]
introduce common/waternodraw, common/slimenodraw and common/lavanodraw

9 years agoshader-audit: detect broken nesting of braces
Rudolf Polzer [Tue, 12 Apr 2011 09:29:01 +0000 (11:29 +0200)]
shader-audit: detect broken nesting of braces

9 years agoMerge remote branch 'origin/mirceakitsune/red_planet'
mand1nga [Sun, 3 Apr 2011 23:02:06 +0000 (20:02 -0300)]
Merge remote branch 'origin/mirceakitsune/red_planet'

9 years agoMake some trick moves in glowplant less hard
Jakob MG [Tue, 15 Mar 2011 12:13:54 +0000 (13:13 +0100)]
Make some trick moves in glowplant less hard

9 years agonaming convention fixes
Rudolf Polzer [Wed, 9 Mar 2011 16:49:38 +0000 (17:49 +0100)]
naming convention fixes

9 years agoSquashed commit of the following:
Rudolf Polzer [Wed, 9 Mar 2011 12:31:38 +0000 (13:31 +0100)]
Squashed commit of the following:

commit 08d637eb0880739e26ef5c575c8335a5dde2bcbc
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Feb 12 13:55:02 2011 +0100

    Version 3, so new mapimage gets packaged.

commit 83a5551589fc0d47ff22c482ca22bfa793b4eacd
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sat Feb 12 13:54:20 2011 +0100

    New mapimage.

commit d6103c20e4b06de5674f3dcab7ac50c8714aff8e
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Feb 11 20:22:47 2011 +0100

    Finishing up detailing jobs, adding sounds.

    Finishing up detail jobs. Adding sounds. Big thank you for chooksta :)

commit 78ab8cb01664c83d5828533d16ecc51d89118e1c
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Feb 10 17:55:54 2011 +0100

    Fixing a small issue and getting the branch up to date with master.

commit 40b6e8d519fe483bad61235bc773586cc627291e
Merge: 085aa51 01e2199
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Feb 10 17:50:07 2011 +0100

    Merge branch 'master' into cbrutail/map-leave

commit 085aa51ffb5d51cf92a79ce90861b688ed0ddfae
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Tue Feb 1 00:49:24 2011 +0100

    Details by Cortez. Simply amazing.

commit 06d1345d3507767573956339e572733cba87630c
Merge: ed9aeab 30c1f5c
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Jan 31 21:35:55 2011 +0100

    Merge branch 'master' into cbrutail/map-leave

commit ed9aeab8be0d69294c6dbfa7af897f7b119e1488
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Jan 20 16:41:17 2011 +0100

    Merged master, and modified a few brushes, so cortez can work on a fresh new pk3 :D

commit f4345e85653077dd13e940d040543f29f0a20cac
Merge: cd155ae aaf74f0
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Jan 20 16:25:51 2011 +0100

    Merge branch 'master' into cbrutail/map-leave

commit cd155aec99105871de317afb8295fcac03becba4
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Nov 7 10:38:10 2010 +0100

    detailing up

commit 072decbd89e81bf0b056713d8a39b0887be56f8e
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 5 23:20:20 2010 +0100

    Matched mapinfo file to worldspawn, and set timelimit a qualifying limit. map.options set to final compile.

commit fb8f6150912c4abf69c01bc4616fdc3d504e53a3
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 5 23:14:02 2010 +0100

    Modified worldspawn, and added mapimage.

commit 885f829d6b6cefcecf52e03144e9f55f8014bc6a
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 5 21:54:34 2010 +0100

    Modified mapinfo

commit 825d26e7f684e32e1a6a31c5bdfc6e552b2960fb
Merge: b532c19 2acf9d8
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 5 21:50:03 2010 +0100

    Merge branch 'master' into cbrutail/map-leave

commit b532c19357342616c616f488e518a9d26e107b1a
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 5 14:59:12 2010 +0100

    Fixed logos, and made race path even more obvious.

commit 7cae2ceca26852a56fdb6f0908d975c8035179b2
Merge: a7011ce 8c128c1
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 5 13:20:27 2010 +0100

    Merge branch 'cbrutail/decals-xonotic' into cbrutail/map-leave

commit a7011ce0f08d0f33570e6e56c5c8bc5ff8f54d73
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Fri Nov 5 09:33:26 2010 +0100

    fixed a lot of textures, added central platform

commit 03c55e5283105bdb04bb4138195cda8e2445b98c
Merge: 49cc47d a23887d
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 4 20:44:50 2010 +0100

    Merge branch 'cbrutail/decals-xonotic' into cbrutail/map-leave

commit 49cc47dfd34985f0096c5bc7cd1f8d66c98c86c2
Merge: dd27cce dd74a05
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Thu Nov 4 20:42:21 2010 +0100

    Merge branch 'master' into cbrutail/map-leave

commit dd27cceda2f436ad32e70d16f35566e692a44540
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Tue Nov 2 21:26:01 2010 +0100

    Fuck you Darkplaces. I take back that spawnpoint, you don't need that. Also, lowered lasers' dynamic light.

commit 63c52a5bc91e9daffb05e6abdc5515e03a6b835a
Merge: e5fa3d0 c002033
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Tue Nov 2 00:38:35 2010 +0100

    Merge branch 'master' into cbrutail/map-leave

commit e5fa3d058c37a7c7fbe0e54868b83a6721aae4c4
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 1 23:39:36 2010 +0100

    Darkplaces wants a spawn point, so Darkplaces gets a spawn point.

commit 0c62bdf69021df47e0e7a865c1331560c2ac0316
Merge: 96532a4 e928def
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 1 23:34:16 2010 +0100

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

commit e928def823348152b71a807f078a6077a31adb93
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 1 02:13:23 2010 +0100

    Autobuild, HERE WE GO!

commit 2394932cefdf84bae265909a8debe215de3ea99a
Merge: 79b8e22 0bec1a5
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 1 02:01:24 2010 +0100

    Merge branch 'cbrutail/decals-xonotic' into cbrutail/map-leave

commit 79b8e2216a79481160bfcd8789906df312c679f9
Merge: bf1025c ee84bdc
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 1 01:51:55 2010 +0100

    Merge branch 'cbrutail/decals-xonotic' into cbrutail/map-leave

commit bf1025c43ce43b4cdb0cb826edf899a11f12a2c0
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 1 01:49:07 2010 +0100

    Modified logo texture. Fixed some minor texture alignment.

commit 8e26f04d6677d109bff087005e334a2927dc3a3b
Merge: 3039846 5c51d52
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 1 01:41:22 2010 +0100

    Merge branch 'cbrutail/decals-xonotic' into cbrutail/map-leave

commit 3039846cbfca87da55244f32f1624c39b4cfe4a7
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Mon Nov 1 00:59:20 2010 +0100

    Made jumppads and trigers larger, it's more easy to use them. Added some more hint magix.

commit 052d476aca54f13eef1b85b6e18c943da48a311f
Merge: 1101e96 68c9999
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 31 23:14:32 2010 +0100

    Merge branch 'master', remote branch 'origin' into cbrutail/map-leave

commit 1101e96206d062df8c488b353c4b8e8719e4e19a
Author: cbrutail <ruszkai.akos@gmail.com>
Date:   Sun Oct 31 17:50:19 2010 +0100

    Initial commit of Race map Leave'em behind. Retextured original Nexuiz map.

9 years agoGametype filtered models shall not cast shadows. If they do, unexplainable black...
MirceaKitsune [Thu, 17 Feb 2011 23:48:04 +0000 (01:48 +0200)]
Gametype filtered models shall not cast shadows. If they do, unexplainable black patches appear where they should be, during team games. Shadows cannot be filtered by gametype, so this is sadly the only way (as with the airlock lights).

9 years agoI think the panel lights are better off left white
MirceaKitsune [Thu, 17 Feb 2011 23:42:39 +0000 (01:42 +0200)]
I think the panel lights are better off left white

9 years agoUse different light colors for blue base entrance doors. No way to filter lightmaps...
MirceaKitsune [Thu, 17 Feb 2011 23:38:37 +0000 (01:38 +0200)]
Use different light colors for blue base entrance doors. No way to filter lightmaps based on gametype, so use the most common thing possible.

9 years agoAnd lastly, use the new teamspawns / noteamspawns setting in gametypefilter rather...
MirceaKitsune [Thu, 17 Feb 2011 16:24:00 +0000 (18:24 +0200)]
And lastly, use the new teamspawns / noteamspawns setting in gametypefilter rather than specifying each gametype manually.

9 years agoFix outside rails. Forgot that the center ones don't need to be colored in non-team...
MirceaKitsune [Thu, 17 Feb 2011 16:12:03 +0000 (18:12 +0200)]
Fix outside rails. Forgot that the center ones don't need to be colored in non-team games.

9 years agoI think the error screen is better for the bent blue base door, in the non-team ...
MirceaKitsune [Thu, 17 Feb 2011 15:43:02 +0000 (17:43 +0200)]
I think the error screen is better for the bent blue base door, in the non-team / locked version.

9 years agoColor blue base entrance door lights in yellow (error color) rather than blue (unlock...
MirceaKitsune [Thu, 17 Feb 2011 15:41:14 +0000 (17:41 +0200)]
Color blue base entrance door lights in yellow (error color) rather than blue (unlocked) or red (locked). Since the blue base is closed during non-team games, so unless we get lightning to be gametype filtered too, neither locked nor unlocked would be correct for these doors.

9 years agoSome brushes shouldn't be detail brushes, while others should be.
MirceaKitsune [Thu, 17 Feb 2011 15:34:38 +0000 (17:34 +0200)]
Some brushes shouldn't be detail brushes, while others should be.

9 years agoRemove tons of orphaned entities without brushes. This issue was supposedly fixed...
MirceaKitsune [Thu, 17 Feb 2011 15:27:33 +0000 (17:27 +0200)]
Remove tons of orphaned entities without brushes. This issue was supposedly fixed in netRadiant ages ago!!

9 years agoMake team only details in blue base permanent, removing them from the non-team func_w...
MirceaKitsune [Thu, 17 Feb 2011 15:17:45 +0000 (17:17 +0200)]
Make team only details in blue base permanent, removing them from the non-team func_wall and decreasing map size by lots of brushes.

9 years agoMerge Cuinnton's latest changes to Red Planet.
MirceaKitsune [Thu, 17 Feb 2011 15:05:20 +0000 (17:05 +0200)]
Merge Cuinnton's latest changes to Red Planet.

9 years agoredefine target2 to 4 on path_corner a more logical way
Rudolf Polzer [Mon, 14 Feb 2011 19:31:05 +0000 (20:31 +0100)]
redefine target2 to 4 on path_corner a more logical way

9 years agodocument this path_corner extension
Rudolf Polzer [Mon, 14 Feb 2011 18:58:08 +0000 (19:58 +0100)]
document this path_corner extension

9 years agofix space_elevator mapinfo
Rudolf Polzer [Thu, 10 Feb 2011 12:57:59 +0000 (13:57 +0100)]
fix space_elevator mapinfo

9 years agoMerge remote branches 'origin/cbrutail/effects-beams' and 'origin/cbrutail/space_elev...
Rudolf Polzer [Wed, 9 Feb 2011 12:31:06 +0000 (13:31 +0100)]
Merge remote branches 'origin/cbrutail/effects-beams' and 'origin/cbrutail/space_elevator-beamfix'

9 years agoMerge remote branch 'origin/cbrutail/model_walker-static'
Rudolf Polzer [Tue, 8 Feb 2011 09:34:12 +0000 (10:34 +0100)]
Merge remote branch 'origin/cbrutail/model_walker-static'

9 years agoadd platmovetype here too (autogenerated by entities.def2ent)
Rudolf Polzer [Mon, 7 Feb 2011 19:43:10 +0000 (20:43 +0100)]
add platmovetype here too (autogenerated by entities.def2ent)

9 years agoadd platmovetype to affected entities
Maik Merten [Sun, 6 Feb 2011 14:50:40 +0000 (15:50 +0100)]
add platmovetype to affected entities

9 years agoMerge remote branch 'origin/savagex/techassault'
tzork [Sat, 5 Feb 2011 13:51:20 +0000 (14:51 +0100)]
Merge remote branch 'origin/savagex/techassault'

9 years agoMerge remote branch 'origin/diabolik/stein1x'
tzork [Sat, 5 Feb 2011 11:43:41 +0000 (12:43 +0100)]
Merge remote branch 'origin/diabolik/stein1x'

9 years agofix non ^2 texture, invert green of norms (gl style)
tzork [Sat, 5 Feb 2011 11:38:00 +0000 (12:38 +0100)]
fix non ^2 texture, invert green of norms (gl style)

9 years agoNew texture set by JulianaStein. Mostly concrete/cement textures.
ssinghal [Fri, 4 Feb 2011 05:47:25 +0000 (00:47 -0500)]
New texture set by JulianaStein. Mostly concrete/cement textures.

9 years agoMerge remote branch 'origin/tzork/trakfix1'
tzork [Wed, 2 Feb 2011 08:15:14 +0000 (09:15 +0100)]
Merge remote branch 'origin/tzork/trakfix1'

9 years agoInvert green channels for _norms of new trak textures
tzork [Wed, 2 Feb 2011 07:20:40 +0000 (08:20 +0100)]
Invert green channels for _norms of new trak textures

9 years agoProper light color for errored doors
MirceaKitsune [Tue, 1 Feb 2011 17:08:29 +0000 (19:08 +0200)]
Proper light color for errored doors

9 years agoUse error screen on busted doors
MirceaKitsune [Tue, 1 Feb 2011 17:01:18 +0000 (19:01 +0200)]
Use error screen on busted doors

9 years agoScript for the new error screen
MirceaKitsune [Tue, 1 Feb 2011 16:56:57 +0000 (18:56 +0200)]
Script for the new error screen

9 years agoSome updates to the screen textures, and a new error screen as well. I made these...
MirceaKitsune [Tue, 1 Feb 2011 16:55:51 +0000 (18:55 +0200)]
Some updates to the screen textures, and a new error screen as well. I made these with red planet so I guess it's ok to update them with this branch

9 years agoGive names to the Onslaught control points
MirceaKitsune [Tue, 1 Feb 2011 16:15:45 +0000 (18:15 +0200)]
Give names to the Onslaught control points

9 years agoBetter nexball arrangements
MirceaKitsune [Tue, 1 Feb 2011 16:12:15 +0000 (18:12 +0200)]
Better nexball arrangements

9 years agoAnd now, for a surprise feature: Nexball on Red Planet. Uses entity filtering to...
MirceaKitsune [Tue, 1 Feb 2011 16:01:28 +0000 (18:01 +0200)]
And now, for a surprise feature: Nexball on Red Planet. Uses entity filtering to spawn the gates only in NB, and the bases are the same as CTF and ONS. Yes, this is a nexball map where you can both pickup weapons and carry the ball. I hope such can be accepted officially.

9 years agoFix pipe steam in blue base
MirceaKitsune [Tue, 1 Feb 2011 15:20:08 +0000 (17:20 +0200)]
Fix pipe steam in blue base

9 years agoThinner doors for the new lockers
MirceaKitsune [Tue, 1 Feb 2011 15:03:32 +0000 (17:03 +0200)]
Thinner doors for the new lockers

9 years agoFix barrel going through wall, and change a few more things in blue base
MirceaKitsune [Tue, 1 Feb 2011 14:53:43 +0000 (16:53 +0200)]
Fix barrel going through wall, and change a few more things in blue base

9 years agoOptimize some brushes
MirceaKitsune [Tue, 1 Feb 2011 14:43:20 +0000 (16:43 +0200)]
Optimize some brushes

9 years agoImprove a cap texture
MirceaKitsune [Tue, 1 Feb 2011 14:27:16 +0000 (16:27 +0200)]
Improve a cap texture

9 years agoSeveral architecture changes between the red and blue base (rearranged crates and...
MirceaKitsune [Tue, 1 Feb 2011 14:25:43 +0000 (16:25 +0200)]
Several architecture changes between the red and blue base (rearranged crates and barrels, busted doors, etc)

9 years agoRe-implement Cuinnton's colored base walls in the outer area.
MirceaKitsune [Tue, 1 Feb 2011 12:48:17 +0000 (14:48 +0200)]
Re-implement Cuinnton's colored base walls in the outer area.

9 years agoMerge remote branch 'origin/diabolik/more-lavacolors'
tzork [Tue, 1 Feb 2011 04:01:53 +0000 (05:01 +0100)]
Merge remote branch 'origin/diabolik/more-lavacolors'

9 years agoGroup some forgotten elevator displays
MirceaKitsune [Tue, 1 Feb 2011 02:24:50 +0000 (04:24 +0200)]
Group some forgotten elevator displays

9 years agoStill, make the South Wing / North Wing panels display in non-team version too. Don...
MirceaKitsune [Tue, 1 Feb 2011 02:15:43 +0000 (04:15 +0200)]
Still, make the South Wing / North Wing panels display in non-team version too. Don't think they need to be team dependent, and the other panels aren't either.

9 years agoRevert that last change, it does an ugly thing
MirceaKitsune [Tue, 1 Feb 2011 02:08:44 +0000 (04:08 +0200)]
Revert that last change, it does an ugly thing

9 years agoTweak wall panels
MirceaKitsune [Tue, 1 Feb 2011 02:03:21 +0000 (04:03 +0200)]
Tweak wall panels

9 years agoFix some trims and caulks
MirceaKitsune [Tue, 1 Feb 2011 01:13:47 +0000 (03:13 +0200)]
Fix some trims and caulks

9 years agoFix floating barrel
MirceaKitsune [Tue, 1 Feb 2011 00:56:34 +0000 (02:56 +0200)]
Fix floating barrel

9 years agoChange some of the demonwind sounds to city_LOOP
MirceaKitsune [Tue, 1 Feb 2011 00:54:14 +0000 (02:54 +0200)]
Change some of the demonwind sounds to city_LOOP

9 years agoUpdate skybox from the changes I missed from Cuinnton
MirceaKitsune [Tue, 1 Feb 2011 00:46:21 +0000 (02:46 +0200)]
Update skybox from the changes I missed from Cuinnton

9 years agoFix a forgotten rail
MirceaKitsune [Tue, 1 Feb 2011 00:41:09 +0000 (02:41 +0200)]
Fix a forgotten rail

9 years agoSome changes to the sound files
MirceaKitsune [Tue, 1 Feb 2011 00:30:01 +0000 (02:30 +0200)]
Some changes to the sound files

9 years agoNew pneumatic door sounds
MirceaKitsune [Tue, 1 Feb 2011 00:23:43 +0000 (02:23 +0200)]
New pneumatic door sounds

9 years agoFix a brush that mysteriously got deleted
MirceaKitsune [Tue, 1 Feb 2011 00:14:54 +0000 (02:14 +0200)]
Fix a brush that mysteriously got deleted

9 years agoAlign some textures
MirceaKitsune [Mon, 31 Jan 2011 21:57:38 +0000 (23:57 +0200)]
Align some textures

9 years agoOnslaught ^_^
MirceaKitsune [Mon, 31 Jan 2011 21:55:52 +0000 (23:55 +0200)]
Onslaught ^_^

9 years agoOh yay! gametypefilter also works on trigger_multiple. Team doors will no longer...
MirceaKitsune [Mon, 31 Jan 2011 21:14:25 +0000 (23:14 +0200)]
Oh yay! gametypefilter also works on trigger_multiple. Team doors will no longer open in Deathmatch

9 years agoA few fixes and improvements
MirceaKitsune [Mon, 31 Jan 2011 21:12:14 +0000 (23:12 +0200)]
A few fixes and improvements

9 years agoFix an issue i think i made with that last commit
MirceaKitsune [Mon, 31 Jan 2011 20:45:31 +0000 (22:45 +0200)]
Fix an issue i think i made with that last commit

9 years agoRemove some duplicated brushes
MirceaKitsune [Mon, 31 Jan 2011 20:41:50 +0000 (22:41 +0200)]
Remove some duplicated brushes

9 years agoPosition CTF flags better
MirceaKitsune [Mon, 31 Jan 2011 18:22:22 +0000 (20:22 +0200)]
Position CTF flags better

9 years agoUpdate rtlights
MirceaKitsune [Mon, 31 Jan 2011 18:20:13 +0000 (20:20 +0200)]
Update rtlights

9 years agoReverse door and teleporter angles where the base is mirrored
MirceaKitsune [Mon, 31 Jan 2011 18:19:33 +0000 (20:19 +0200)]
Reverse door and teleporter angles where the base is mirrored

9 years agoPut old terrain texture back. Just feel it's better that way, as it's a 2 texture...
MirceaKitsune [Mon, 31 Jan 2011 18:12:34 +0000 (20:12 +0200)]
Put old terrain texture back. Just feel it's better that way, as it's a 2 texture script and I think looks prettier.

9 years agoDaring attempt to team color ALL of the rails (apart from the middle ones outside...
MirceaKitsune [Mon, 31 Jan 2011 18:03:04 +0000 (20:03 +0200)]
Daring attempt to team color ALL of the rails (apart from the middle ones outside). Still yellow in non-team games

9 years agoctf gametype in mapinfo
MirceaKitsune [Mon, 31 Jan 2011 16:34:19 +0000 (18:34 +0200)]
ctf gametype in mapinfo

9 years agoFix door panels for team game version doors
MirceaKitsune [Mon, 31 Jan 2011 16:33:23 +0000 (18:33 +0200)]
Fix door panels for team game version doors

9 years agoSeveral fixes to red planet, regarding team brushes
MirceaKitsune [Mon, 31 Jan 2011 16:27:14 +0000 (18:27 +0200)]
Several fixes to red planet, regarding team brushes

9 years agoMore great updates by Cuinnton
MirceaKitsune [Sun, 30 Jan 2011 21:27:32 +0000 (23:27 +0200)]
More great updates by Cuinnton

9 years agoMerge branch 'master' into mirceakitsune/red_planet
MirceaKitsune [Sun, 30 Jan 2011 21:25:24 +0000 (23:25 +0200)]
Merge branch 'master' into mirceakitsune/red_planet

9 years agodocument trigger_hurt.targetname
Rudolf Polzer [Sat, 29 Jan 2011 20:27:16 +0000 (21:27 +0100)]
document trigger_hurt.targetname

9 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Wed, 26 Jan 2011 07:55:36 +0000 (08:55 +0100)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir

9 years agoMerge remote branch 'origin/tzork/glowplant'
Rudolf Polzer [Wed, 26 Jan 2011 07:53:18 +0000 (08:53 +0100)]
Merge remote branch 'origin/tzork/glowplant'

Conflicts:
maps/glowplant.map (taking over tZork's new versions, throwing away in between changes on master)

9 years agoMerge remote branch 'origin/diabolik/trak-textures'
tzork [Tue, 25 Jan 2011 21:33:00 +0000 (22:33 +0100)]
Merge remote branch 'origin/diabolik/trak-textures'

9 years agoRename _s textures to _gloss
tzork [Tue, 25 Jan 2011 19:50:41 +0000 (20:50 +0100)]
Rename _s textures to _gloss

9 years agoMinor structural fixes, place more ammo.
tzork [Tue, 25 Jan 2011 19:34:30 +0000 (20:34 +0100)]
Minor structural fixes, place more ammo.

9 years agoAdd traks map props.
ssinghal [Tue, 25 Jan 2011 19:18:35 +0000 (14:18 -0500)]
Add traks map props.

9 years agoShaders for trak7 and 6. tzork will merge soon.
ssinghal [Tue, 25 Jan 2011 18:59:00 +0000 (13:59 -0500)]
Shaders for trak7 and 6. tzork will merge soon.

9 years agoRemove Thumbs.db and rename two files. Needs trak6x.shader and trak7x.shader
ssinghal [Mon, 24 Jan 2011 23:53:52 +0000 (18:53 -0500)]
Remove Thumbs.db and rename two files. Needs trak6x.shader and trak7x.shader

9 years agoProperly name textures for trak6 and 7 and put in folders.
ssinghal [Mon, 24 Jan 2011 23:50:05 +0000 (18:50 -0500)]
Properly name textures for trak6 and 7 and put in folders.

9 years agoAdd the rest of the trak5-2x stuff. Needs _gloss.
ssinghal [Mon, 24 Jan 2011 06:01:12 +0000 (01:01 -0500)]
Add the rest of the trak5-2x stuff. Needs _gloss.

9 years agoAdd wall1 and wall2 from trak5-x2.
ssinghal [Mon, 24 Jan 2011 04:34:19 +0000 (23:34 -0500)]
Add wall1 and wall2 from trak5-x2.

9 years agoupdate the .ent too
Rudolf Polzer [Sat, 22 Jan 2011 20:14:43 +0000 (21:14 +0100)]
update the .ent too

9 years agoadd mine layer
Rudolf Polzer [Sat, 22 Jan 2011 20:14:08 +0000 (21:14 +0100)]
add mine layer

9 years agoModified space-elevator so it uses the new effects_beam shaders instead of own ones.
cbrutail [Sat, 22 Jan 2011 20:06:05 +0000 (21:06 +0100)]
Modified space-elevator so it uses the new effects_beam shaders instead of own ones.

9 years agoMoving space_elevator's beam shaders to their own directory.
cbrutail [Sat, 22 Jan 2011 19:52:44 +0000 (20:52 +0100)]
Moving space_elevator's beam shaders to their own directory.

9 years agoStatic turret-walker models for maps, Current textures look like holograms. Big thx...
cbrutail [Sat, 22 Jan 2011 15:11:05 +0000 (16:11 +0100)]
Static turret-walker models for maps, Current textures look like holograms. Big thx for tZork.

9 years agoMore lava colors for the stormkeep lava.
ssinghal [Wed, 19 Jan 2011 23:38:50 +0000 (18:38 -0500)]
More lava colors for the stormkeep lava.

9 years agoCuinnton's latest changes to Red Planet (mirrored / team version and a new skybox)
MirceaKitsune [Wed, 19 Jan 2011 13:21:52 +0000 (15:21 +0200)]
Cuinnton's latest changes to Red Planet (mirrored / team version and a new skybox)

9 years agoCaulk behind mroe patches.. add moar clips to help movement. more ammo, replace elect...
tzork [Sun, 16 Jan 2011 19:22:02 +0000 (20:22 +0100)]
Caulk behind mroe patches.. add moar clips to help movement. more ammo, replace electro with crylink. add some map props.

9 years agodelete brush entities without brushes (oups) and fix some minor texture alignment...
Maik Merten [Sun, 16 Jan 2011 16:03:57 +0000 (17:03 +0100)]
delete brush entities without brushes (oups) and fix some minor texture alignment thingies

9 years agominor visual touches
Maik Merten [Sun, 16 Jan 2011 12:45:27 +0000 (13:45 +0100)]
minor visual touches

9 years agoturn reactor door into its own objective. BLOW IT APART! This is way less messy than...
Maik Merten [Sat, 15 Jan 2011 17:00:55 +0000 (18:00 +0100)]
turn reactor door into its own objective. BLOW IT APART! This is way less messy than the door-opens-on-button-press solution and actually makes a bit more sense. Gives defensive team time to reorganize.

9 years agomake mapinfo consistent with other maps here
Rudolf Polzer [Fri, 14 Jan 2011 05:52:36 +0000 (06:52 +0100)]
make mapinfo consistent with other maps here

9 years agofix name of the teleporter shader
Rudolf Polzer [Fri, 14 Jan 2011 05:49:35 +0000 (06:49 +0100)]
fix name of the teleporter shader

9 years agoSquashed commit of the following:
Rudolf Polzer [Fri, 14 Jan 2011 05:53:40 +0000 (06:53 +0100)]
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.

9 years agosome additional light sources in storage areas
Maik Merten [Thu, 6 Jan 2011 14:12:27 +0000 (15:12 +0100)]
some additional light sources in storage areas