xonotic/xonotic-maps.pk3dir.git
8 years agoMerge remote-tracking branch 'origin/master' into divVerent/courtfun2
Rudolf Polzer [Sat, 9 Jul 2011 14:15:03 +0000 (16:15 +0200)]
Merge remote-tracking branch 'origin/master' into divVerent/courtfun2

Conflicts:
scripts/shaderlist.txt

8 years agono longer need this file
Rudolf Polzer [Thu, 30 Jun 2011 11:23:24 +0000 (13:23 +0200)]
no longer need this file

8 years agomerge .def files of turrets and vehicles into main
Rudolf Polzer [Thu, 30 Jun 2011 11:13:09 +0000 (13:13 +0200)]
merge .def files of turrets and vehicles into main

8 years agosamplesize of red-planet should be 8 for better performance
Rudolf Polzer [Mon, 27 Jun 2011 14:43:36 +0000 (16:43 +0200)]
samplesize of red-planet should be 8 for better performance

8 years agoEditor models for vehicles
Jakob MG [Wed, 22 Jun 2011 12:50:28 +0000 (14:50 +0200)]
Editor models for vehicles

8 years agoAdd a .def for vehicles so mappers can use them.
Jakob MG [Wed, 22 Jun 2011 11:24:16 +0000 (13:24 +0200)]
Add a .def for vehicles so mappers can use them.

8 years agodocument the new spawnflag
Rudolf Polzer [Fri, 17 Jun 2011 06:58:28 +0000 (08:58 +0200)]
document the new spawnflag

8 years agoMerge remote branch 'origin/cbrutail/trakmodelfixes'
Jakob MG [Thu, 16 Jun 2011 15:19:15 +0000 (17:19 +0200)]
Merge remote branch 'origin/cbrutail/trakmodelfixes'

8 years agoMerge remote branch 'origin/cbrutail/treeleavesfix'
Jakob MG [Thu, 16 Jun 2011 15:14:52 +0000 (17:14 +0200)]
Merge remote branch 'origin/cbrutail/treeleavesfix'

8 years agoremoved alphafunc from shader, and addded blendfunc
cbrutail [Wed, 15 Jun 2011 07:15:42 +0000 (09:15 +0200)]
removed alphafunc from shader, and addded blendfunc

8 years agoMerge remote-tracking branch 'origin/diabolik/afterslime'
merlijn [Tue, 14 Jun 2011 06:53:33 +0000 (08:53 +0200)]
Merge remote-tracking branch 'origin/diabolik/afterslime'

8 years agoUpdate version number.
Sahil Singhal [Tue, 14 Jun 2011 03:45:36 +0000 (23:45 -0400)]
Update version number.

8 years agoFixes the object errors, but not sure whats causing sound issues.
Sahil Singhal [Tue, 14 Jun 2011 03:44:06 +0000 (23:44 -0400)]
Fixes the object errors, but not sure whats causing sound issues.

8 years agonew, high-res textures
cbrutail [Mon, 13 Jun 2011 22:16:15 +0000 (00:16 +0200)]
new, high-res textures

8 years agoremoved some obviously floating leaves
cbrutail [Mon, 13 Jun 2011 17:55:19 +0000 (19:55 +0200)]
removed some obviously floating leaves

8 years ago4 times larger texture
cbrutail [Mon, 13 Jun 2011 17:49:10 +0000 (19:49 +0200)]
4 times larger texture

8 years agoModified two textures, to look better with ATC rendering
cbrutail [Mon, 13 Jun 2011 14:37:56 +0000 (16:37 +0200)]
Modified two textures, to look better with ATC rendering

8 years agoentities.ent for it too
Rudolf Polzer [Wed, 8 Jun 2011 09:20:12 +0000 (11:20 +0200)]
entities.ent for it too

8 years agoentities.def update for target_random
Rudolf Polzer [Wed, 8 Jun 2011 08:59:20 +0000 (10:59 +0200)]
entities.def update for target_random

8 years agoDeleted a backup file
cbrutail [Mon, 6 Jun 2011 21:17:24 +0000 (23:17 +0200)]
Deleted a backup file

8 years agoMerge remote branch 'origin/cbrutail/trakmodelfixes'
Jakob MG [Mon, 6 Jun 2011 14:23:49 +0000 (16:23 +0200)]
Merge remote branch 'origin/cbrutail/trakmodelfixes'

8 years agoIntroducing .skin files for trak's models. Lot's of new models and goodies to use...
cbrutail [Sun, 5 Jun 2011 20:47:29 +0000 (22:47 +0200)]
Introducing .skin files for trak's models. Lot's of new models and goodies to use in maps.

8 years agodocument _skin key in misc_model
Rudolf Polzer [Sun, 5 Jun 2011 18:40:59 +0000 (20:40 +0200)]
document _skin key in misc_model

8 years agoFixed trak's models, now they can be used.
cbrutail [Sat, 4 Jun 2011 23:44:34 +0000 (01:44 +0200)]
Fixed trak's models, now they can be used.

