]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
13 years agofixed error of ex2x/light_beam_red...
ItsMe [Mon, 11 Apr 2011 21:33:44 +0000 (23:33 +0200)]
fixed error of ex2x/light_beam_red...

13 years agoedit vorix.map.options
ItsMe [Mon, 11 Apr 2011 20:48:39 +0000 (22:48 +0200)]
edit vorix.map.options

13 years agochanged target_speaker settings
ItsMe [Mon, 11 Apr 2011 20:46:20 +0000 (22:46 +0200)]
changed target_speaker settings

13 years agonew map preview picture
ItsMe [Mon, 11 Apr 2011 14:20:33 +0000 (16:20 +0200)]
new map preview picture

13 years agochanged position of minelayer - some minor fixes
ItsMe [Sat, 9 Apr 2011 14:25:51 +0000 (16:25 +0200)]
changed position of minelayer - some minor fixes

13 years agoMerge branch 'master' into itsme/vorix
ItsMe [Sat, 9 Apr 2011 09:58:40 +0000 (11:58 +0200)]
Merge branch 'master' into itsme/vorix

13 years agoedit weapon and health/armor placement... added lava spots
ItsMe [Sat, 9 Apr 2011 09:48:37 +0000 (11:48 +0200)]
edit weapon and health/armor placement... added lava spots

13 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'

13 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

13 years agoedit mapfile
ItsMe [Mon, 14 Mar 2011 10:08:41 +0000 (11:08 +0100)]
edit mapfile

13 years agomodified map.options
ItsMe [Sat, 12 Mar 2011 18:33:27 +0000 (19:33 +0100)]
modified map.options

13 years agochanged image: resolution, format
ItsMe [Sat, 12 Mar 2011 18:29:24 +0000 (19:29 +0100)]
changed image: resolution, format

13 years agochanged image: resolution, format
ItsMe [Sat, 12 Mar 2011 18:27:22 +0000 (19:27 +0100)]
changed image: resolution, format

13 years agoMerge branches 'master' and 'itsme/vorix' into itsme/vorix
ItsMe [Sat, 12 Mar 2011 13:19:57 +0000 (14:19 +0100)]
Merge branches 'master' and 'itsme/vorix' into itsme/vorix

13 years agoadded more detail brushes
ItsMe [Thu, 10 Mar 2011 22:35:12 +0000 (23:35 +0100)]
added more detail brushes

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

13 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.

13 years agoedit vorix.map file
ItsMe [Sun, 6 Mar 2011 00:42:02 +0000 (01:42 +0100)]
edit vorix.map file

13 years agoadded vorix.map.options
ItsMe [Sat, 5 Mar 2011 00:01:41 +0000 (01:01 +0100)]
added vorix.map.options

13 years agoVorix - CTF
ItsMe [Fri, 4 Mar 2011 22:47:06 +0000 (23:47 +0100)]
Vorix - CTF

13 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).

13 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

13 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.

13 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.

13 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.

13 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.

13 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.

13 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.

13 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!!

13 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.

13 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.

13 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

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

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

13 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'

13 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'

13 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)

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

13 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'

13 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'

13 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)

13 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.

13 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'

13 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

13 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

13 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

13 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

13 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

13 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

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

13 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.

13 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

13 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

13 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

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

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

13 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)

13 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.

13 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'

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

13 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.

13 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

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

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

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

13 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

13 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

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

13 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

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

13 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

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

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

13 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

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

13 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

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

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

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

13 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

13 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.

13 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

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

13 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

13 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

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

13 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

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

13 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

13 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)

13 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'

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

13 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.

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

13 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.

13 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

13 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.

13 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.

13 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.

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