]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
13 years agoRemove orphaned entities caused by duplication bug (bad netRadiant, bad!)
MirceaKitsune [Wed, 8 Jun 2011 16:01:15 +0000 (19:01 +0300)]
Remove orphaned entities caused by duplication bug (bad netRadiant, bad!)

13 years agoSome small visual improvements
MirceaKitsune [Wed, 8 Jun 2011 15:23:48 +0000 (18:23 +0300)]
Some small visual improvements

13 years agoAdd player clips to some of the stairs I forgot to add them to.
MirceaKitsune [Wed, 8 Jun 2011 14:43:51 +0000 (17:43 +0300)]
Add player clips to some of the stairs I forgot to add them to.

13 years agoTweak middle building jump pads, and re-add the old ones in a different form.
MirceaKitsune [Wed, 8 Jun 2011 14:29:41 +0000 (17:29 +0300)]
Tweak middle building jump pads, and re-add the old ones in a different form.

13 years agoNexball support. Ball located at the middle of the rotating bridge.
MirceaKitsune [Wed, 8 Jun 2011 13:50:42 +0000 (16:50 +0300)]
Nexball support. Ball located at the middle of the rotating bridge.

13 years agoFix floating generators
MirceaKitsune [Wed, 8 Jun 2011 13:03:00 +0000 (16:03 +0300)]
Fix floating generators

13 years agoBetter control point positions, so they get in the way less.
MirceaKitsune [Wed, 8 Jun 2011 12:59:38 +0000 (15:59 +0300)]
Better control point positions, so they get in the way less.

13 years agoOnslaught support. There are two separate link setups, one outside and one inside...
MirceaKitsune [Wed, 8 Jun 2011 12:51:52 +0000 (15:51 +0300)]
Onslaught support. There are two separate link setups, one outside and one inside. Each team can choose which path to take to link to the enemy generator.

13 years agoSome tiny tweaks
MirceaKitsune [Wed, 8 Jun 2011 12:17:02 +0000 (15:17 +0300)]
Some tiny tweaks

13 years agoTweak two brushes
MirceaKitsune [Tue, 7 Jun 2011 22:50:07 +0000 (01:50 +0300)]
Tweak two brushes

13 years agoReplace a texture
MirceaKitsune [Tue, 7 Jun 2011 22:48:08 +0000 (01:48 +0300)]
Replace a texture

13 years agoUse trigger_hurt entities instead, to keep people from jumping over. Should be the...
MirceaKitsune [Tue, 7 Jun 2011 22:21:03 +0000 (01:21 +0300)]
Use trigger_hurt entities instead, to keep people from jumping over. Should be the most logical way I guess, rather than colliding with nothing.

13 years agoFix some laser teams outside
MirceaKitsune [Tue, 7 Jun 2011 22:00:24 +0000 (01:00 +0300)]
Fix some laser teams outside

13 years agoLast laser gates, placed on the outside bridge around the center. Currently uses...
MirceaKitsune [Tue, 7 Jun 2011 21:56:08 +0000 (00:56 +0300)]
Last laser gates, placed on the outside bridge around the center. Currently uses some lame player clips to keep players from jumping over, since I don't know how to prevent that the best way.

