xonotic/xonotic-maps.pk3dir.git
7 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/afterslime'
Samual Lenks [Tue, 14 May 2013 04:52:38 +0000 (00:52 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/afterslime'

7 years agoMerge remote-tracking branch 'origin/Mirio/space-elevator'
Samual Lenks [Tue, 14 May 2013 04:39:17 +0000 (00:39 -0400)]
Merge remote-tracking branch 'origin/Mirio/space-elevator'

7 years agoMerge remote-tracking branch 'origin/debugger/dance'
Samual Lenks [Tue, 14 May 2013 04:29:43 +0000 (00:29 -0400)]
Merge remote-tracking branch 'origin/debugger/dance'

7 years agoMerge remote-tracking branch 'origin/master' into debugger/dance
Samual Lenks [Tue, 14 May 2013 04:24:09 +0000 (00:24 -0400)]
Merge remote-tracking branch 'origin/master' into debugger/dance

7 years agoMerge remote-tracking branch 'origin/master' into debugger/dance
Samual Lenks [Tue, 14 May 2013 04:20:29 +0000 (00:20 -0400)]
Merge remote-tracking branch 'origin/master' into debugger/dance

7 years agoMerge remote-tracking branch 'origin/debugger/oilrig'
Samual Lenks [Tue, 14 May 2013 03:51:25 +0000 (23:51 -0400)]
Merge remote-tracking branch 'origin/debugger/oilrig'

7 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/silentsiege'
Samual Lenks [Tue, 14 May 2013 03:48:26 +0000 (23:48 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege'

7 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/drain_update'
Samual Lenks [Tue, 14 May 2013 03:48:20 +0000 (23:48 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/drain_update'

7 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/fuse_by_cityy'
Samual Lenks [Tue, 14 May 2013 03:38:02 +0000 (23:38 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/fuse_by_cityy'

7 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/abyss'
Samual Lenks [Tue, 14 May 2013 03:36:12 +0000 (23:36 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/abyss'

7 years agoMerge remote-tracking branch 'origin/Mirio/leave_em_behind'
Samual Lenks [Tue, 14 May 2013 03:35:47 +0000 (23:35 -0400)]
Merge remote-tracking branch 'origin/Mirio/leave_em_behind'

7 years agoMerge remote-tracking branch 'origin/samual/cortez-darkzone-updates'
Samual Lenks [Tue, 14 May 2013 03:33:19 +0000 (23:33 -0400)]
Merge remote-tracking branch 'origin/samual/cortez-darkzone-updates'

Conflicts:
maps/darkzone.map
maps/darkzone.map.options

7 years agoMerge remote-tracking branch 'origin/cbrutail/nexballarena_cortez'
Samual Lenks [Tue, 14 May 2013 03:28:04 +0000 (23:28 -0400)]
Merge remote-tracking branch 'origin/cbrutail/nexballarena_cortez'

7 years agoMerge remote-tracking branch 'origin/debugger/glowplant'
Samual Lenks [Tue, 14 May 2013 03:27:41 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/debugger/glowplant'

7 years agoMerge remote-tracking branch 'origin/debugger/newtonian-nightmare'
Samual Lenks [Tue, 14 May 2013 03:27:35 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/debugger/newtonian-nightmare'

7 years agoMerge remote-tracking branch 'origin/debugger/courtfun'
Samual Lenks [Tue, 14 May 2013 03:27:26 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/debugger/courtfun'

7 years agoMerge remote-tracking branch 'origin/Mirio/solarium'
Samual Lenks [Tue, 14 May 2013 03:27:18 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/Mirio/solarium'

7 years agoMerge remote-tracking branch 'origin/Mirio/lightspeed'
Samual Lenks [Tue, 14 May 2013 03:27:13 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/Mirio/lightspeed'

7 years agoMerge remote-tracking branch 'origin/Mirio/techassault'
Samual Lenks [Tue, 14 May 2013 03:27:05 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/Mirio/techassault'

7 years agoMerge remote-tracking branch 'origin/Mirio/g-23'
Samual Lenks [Tue, 14 May 2013 03:26:59 +0000 (23:26 -0400)]
Merge remote-tracking branch 'origin/Mirio/g-23'

7 years agoMerge remote-tracking branch 'origin/Mirio/darkzone'
Samual Lenks [Tue, 14 May 2013 03:26:54 +0000 (23:26 -0400)]
Merge remote-tracking branch 'origin/Mirio/darkzone'

7 years agoMerge remote-tracking branch 'origin/Mirio/stormkeep'
Samual Lenks [Tue, 14 May 2013 03:26:47 +0000 (23:26 -0400)]
Merge remote-tracking branch 'origin/Mirio/stormkeep'

7 years agosome more bugs reported and fixed.
kuniuthefrogg [Mon, 13 May 2013 16:06:10 +0000 (18:06 +0200)]
some more bugs reported and fixed.

7 years agoAdd some updates to DarkZone by cortez
Samual Lenks [Thu, 9 May 2013 22:31:49 +0000 (18:31 -0400)]
Add some updates to DarkZone by cortez

7 years agoz-fights, some polishing. Should be ok.
kuniuthefrogg [Wed, 8 May 2013 20:12:16 +0000 (22:12 +0200)]
z-fights, some polishing. Should be ok.

7 years agohopefully final bugfix
kuniuthefrogg [Wed, 8 May 2013 15:03:33 +0000 (17:03 +0200)]
hopefully final bugfix

7 years agolittle experiment
kuniuthefrogg [Wed, 8 May 2013 14:40:07 +0000 (16:40 +0200)]
little experiment

7 years agobreakable barrels, textures fixed, way to powerups fixed, entities fixed, clips fixed
Debugger [Wed, 8 May 2013 12:37:15 +0000 (14:37 +0200)]
breakable barrels, textures fixed, way to powerups fixed, entities fixed, clips fixed

7 years agomapimage, mapinfo, tons of texture alignments
Debugger [Wed, 8 May 2013 11:09:54 +0000 (13:09 +0200)]
mapimage, mapinfo, tons of texture alignments

7 years agofresh map picture.
kuniuthefrogg [Tue, 7 May 2013 22:16:49 +0000 (00:16 +0200)]
fresh map picture.

7 years agoMore bugs reported. And fixed.
kuniuthefrogg [Tue, 7 May 2013 22:14:17 +0000 (00:14 +0200)]
More bugs reported. And fixed.

7 years agobugfix
kuniuthefrogg [Tue, 7 May 2013 21:52:10 +0000 (23:52 +0200)]
bugfix

7 years agofix some annoying movement obstacles.
kuniuthefrogg [Mon, 6 May 2013 20:43:02 +0000 (22:43 +0200)]
fix some annoying movement obstacles.

7 years agonew map pic, fix some reported bugs
kuniuthefrogg [Mon, 6 May 2013 20:19:19 +0000 (22:19 +0200)]
new map pic, fix some reported bugs

7 years agoit seems map leaked last time. Weird, but let's hope it won't leak now.
kuniuthefrogg [Mon, 6 May 2013 15:44:53 +0000 (17:44 +0200)]
it seems map leaked last time. Weird, but let's hope it won't leak now.

7 years agoanother texture bug fixed
Debugger [Tue, 30 Apr 2013 18:41:52 +0000 (20:41 +0200)]
another texture bug fixed

7 years agobreakable barrels added and texture bugs fixed
Debugger [Tue, 30 Apr 2013 18:38:35 +0000 (20:38 +0200)]
breakable barrels added and texture bugs fixed

7 years agofinally, fixed
Debugger [Tue, 30 Apr 2013 18:22:39 +0000 (20:22 +0200)]
finally, fixed

7 years agoremoved mg ammo
Debugger [Tue, 30 Apr 2013 18:11:31 +0000 (20:11 +0200)]
removed mg ammo

7 years agoreplaced the mapimage by a new one
Debugger [Tue, 30 Apr 2013 18:06:49 +0000 (20:06 +0200)]
replaced the mapimage by a new one

7 years agomore clipping, texture alignments, minor architecture changes, add one more spawnpoint
kuniuthefrogg [Mon, 29 Apr 2013 20:34:27 +0000 (22:34 +0200)]
more clipping, texture alignments, minor architecture changes, add one more spawnpoint

7 years agoremoved some unnoticeabel water: small reflexion bug fixed
Debugger [Sun, 28 Apr 2013 15:18:35 +0000 (17:18 +0200)]
removed some unnoticeabel water: small reflexion bug fixed

7 years agoSilent Siege - duel/ffa map by Justin
kuniuthefrogg [Mon, 22 Apr 2013 22:08:39 +0000 (00:08 +0200)]
Silent Siege - duel/ffa map by Justin

7 years agosmall revision
kuniuthefrogg [Mon, 22 Apr 2013 21:25:28 +0000 (23:25 +0200)]
small revision

7 years agoanother try
kuniuthefrogg [Mon, 22 Apr 2013 21:19:49 +0000 (23:19 +0200)]
another try

7 years agoMerge remote-tracking branch 'origin/Mirio/xoylent'
Samual Lenks [Mon, 22 Apr 2013 21:18:20 +0000 (17:18 -0400)]
Merge remote-tracking branch 'origin/Mirio/xoylent'

7 years agoMerge remote-tracking branch 'origin/Mirio/red-planet'
Samual Lenks [Mon, 22 Apr 2013 21:15:00 +0000 (17:15 -0400)]
Merge remote-tracking branch 'origin/Mirio/red-planet'

7 years agoRemove team modes from Runningman, move TDM to RunningmanCTF
Samual Lenks [Mon, 22 Apr 2013 21:07:06 +0000 (17:07 -0400)]
Remove team modes from Runningman, move TDM to RunningmanCTF

7 years agoMerge remote-tracking branch 'origin/Mirio/runningmanctf'
Samual Lenks [Mon, 22 Apr 2013 21:04:57 +0000 (17:04 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningmanctf'

7 years agoMerge remote-tracking branch 'origin/Mirio/runningman'
Samual Lenks [Mon, 22 Apr 2013 21:03:50 +0000 (17:03 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningman'

7 years agonew mappic, more playerclip, fix spawnpoint error
kuniuthefrogg [Mon, 22 Apr 2013 20:35:35 +0000 (22:35 +0200)]
new mappic, more playerclip, fix spawnpoint error

7 years agonew mappic, updated mapinfo, final polishing of item layout and barels and clips...
kuniuthefrogg [Mon, 22 Apr 2013 17:46:05 +0000 (19:46 +0200)]
new mappic, updated mapinfo, final polishing of item layout and barels and clips and such

7 years agoSet hidden, mapinfo, screenshot
Mirio [Mon, 22 Apr 2013 11:56:21 +0000 (13:56 +0200)]
Set hidden, mapinfo, screenshot

7 years agoMap cleanup, mapinfo, screenshot
Mirio [Mon, 22 Apr 2013 11:54:42 +0000 (13:54 +0200)]
Map cleanup, mapinfo, screenshot

7 years agoFix trigger_hurt, add screenshot
Mirio [Sun, 21 Apr 2013 20:05:40 +0000 (22:05 +0200)]
Fix trigger_hurt, add screenshot

7 years agoexplodeable barrels added
Debugger [Sun, 21 Apr 2013 19:44:27 +0000 (21:44 +0200)]
explodeable barrels added

7 years agoBarrels go boom
Mirio [Sun, 21 Apr 2013 19:42:23 +0000 (21:42 +0200)]
Barrels go boom

7 years agoautomatically turn on reflexions for clients
Debugger [Sun, 21 Apr 2013 19:24:17 +0000 (21:24 +0200)]
automatically turn on reflexions for clients

7 years agofixed some visual errors plus mapinfo/infoscreenshots
Debugger [Sun, 21 Apr 2013 19:19:39 +0000 (21:19 +0200)]
fixed some visual errors plus mapinfo/infoscreenshots

7 years agoBarrels go boom
Mirio [Sun, 21 Apr 2013 19:19:10 +0000 (21:19 +0200)]
Barrels go boom

7 years agomapinfo, autoscreenshots fixed
Debugger [Sun, 21 Apr 2013 16:52:34 +0000 (18:52 +0200)]
mapinfo, autoscreenshots fixed

7 years agofixed some console output bug
Debugger [Sun, 21 Apr 2013 16:10:09 +0000 (18:10 +0200)]
fixed some console output bug

7 years agofixed a few things
Debugger [Sun, 21 Apr 2013 14:23:54 +0000 (16:23 +0200)]
fixed a few things

7 years agooilrig.map
Debugger [Sun, 21 Apr 2013 14:19:47 +0000 (16:19 +0200)]
oilrig.map

7 years agoadapted textures follow the texture naming convention now
Debugger [Sun, 21 Apr 2013 13:26:32 +0000 (15:26 +0200)]
adapted textures follow the texture naming convention now

7 years agominor clip and alignment fixes
Debugger [Sun, 21 Apr 2013 12:29:11 +0000 (14:29 +0200)]
minor clip and alignment fixes

7 years agoMap cleanup, mapinfo, screenshot
Mirio [Sun, 21 Apr 2013 11:22:59 +0000 (13:22 +0200)]
Map cleanup, mapinfo, screenshot

7 years agoMap cleanup, mapinfo, screenshot
Mirio [Sun, 21 Apr 2013 11:20:04 +0000 (13:20 +0200)]
Map cleanup, mapinfo, screenshot

7 years agoMap cleanup, mapinfo, screenshot, waypoints
Mirio [Sun, 21 Apr 2013 11:18:25 +0000 (13:18 +0200)]
Map cleanup, mapinfo, screenshot, waypoints

7 years agoMap cleanup, mapinfo, screenshot
Mirio [Sun, 21 Apr 2013 11:16:24 +0000 (13:16 +0200)]
Map cleanup, mapinfo, screenshot

7 years agoMap cleanup, screenshot, mapinfo
Mirio [Sun, 21 Apr 2013 11:11:50 +0000 (13:11 +0200)]
Map cleanup, screenshot, mapinfo

7 years agoMap cleanup, mapinfo, screenshot
Mirio [Sun, 21 Apr 2013 11:02:14 +0000 (13:02 +0200)]
Map cleanup, mapinfo, screenshot

7 years agoMap cleanup, mapinfo, screenshot
Mirio [Sun, 21 Apr 2013 11:00:12 +0000 (13:00 +0200)]
Map cleanup, mapinfo, screenshot

7 years agoMap cleanup, mapinfo, screenshot
Mirio [Sun, 21 Apr 2013 10:54:04 +0000 (12:54 +0200)]
Map cleanup, mapinfo, screenshot

7 years agoOops forgot version
Mirio [Sun, 21 Apr 2013 10:51:55 +0000 (12:51 +0200)]
Oops forgot version

7 years agoMap cleanup, mapinfo, screenshot
Mirio [Sun, 21 Apr 2013 10:48:37 +0000 (12:48 +0200)]
Map cleanup, mapinfo, screenshot

7 years agoDifferent changes, map cleanup
Mirio [Sun, 21 Apr 2013 10:38:38 +0000 (12:38 +0200)]
Different changes, map cleanup

7 years agoautoscreenshots, some more playerclip, texturing fixes
kuniuthefrogg [Sat, 20 Apr 2013 20:24:41 +0000 (22:24 +0200)]
autoscreenshots, some more playerclip, texturing fixes

7 years agofix Mirios autoscreenshotzz
kuniuthefrogg [Sat, 20 Apr 2013 20:18:35 +0000 (22:18 +0200)]
fix Mirios autoscreenshotzz

7 years agoedited some minor stuff
Debugger [Sat, 20 Apr 2013 16:36:35 +0000 (18:36 +0200)]
edited some minor stuff

7 years agoedited mapinfo
Debugger [Fri, 19 Apr 2013 21:31:57 +0000 (23:31 +0200)]
edited mapinfo

7 years agoedited mapinfo
Debugger [Fri, 19 Apr 2013 21:28:08 +0000 (23:28 +0200)]
edited mapinfo

7 years agoadd autoscreenshot entity, fix outdated gametypes in mapinfo
kuniuthefrogg [Fri, 19 Apr 2013 20:52:03 +0000 (22:52 +0200)]
add autoscreenshot entity, fix outdated gametypes in mapinfo

7 years agofixed some stuff
Debugger [Fri, 19 Apr 2013 20:50:08 +0000 (22:50 +0200)]
fixed some stuff

7 years agoadd some computers to empty room (*some* purpose)
Maik Merten [Fri, 19 Apr 2013 17:17:14 +0000 (19:17 +0200)]
add some computers to empty room (*some* purpose)

7 years agomore water tweaks
Maik Merten [Thu, 18 Apr 2013 18:07:19 +0000 (20:07 +0200)]
more water tweaks

7 years agoput water surface into a skybox so it covers a huuuuge virtual area. Make actual...
Maik Merten [Thu, 18 Apr 2013 17:59:55 +0000 (19:59 +0200)]
put water surface into a skybox so it covers a huuuuge virtual area. Make actual water invisible.

7 years agonothing to see here
Maik Merten [Wed, 17 Apr 2013 18:27:29 +0000 (20:27 +0200)]
nothing to see here

7 years agoremove some annoying and ugly struts, put a lighting post in there
Maik Merten [Wed, 17 Apr 2013 18:26:08 +0000 (20:26 +0200)]
remove some annoying and ugly struts, put a lighting post in there

7 years agoclose bottom clip box (with the new terrain you could escape)
Maik Merten [Wed, 17 Apr 2013 18:03:36 +0000 (20:03 +0200)]
close bottom clip box (with the new terrain you could escape)

7 years agorework sea floor so that players cannot see the edge (effectively the oil rig now...
Maik Merten [Wed, 17 Apr 2013 17:30:47 +0000 (19:30 +0200)]
rework sea floor so that players cannot see the edge (effectively the oil rig now stands on an underwater mountain, the seabed no being discernible due to underwater fog)

7 years agoadd the shader file to shaderlist.txt
kuniuthefrogg [Tue, 16 Apr 2013 18:41:11 +0000 (20:41 +0200)]
add the shader file to shaderlist.txt

7 years agonew terrain, add autoscreenshot entity
Maik Merten [Tue, 16 Apr 2013 18:16:19 +0000 (20:16 +0200)]
new terrain, add autoscreenshot entity

7 years agoaaghrrr .shader file too
kuniuthefrogg [Tue, 16 Apr 2013 07:19:28 +0000 (09:19 +0200)]
aaghrrr .shader file too

7 years agoforgot to commit custom shaders ... also some compile values tweaks.
kuniuthefrogg [Tue, 16 Apr 2013 07:15:02 +0000 (09:15 +0200)]
forgot to commit custom shaders ... also some compile values tweaks.

7 years agoFuse - cool duel map, winner of 2012 duel contest
kuniuthefrogg [Mon, 15 Apr 2013 21:17:02 +0000 (23:17 +0200)]
Fuse - cool duel map, winner of 2012 duel contest

7 years agosome more items tweaking
kuniuthefrogg [Mon, 15 Apr 2013 20:19:44 +0000 (22:19 +0200)]
some more items tweaking

7 years agominor caulk fix
Maik Merten [Mon, 15 Apr 2013 19:42:59 +0000 (21:42 +0200)]
minor caulk fix

7 years agominor texture scaling fixes
Maik Merten [Sun, 14 Apr 2013 18:37:45 +0000 (20:37 +0200)]
minor texture scaling fixes

7 years agominor texture scaling correction
Maik Merten [Sun, 14 Apr 2013 18:27:06 +0000 (20:27 +0200)]
minor texture scaling correction