8 years agoand even more rename of sniperrifle -> rifle
Rudolf Polzer [Tue, 24 May 2011 18:25:50 +0000 (20:25 +0200)]
and even more rename of sniperrifle -> rifle

8 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Tue, 24 May 2011 18:12:12 +0000 (20:12 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir

8 years agomore sniperrifle -> rifle rename
Rudolf Polzer [Tue, 24 May 2011 12:35:02 +0000 (14:35 +0200)]
more sniperrifle -> rifle rename

8 years agoMerge remote-tracking branch 'origin/diabolik/afterslime'
merlijn [Mon, 23 May 2011 20:04:46 +0000 (22:04 +0200)]
Merge remote-tracking branch 'origin/diabolik/afterslime'

8 years agoMerge remote-tracking branch 'origin/mirceakitsune/red_planet'
Rudolf Polzer [Sun, 22 May 2011 18:01:04 +0000 (20:01 +0200)]
Merge remote-tracking branch 'origin/mirceakitsune/red_planet'

8 years agoForgot to up version number.
Sahil Singhal [Mon, 16 May 2011 19:02:33 +0000 (15:02 -0400)]
Forgot to up version number.

8 years agoFixed jumppad for better flow. Should be ready for merge now.
Sahil Singhal [Mon, 16 May 2011 19:00:20 +0000 (15:00 -0400)]
Fixed jumppad for better flow. Should be ready for merge now.

8 years agoMerge remote branch 'origin/master' into diabolik/afterslime
Sahil Singhal [Mon, 16 May 2011 18:51:48 +0000 (14:51 -0400)]
Merge remote branch 'origin/master' into diabolik/afterslime

Conflicts:
scripts/shaderlist.txt

8 years agoMerge remote-tracking branch 'origin/savagex/common'
Rudolf Polzer [Sat, 14 May 2011 12:47:31 +0000 (14:47 +0200)]
Merge remote-tracking branch 'origin/savagex/common'

8 years agolet's pass shader-audit
Rudolf Polzer [Fri, 29 Apr 2011 21:57:07 +0000 (23:57 +0200)]
let's pass shader-audit

8 years agoSquashed commit of the following:
Rudolf Polzer [Fri, 29 Apr 2011 21:52:36 +0000 (23:52 +0200)]
Squashed commit of the following:

commit 1183a0272b30ac39357ed7b2ccdb0996b707e1f6
Author: FruitieX <fruitiex@gmail.com>
Date:   Tue Apr 12 23:25:54 2011 +0300

    add g foo to all .obj models, hope this doesnt mess things up

commit db8b7f81286a018a2dbc49da87eff2f5fa4ba79e
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Sat Apr 9 00:42:38 2011 +0200

    Xoylent: generate height for the textures (I know this isn't perfect, better would be redoing this texture set properly with heights)

commit cf4bace597f8126edfc805b9cf672a5861925630
Author: sev <sev.ch@web.de>
Date:   Thu Apr 7 14:34:02 2011 +0200

    Xoylent: Minor revision. Lower trickjump ramps (-8qu), removed compatibility player clips (e.g. under stairs), adjusted .options file

commit 26d14e35387d10e8e3ecf9fd07fb8efe35b79034
Merge: 7fe68ad a4c63b1
Author: sev <sev.ch@web.de>
Date:   Mon Mar 21 14:28:24 2011 +0100

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

commit 7fe68ad9df7f78c5517dcf8e7025823ff5591dcb
Merge: f256132 30e6874
Author: sev <sev.ch@web.de>
Date:   Sat Mar 12 21:02:56 2011 +0100

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

commit f2561322b51fd97c4f7ac4c3347886ccb73c95a5
Author: sev <sev.ch@web.de>
Date:   Mon Mar 7 22:56:54 2011 +0100

    Xoylent: Changed extragalactic editorimages from high res tga to jpg, revised shader file

commit f343ba85632bb4fbc1d98ea580f0f9f12c4d3189
Author: sev <sev.ch@web.de>
Date:   Mon Mar 7 22:33:36 2011 +0100

    Xoylent: Soylent remake, also including revision of env/extragalactic_asteroids

8 years agoPosition some barrels properly on terrain
MirceaKitsune [Fri, 22 Apr 2011 23:19:35 +0000 (02:19 +0300)]
Position some barrels properly on terrain

8 years agoAdd a forgotten weapon clip around a barrel.
MirceaKitsune [Fri, 22 Apr 2011 23:16:59 +0000 (02:16 +0300)]
Add a forgotten weapon clip around a barrel.

8 years agoMake all of the barrels explosive. Original idea and attempt by C.Brutail, although...
MirceaKitsune [Fri, 22 Apr 2011 23:14:47 +0000 (02:14 +0300)]
Make all of the barrels explosive. Original idea and attempt by C.Brutail, although now they use misc_breakablemodel instead.

8 years agodocument respawntime, respawntimejitter
Rudolf Polzer [Fri, 22 Apr 2011 18:22:50 +0000 (20:22 +0200)]
document respawntime, respawntimejitter

8 years agoMerge remote-tracking branch 'origin/morphed/crate02'
Rudolf Polzer [Fri, 22 Apr 2011 15:47:42 +0000 (17:47 +0200)]
Merge remote-tracking branch 'origin/morphed/crate02'

8 years agoupdate entities.ent file
Rudolf Polzer [Fri, 22 Apr 2011 15:44:38 +0000 (17:44 +0200)]
update entities.ent file

8 years agoadd misc_breakablemodel
Rudolf Polzer [Fri, 22 Apr 2011 15:38:50 +0000 (17:38 +0200)]
add misc_breakablemodel

8 years agosmall fix, should be ready to merge now
Morphed [Fri, 22 Apr 2011 13:49:10 +0000 (15:49 +0200)]
small fix, should be ready to merge now

8 years agocrate model
Morphed [Fri, 22 Apr 2011 13:17:35 +0000 (15:17 +0200)]
crate model

8 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 agoFixed conflicting cdtracks
mand1nga [Fri, 8 Apr 2011 22:03:37 +0000 (19:03 -0300)]
Fixed conflicting cdtracks

9 years agoMerge branch 'master' into diabolik/afterslime
mand1nga [Fri, 8 Apr 2011 21:49:36 +0000 (18:49 -0300)]
Merge branch 'master' into diabolik/afterslime

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 agofirst new courtfun version in months. Implementing some suggestions by cortez666...
Maik Merten [Sat, 19 Mar 2011 16:32:55 +0000 (17:32 +0100)]
first new courtfun version in months. Implementing some suggestions by cortez666 (not all yet)

9 years agosome more of cortez' ideas
Maik Merten [Sat, 19 Mar 2011 15:07:36 +0000 (16:07 +0100)]
some more of cortez' ideas

9 years agostart implementing ideas from cortez666
Maik Merten [Sat, 19 Mar 2011 13:54:11 +0000 (14:54 +0100)]
start implementing ideas from cortez666

9 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into divVerent...
Maik Merten [Sat, 19 Mar 2011 11:58:10 +0000 (12:58 +0100)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into divVerent/courtfun2

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 agoMerge branch 'diabolik/afterslime' of ssh://git.xonotic.org/xonotic-maps.pk3dir into...
ssinghal [Sun, 6 Mar 2011 21:00:58 +0000 (16:00 -0500)]
Merge branch 'diabolik/afterslime' of ssh://git.xonotic.org/xonotic-maps.pk3dir into diabolik/afterslime

Conflicts:
maps/afterslime.mapinfo
maps/afterslime.waypoints

9 years agoUpdate version in .options.
ssinghal [Sun, 6 Mar 2011 20:53:24 +0000 (15:53 -0500)]
Update version in .options.

9 years agoAdded bot waypoints, music, and dom. Fixed valves.
ssinghal [Sun, 6 Mar 2011 20:52:21 +0000 (15:52 -0500)]
Added bot waypoints, music, and dom. Fixed valves.

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 agoBot waypoints
MirceaKitsune [Thu, 17 Feb 2011 23:23:59 +0000 (01:23 +0200)]
Bot waypoints

9 years agoOptimize preview image a bit, and make it of a good size. Can be reverted if anyone...
MirceaKitsune [Thu, 17 Feb 2011 22:46:33 +0000 (00:46 +0200)]
Optimize preview image a bit, and make it of a good size. Can be reverted if anyone disagrees.

9 years agoAdd a better song to the mapinfo
MirceaKitsune [Thu, 17 Feb 2011 22:41:39 +0000 (00:41 +0200)]
Add a better song to the mapinfo

9 years agoForgot the mapinfo whoops.
ssinghal [Thu, 17 Feb 2011 22:15:43 +0000 (17:15 -0500)]
Forgot the mapinfo whoops.

9 years agoMore trims to afterslime and fix stairs in the front.
ssinghal [Thu, 17 Feb 2011 21:09:17 +0000 (16:09 -0500)]
More trims to afterslime and fix stairs in the front.

9 years agoMerge remote branch 'origin/master' into diabolik/afterslime
ssinghal [Thu, 17 Feb 2011 21:05:11 +0000 (16:05 -0500)]
Merge remote branch 'origin/master' into diabolik/afterslime

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 agoForgot to change to version 5.
ssinghal [Tue, 1 Feb 2011 20:29:48 +0000 (15:29 -0500)]
Forgot to change to version 5.

9 years agoGet the lava color from liquids_lava now.
ssinghal [Tue, 1 Feb 2011 20:26:20 +0000 (15:26 -0500)]
Get the lava color from liquids_lava now.

9 years agoMerge remote branch 'origin/master' into diabolik/afterslime
ssinghal [Tue, 1 Feb 2011 20:21:29 +0000 (15:21 -0500)]
Merge remote branch 'origin/master' into diabolik/afterslime

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