13 years agoLasers that block the warpzones between the bases (so no one can go through them...
MirceaKitsune [Tue, 7 Jun 2011 21:31:14 +0000 (00:31 +0300)]
Lasers that block the warpzones between the bases (so no one can go through them). You can still shoot though them however, and hit someone in the enemy base from your base. Will be useful in Onslaught, where you can damage the enemy generator from your base once you made all the links.

13 years agoSome tweaks to the laser toggling buttons
MirceaKitsune [Tue, 7 Jun 2011 21:17:43 +0000 (00:17 +0300)]
Some tweaks to the laser toggling buttons

13 years agoAdded the first team lasers. A player from the team who owns the laser can pass throu...
MirceaKitsune [Tue, 7 Jun 2011 21:02:30 +0000 (00:02 +0300)]
Added the first team lasers. A player from the team who owns the laser can pass through it, but someone from the opposing team will get killed instantly, allowing only some teams to pass through some doors. The ones at the base entrances inside the rooms can be disabled for a few seconds using buttons, however, so invaders can have a chance too.

13 years agoOops, forgot to update the song in mapinfo
MirceaKitsune [Tue, 7 Jun 2011 20:01:22 +0000 (23:01 +0300)]
Oops, forgot to update the song in mapinfo

13 years agoAdd CTF to the mapinfo, and also update the gametype architecture
MirceaKitsune [Tue, 7 Jun 2011 17:19:17 +0000 (20:19 +0300)]
Add CTF to the mapinfo, and also update the gametype architecture

13 years agoCTF flags. Onslaught and possibly Nexball will be added later. I'll also fix the...
MirceaKitsune [Tue, 7 Jun 2011 17:16:47 +0000 (20:16 +0300)]
CTF flags. Onslaught and possibly Nexball will be added later. I'll also fix the portals working as shortcuts between the bases (you can currently capture the flag instantly due to that).

13 years agoTeam spawning points
MirceaKitsune [Tue, 7 Jun 2011 17:13:07 +0000 (20:13 +0300)]
Team spawning points

13 years agoOutdoor team architectures and paintings. Also recolor the bridge warnings from red...
MirceaKitsune [Tue, 7 Jun 2011 17:01:54 +0000 (20:01 +0300)]
Outdoor team architectures and paintings. Also recolor the bridge warnings from red to yellow, to not be confusing in team games.

13 years agoTeam mode architecture, for coloring the red and blue bases, as well as directions...
MirceaKitsune [Tue, 7 Jun 2011 16:17:27 +0000 (19:17 +0300)]
Team mode architecture, for coloring the red and blue bases, as well as directions toward them.

13 years agoGroup all rails and ladders into func_group entities
MirceaKitsune [Tue, 7 Jun 2011 15:22:00 +0000 (18:22 +0300)]
Group all rails and ladders into func_group entities

13 years agoBot waypoints for the new architecture
MirceaKitsune [Mon, 6 Jun 2011 23:56:55 +0000 (02:56 +0300)]
Bot waypoints for the new architecture

13 years agoUpdate rtlights and get lights out of solid (now that the rooms have been moved)
MirceaKitsune [Mon, 6 Jun 2011 23:05:55 +0000 (02:05 +0300)]
Update rtlights and get lights out of solid (now that the rooms have been moved)

13 years agoSome small tweaks, and add more guiding arrows to the elevators.
MirceaKitsune [Mon, 6 Jun 2011 22:46:27 +0000 (01:46 +0300)]
Some small tweaks, and add more guiding arrows to the elevators.

13 years agoAdd a display and indicator inside elevator entrances
MirceaKitsune [Mon, 6 Jun 2011 22:09:58 +0000 (01:09 +0300)]
Add a display and indicator inside elevator entrances

13 years agoFix some elevator settings
MirceaKitsune [Mon, 6 Jun 2011 21:51:57 +0000 (00:51 +0300)]
Fix some elevator settings

13 years agoElevator panels, making it easier to know what the right way is.
MirceaKitsune [Mon, 6 Jun 2011 21:41:48 +0000 (00:41 +0300)]
Elevator panels, making it easier to know what the right way is.

13 years agoRandomly add some damage and crates / barrels to the elevator rooms
MirceaKitsune [Mon, 6 Jun 2011 20:42:33 +0000 (23:42 +0300)]
Randomly add some damage and crates / barrels to the elevator rooms

13 years agoPosition textures in the opposing rooms properly (they got tilted differently as...
MirceaKitsune [Mon, 6 Jun 2011 20:24:19 +0000 (23:24 +0300)]
Position textures in the opposing rooms properly (they got tilted differently as I moved the rooms around).

13 years agoMirror the elevator to the other room, but in an opposite height. So that one of...
MirceaKitsune [Mon, 6 Jun 2011 20:06:01 +0000 (23:06 +0300)]
Mirror the elevator to the other room, but in an opposite height. So that one of the rooms is higher from the center room, and the other is lower.

13 years agoAttempt to add elevators between the opposing rooms and the center room. Done for...
MirceaKitsune [Mon, 6 Jun 2011 16:14:33 +0000 (19:14 +0300)]
Attempt to add elevators between the opposing rooms and the center room. Done for one room only so far, until all is tweaked correctly. There are two elevators, one for going up and the other for going down (each protected by a door). Change aimed at increasing vis and performance again.

13 years agoForgot to make some brushes details
MirceaKitsune [Sun, 5 Jun 2011 22:32:28 +0000 (01:32 +0300)]
Forgot to make some brushes details

13 years agoChange a texture back
MirceaKitsune [Sun, 5 Jun 2011 22:23:14 +0000 (01:23 +0300)]
Change a texture back

13 years agoAdd two more sustainment pipes somewhere, for a better feeling of architectural stability
MirceaKitsune [Sun, 5 Jun 2011 22:16:03 +0000 (01:16 +0300)]
Add two more sustainment pipes somewhere, for a better feeling of architectural stability

13 years agoAnother texture position fix
MirceaKitsune [Sun, 5 Jun 2011 22:11:17 +0000 (01:11 +0300)]
Another texture position fix

13 years agoFix some textures I forgot from a previous change
MirceaKitsune [Sun, 5 Jun 2011 22:09:58 +0000 (01:09 +0300)]
Fix some textures I forgot from a previous change

13 years agoChange some textures
MirceaKitsune [Sun, 5 Jun 2011 22:06:57 +0000 (01:06 +0300)]
Change some textures

13 years agoReposition jump pads to not hit the new buildings.
MirceaKitsune [Sun, 5 Jun 2011 21:43:23 +0000 (00:43 +0300)]
Reposition jump pads to not hit the new buildings.

13 years agoAdd some new architecture outside, aimed at creating more vis to improve performance...
MirceaKitsune [Sun, 5 Jun 2011 21:28:48 +0000 (00:28 +0300)]
Add some new architecture outside, aimed at creating more vis to improve performance. Should also look prettier and more complex now.

13 years agoImprove some ugly textures outside
MirceaKitsune [Sun, 5 Jun 2011 15:26:13 +0000 (18:26 +0300)]
Improve some ugly textures outside

13 years agoAbort and revert my old idea of making a middle room between one of the hallways...
MirceaKitsune [Sun, 5 Jun 2011 15:18:27 +0000 (18:18 +0300)]
Abort and revert my old idea of making a middle room between one of the hallways. Wasn't either good looking, nor made the gameplay feel any better than it is.

13 years agoMerge branch 'master' into mirceakitsune/lab610
MirceaKitsune [Sun, 5 Jun 2011 15:10:33 +0000 (18:10 +0300)]
Merge branch 'master' into mirceakitsune/lab610

13 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

13 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

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

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

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

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

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

13 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

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

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

13 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

13 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

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

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

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

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

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

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

13 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

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

13 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

13 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

13 years agoFixed conflicting cdtracks
mand1nga [Fri, 8 Apr 2011 22:03:37 +0000 (19:03 -0300)]
Fixed conflicting cdtracks

13 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

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

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

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

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

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

13 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

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

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

13 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

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