xonotic/xonotic-maps.pk3dir.git
8 years agoMerge remote-tracking branch 'origin/cbrutail/darkzone'
Rudolf Polzer [Wed, 29 Feb 2012 09:46:55 +0000 (10:46 +0100)]
Merge remote-tracking branch 'origin/cbrutail/darkzone'

8 years agoMerge remote branch 'origin/morphed/exomorphx-alphashadowfix'
Samual [Tue, 28 Feb 2012 21:51:49 +0000 (16:51 -0500)]
Merge remote branch 'origin/morphed/exomorphx-alphashadowfix'

8 years agoadd alphashadow to grate textures in exomorphx set
Morphed [Mon, 27 Feb 2012 23:02:08 +0000 (00:02 +0100)]
add alphashadow to grate textures in exomorphx set

8 years agoNewer campaign by Mirio
Samual [Sun, 26 Feb 2012 05:04:41 +0000 (00:04 -0500)]
Newer campaign by Mirio

8 years ago*bump
cbrutail [Mon, 13 Feb 2012 20:09:24 +0000 (21:09 +0100)]
*bump

8 years agoMerged new textures, and fixed in map.
cbrutail [Mon, 13 Feb 2012 19:42:38 +0000 (20:42 +0100)]
Merged new textures, and fixed in map.

8 years agoMerge branch 'cbrutail/texture-exx_wall-metal01c' into cbrutail/darkzone
cbrutail [Mon, 13 Feb 2012 19:40:28 +0000 (20:40 +0100)]
Merge branch 'cbrutail/texture-exx_wall-metal01c' into cbrutail/darkzone

8 years agoA new texture and modified shader for darkzone
cbrutail [Mon, 13 Feb 2012 19:39:17 +0000 (20:39 +0100)]
A new texture and modified shader for darkzone

8 years agoChanges to textures
cbrutail [Mon, 13 Feb 2012 19:10:19 +0000 (20:10 +0100)]
Changes to textures

8 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Sat, 11 Feb 2012 20:53:46 +0000 (21:53 +0100)]
Merge branch 'master' into cbrutail/darkzone

8 years agoMerge remote-tracking branch 'origin/cbrutail/map-lightspeed_domereplace'
Rudolf Polzer [Sat, 11 Feb 2012 20:23:57 +0000 (21:23 +0100)]
Merge remote-tracking branch 'origin/cbrutail/map-lightspeed_domereplace'

8 years agoVines were not 1 qu thick. Also, new mapimage.
cbrutail [Fri, 10 Feb 2012 23:30:36 +0000 (00:30 +0100)]
Vines were not 1 qu thick. Also, new mapimage.

8 years agoMerge branch 'master' into cbrutail/map-lightspeed_domereplace
cbrutail [Fri, 10 Feb 2012 22:11:29 +0000 (23:11 +0100)]
Merge branch 'master' into cbrutail/map-lightspeed_domereplace

8 years agoSome fixes here and there, plus adding some little bugs ;)
cbrutail [Fri, 10 Feb 2012 22:05:11 +0000 (23:05 +0100)]
Some fixes here and there, plus adding some little bugs ;)

8 years agorecompile courtfun and g-23 due to sRGB -fast bug
Rudolf Polzer [Thu, 9 Feb 2012 10:22:49 +0000 (11:22 +0100)]
recompile courtfun and g-23 due to sRGB -fast bug

8 years ago*bump
cbrutail [Mon, 6 Feb 2012 17:51:37 +0000 (18:51 +0100)]
*bump

8 years agoNew map image, and fixing some textures here and there... I hope.
cbrutail [Mon, 6 Feb 2012 17:42:17 +0000 (18:42 +0100)]
New map image, and fixing some textures here and there... I hope.

8 years agoAdding samplesize 4, and bounce 6
cbrutail [Mon, 6 Feb 2012 10:19:23 +0000 (11:19 +0100)]
Adding samplesize 4, and bounce 6

8 years agoFixing the screen, it was never ok.
cbrutail [Sun, 5 Feb 2012 19:10:57 +0000 (20:10 +0100)]
Fixing the screen, it was never ok.

8 years agoIntroducing sRGB, also fixing lights inside the bsp for it (arealights are halfed...
cbrutail [Sun, 5 Feb 2012 12:48:48 +0000 (13:48 +0100)]
Introducing sRGB, also fixing lights inside the bsp for it (arealights are halfed, targetted 1,5x scale). Fixing some texture problems here and there.

8 years agoReplaced the ugly patch domes with models from THEFTBOT (very big thank you). TODO...
cbrutail [Sun, 5 Feb 2012 00:33:25 +0000 (01:33 +0100)]
Replaced the ugly patch domes with models from THEFTBOT (very big thank you). TODO: sRGB lighting, fixing it, and fixing envmap images.

8 years agoapply the game type renames
Rudolf Polzer [Thu, 2 Feb 2012 18:09:11 +0000 (19:09 +0100)]
apply the game type renames

8 years agofix a few more bad uses of tcmod scroll
Rudolf Polzer [Fri, 27 Jan 2012 17:11:58 +0000 (18:11 +0100)]
fix a few more bad uses of tcmod scroll

8 years agoreverse order of scroll/scale because scroll snaps to 0..1 range
Rudolf Polzer [Thu, 26 Jan 2012 21:54:17 +0000 (22:54 +0100)]
reverse order of scroll/scale because scroll snaps to 0..1 range

8 years agoAdd keepaway to afterslime, and also add clan arena to g-23 (uses round based gamepla...
Samual [Tue, 24 Jan 2012 20:10:30 +0000 (15:10 -0500)]
Add keepaway to afterslime, and also add clan arena to g-23 (uses round based gameplay just like freezetag, so it's justified here)

8 years agoDirtscale -> 1.5
cbrutail [Sat, 21 Jan 2012 12:02:25 +0000 (13:02 +0100)]
Dirtscale -> 1.5

8 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Sat, 21 Jan 2012 12:01:20 +0000 (13:01 +0100)]
Merge branch 'master' into cbrutail/darkzone

8 years agobump g-23
Rudolf Polzer [Sat, 21 Jan 2012 11:48:45 +0000 (12:48 +0100)]
bump g-23

8 years agoredo courtfun autoscreenshots please :P
Rudolf Polzer [Sat, 21 Jan 2012 09:49:20 +0000 (10:49 +0100)]
redo courtfun autoscreenshots please :P

8 years agoMapshot for courtfun
Samual [Fri, 20 Jan 2012 22:08:50 +0000 (17:08 -0500)]
Mapshot for courtfun

8 years agowhoops, afterslime already had 91 of these haha
Samual [Fri, 20 Jan 2012 21:36:53 +0000 (16:36 -0500)]
whoops, afterslime already had 91 of these haha

8 years agoReplace weapon_hlac with various other solutions for the different maps. Now, HLAC...
Samual [Fri, 20 Jan 2012 21:25:10 +0000 (16:25 -0500)]
Replace weapon_hlac with various other solutions for the different maps. Now, HLAC is not on any default map.

8 years agoTry info_autoscreenshot positions on afterslime
Samual [Fri, 20 Jan 2012 20:49:44 +0000 (15:49 -0500)]
Try info_autoscreenshot positions on afterslime

8 years agocourtfun: fix cvar name g_powerups
Rudolf Polzer [Fri, 20 Jan 2012 18:35:51 +0000 (19:35 +0100)]
courtfun: fix cvar name g_powerups

8 years agoautoscreenshot locations for glowplant
Rudolf Polzer [Fri, 20 Jan 2012 17:03:17 +0000 (18:03 +0100)]
autoscreenshot locations for glowplant

8 years agoalso support "target" in info_autoscreenshot (not implemented yet)
Rudolf Polzer [Fri, 20 Jan 2012 16:18:51 +0000 (17:18 +0100)]
also support "target" in info_autoscreenshot (not implemented yet)

8 years agoMerge remote-tracking branch 'origin/savagex/courtfun-sRGB'
Rudolf Polzer [Mon, 16 Jan 2012 19:48:38 +0000 (20:48 +0100)]
Merge remote-tracking branch 'origin/savagex/courtfun-sRGB'

8 years agoanother recompile please, Y U no make good screenshots
Rudolf Polzer [Mon, 16 Jan 2012 15:46:38 +0000 (16:46 +0100)]
another recompile please, Y U no make good screenshots

8 years agonew compile and screenshot run please to test info_autoscreenshot
Rudolf Polzer [Mon, 16 Jan 2012 14:49:14 +0000 (15:49 +0100)]
new compile and screenshot run please to test info_autoscreenshot

8 years agodefine the first autoscreenshot point for g-23
Rudolf Polzer [Mon, 16 Jan 2012 10:57:09 +0000 (11:57 +0100)]
define the first autoscreenshot point for g-23

8 years agoautoscreenshot location
Rudolf Polzer [Mon, 16 Jan 2012 09:49:00 +0000 (10:49 +0100)]
autoscreenshot location

8 years agoadd some lighting detail (grate shadows, yeah!) and fix some ceiling height proportio...
Maik Merten [Sun, 15 Jan 2012 14:06:26 +0000 (15:06 +0100)]
add some lighting detail (grate shadows, yeah!) and fix some ceiling height proportions (no change in navigatable area/gameplay)
search/replace some NULL textures, replace with common/caulk

8 years agomerge some brushes that originate from the original "clone, rotate" origin of the...
Maik Merten [Sun, 15 Jan 2012 12:29:41 +0000 (13:29 +0100)]
merge some brushes that originate from the original "clone, rotate" origin of the second base

8 years agomoar smoke
Maik Merten [Sat, 14 Jan 2012 17:31:31 +0000 (18:31 +0100)]
moar smoke

8 years agoslightly tweak floodlight
Maik Merten [Sat, 14 Jan 2012 10:03:44 +0000 (11:03 +0100)]
slightly tweak floodlight

8 years agoadd -sRGB to map options, just to be sure
Maik Merten [Fri, 13 Jan 2012 21:10:28 +0000 (22:10 +0100)]
add -sRGB to map options, just to be sure

8 years agoadjust to sRGB
Maik Merten [Fri, 13 Jan 2012 21:00:58 +0000 (22:00 +0100)]
adjust to sRGB

8 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Fri, 13 Jan 2012 19:54:42 +0000 (20:54 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir

8 years agoscreenshot for drain was missing
Rudolf Polzer [Fri, 13 Jan 2012 19:54:31 +0000 (20:54 +0100)]
screenshot for drain was missing

8 years agowaypoints for drain
Rudolf Polzer [Mon, 9 Jan 2012 20:29:49 +0000 (21:29 +0100)]
waypoints for drain

8 years agoslightly darker darkzone
Rudolf Polzer [Sat, 7 Jan 2012 20:12:56 +0000 (21:12 +0100)]
slightly darker darkzone

8 years agoMerge branch 'cbrutail/darkzone' of git://de.git.xonotic.org/xonotic/xonotic-maps...
cbrutail [Fri, 6 Jan 2012 15:59:24 +0000 (16:59 +0100)]
Merge branch 'cbrutail/darkzone' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrutail/darkzone

8 years agoAdding said textures and shaders.
cbrutail [Fri, 6 Jan 2012 15:57:14 +0000 (16:57 +0100)]
Adding said textures and shaders.

8 years agoModified a shader, it doesn't have a glowmap anymore. Also, fixed the rather odd...
cbrutail [Fri, 6 Jan 2012 15:50:36 +0000 (16:50 +0100)]
Modified a shader, it doesn't have a glowmap anymore. Also, fixed the rather odd patch in that alcove. Thx for matthiaskrgr for poking me about it.

8 years agoanother recompile, this time it's good
Rudolf Polzer [Fri, 6 Jan 2012 14:45:59 +0000 (15:45 +0100)]
another recompile, this time it's good

8 years agoMerge branch 'master' into cbrutail/darkzone
Rudolf Polzer [Fri, 6 Jan 2012 14:44:32 +0000 (15:44 +0100)]
Merge branch 'master' into cbrutail/darkzone

8 years agobump version to cause a new compile
Rudolf Polzer [Fri, 6 Jan 2012 13:59:45 +0000 (14:59 +0100)]
bump version to cause a new compile

8 years agorename of the map
Rudolf Polzer [Thu, 5 Jan 2012 09:59:06 +0000 (10:59 +0100)]
rename of the map

8 years agoRevert "try randomized dirtmapping - for this amount that may look better (to be...
Rudolf Polzer [Thu, 5 Jan 2012 09:46:27 +0000 (10:46 +0100)]
Revert "try randomized dirtmapping - for this amount that may look better (to be reverted if fail)" because it WAS fail

This reverts commit bee625c48be7fc7e259a2bd3ddaa07c4f30a3a9d.

8 years agoMerge remote-tracking branch 'origin/savagex/courfun-nexball'
Rudolf Polzer [Thu, 5 Jan 2012 09:29:46 +0000 (10:29 +0100)]
Merge remote-tracking branch 'origin/savagex/courfun-nexball'

8 years agoMerge remote-tracking branch 'origin/cbrutail/map-leave_em_behind_soundfix'
Rudolf Polzer [Thu, 5 Jan 2012 09:28:17 +0000 (10:28 +0100)]
Merge remote-tracking branch 'origin/cbrutail/map-leave_em_behind_soundfix'

8 years agoMerge remote-tracking branch 'origin/cbrutail/reorganise_sounds1'
Rudolf Polzer [Thu, 5 Jan 2012 09:27:32 +0000 (10:27 +0100)]
Merge remote-tracking branch 'origin/cbrutail/reorganise_sounds1'

8 years agotry randomized dirtmapping - for this amount that may look better (to be reverted...
Rudolf Polzer [Thu, 5 Jan 2012 09:21:48 +0000 (10:21 +0100)]
try randomized dirtmapping - for this amount that may look better (to be reverted if fail)

8 years agowrite the .options file using new style -sRGB option (no lighting change)
Rudolf Polzer [Thu, 5 Jan 2012 09:19:17 +0000 (10:19 +0100)]
write the .options file using new style -sRGB option (no lighting change)

8 years agoMerge branch 'master' into cbrutail/darkzone
Rudolf Polzer [Thu, 5 Jan 2012 09:15:10 +0000 (10:15 +0100)]
Merge branch 'master' into cbrutail/darkzone

8 years agoshader audit: more strict
Rudolf Polzer [Thu, 5 Jan 2012 09:14:51 +0000 (10:14 +0100)]
shader audit: more strict

8 years agoAdded proper description, authors, bot waypoints and preview image.
cbrutail [Wed, 4 Jan 2012 18:40:18 +0000 (19:40 +0100)]
Added proper description, authors, bot waypoints and preview image.

8 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Wed, 4 Jan 2012 18:34:28 +0000 (19:34 +0100)]
Merge branch 'master' into cbrutail/darkzone

8 years agoIt is DONE.
cbrutail [Wed, 4 Jan 2012 17:46:11 +0000 (18:46 +0100)]
It is DONE.

8 years agoMerge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
cbrutail [Wed, 4 Jan 2012 17:17:07 +0000 (18:17 +0100)]
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone

8 years agowave 4 -> wave 2
cbrutail [Wed, 4 Jan 2012 17:16:41 +0000 (18:16 +0100)]
wave 4 -> wave 2

8 years agoMerge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
cbrutail [Wed, 4 Jan 2012 17:09:03 +0000 (18:09 +0100)]
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone

8 years agoWrong values here and there :D Copy paste fail.
cbrutail [Wed, 4 Jan 2012 17:08:29 +0000 (18:08 +0100)]
Wrong values here and there :D Copy paste fail.

8 years agotrying to get flowy stuff to be wavy too...
cbrutail [Wed, 4 Jan 2012 17:05:12 +0000 (18:05 +0100)]
trying to get flowy stuff to be wavy too...

8 years agoMerge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
cbrutail [Wed, 4 Jan 2012 15:41:48 +0000 (16:41 +0100)]
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone

8 years agoSome new shaders for lava with deformvertex wave, so it looks like a bit wavy when...
cbrutail [Wed, 4 Jan 2012 15:40:11 +0000 (16:40 +0100)]
Some new shaders for lava with deformvertex wave, so it looks like a bit wavy when exiting from a pipe.

8 years agoFinally managed to get all sounds working. Some fixes here and there happened too.
cbrutail [Wed, 4 Jan 2012 15:32:12 +0000 (16:32 +0100)]
Finally managed to get all sounds working. Some fixes here and there happened too.

8 years agomention default speed of func_rotating
Rudolf Polzer [Wed, 4 Jan 2012 10:52:32 +0000 (11:52 +0100)]
mention default speed of func_rotating

8 years agoMerge branch 'cbrutail/reorganise_sounds1' into cbrutail/darkzone
cbrutail [Tue, 3 Jan 2012 23:46:24 +0000 (00:46 +0100)]
Merge branch 'cbrutail/reorganise_sounds1' into cbrutail/darkzone

8 years agoMerged new sound locations, and fixed sounds for map.
cbrutail [Tue, 3 Jan 2012 23:44:39 +0000 (00:44 +0100)]
Merged new sound locations, and fixed sounds for map.

8 years agoMoved these two sound files, so they can be reused later. Also, added LOOPED_START...
cbrutail [Tue, 3 Jan 2012 23:31:23 +0000 (00:31 +0100)]
Moved these two sound files, so they can be reused later. Also, added LOOPED_START vorbiscomment.

8 years agoAdded some ambient sounds, more to come.
cbrutail [Tue, 3 Jan 2012 23:10:17 +0000 (00:10 +0100)]
Added some ambient sounds, more to come.

8 years agoForgot to include renamed files.
cbrutail [Mon, 2 Jan 2012 22:00:41 +0000 (23:00 +0100)]
Forgot to include renamed files.

8 years agoRenaming map name back to normal. Trying shadeangle 45 in meta compile as tZork sugge...
cbrutail [Mon, 2 Jan 2012 21:59:36 +0000 (22:59 +0100)]
Renaming map name back to normal. Trying shadeangle 45 in meta compile as tZork suggested.

8 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Sat, 31 Dec 2011 12:59:10 +0000 (13:59 +0100)]
Merge branch 'master' into cbrutail/darkzone

8 years agoyou spin me right round baby right round! Fixed cogheel lighting problems, added...
cbrutail [Sat, 31 Dec 2011 12:48:06 +0000 (13:48 +0100)]
you spin me right round baby right round! Fixed cogheel lighting problems, added new models for them, and tow more playerclips.

8 years agoadd nexball support in courtfun. Also change map picture. And yes, this branch name...
Maik Merten [Sat, 31 Dec 2011 11:38:31 +0000 (12:38 +0100)]
add nexball support in courtfun. Also change map picture. And yes, this branch name has a typo in it.

8 years agono decals on conveyor belt please
Rudolf Polzer [Fri, 30 Dec 2011 20:12:37 +0000 (21:12 +0100)]
no decals on conveyor belt please

8 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Fri, 30 Dec 2011 19:57:24 +0000 (20:57 +0100)]
Merge branch 'master' into cbrutail/darkzone

8 years agoMerge branch 'cbrutail/g-23_cant_take_it_anymore'
Rudolf Polzer [Fri, 30 Dec 2011 19:10:54 +0000 (20:10 +0100)]
Merge branch 'cbrutail/g-23_cant_take_it_anymore'

8 years agouse trigger_conveyor! Now they work PERFECTLY.
Rudolf Polzer [Fri, 30 Dec 2011 18:47:08 +0000 (19:47 +0100)]
use trigger_conveyor! Now they work PERFECTLY.

8 years agoMerge branch 'master' into cbrutail/g-23_cant_take_it_anymore
Rudolf Polzer [Fri, 30 Dec 2011 17:59:22 +0000 (18:59 +0100)]
Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore

Conflicts:
maps/g-23.map

8 years agoReverted the lift to finally work the way it should.
cbrutail [Fri, 30 Dec 2011 14:43:05 +0000 (15:43 +0100)]
Reverted the lift to finally work the way it should.

8 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Fri, 30 Dec 2011 14:34:33 +0000 (15:34 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir

8 years agoexplicitly set "lip" on all func_plats
Rudolf Polzer [Fri, 30 Dec 2011 14:34:07 +0000 (15:34 +0100)]
explicitly set "lip" on all func_plats

8 years agoMerge branch 'master' into cbrutail/g-23_cant_take_it_anymore
cbrutail [Fri, 30 Dec 2011 14:33:32 +0000 (15:33 +0100)]
Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore

8 years agoChanged func_plat to func_door, reverting in next commit.
cbrutail [Fri, 30 Dec 2011 14:31:11 +0000 (15:31 +0100)]
Changed func_plat to func_door, reverting in next commit.

8 years agoFinished the converyor belt, works like charm. I tried to visually fix the elevator...
cbrutail [Fri, 30 Dec 2011 12:57:00 +0000 (13:57 +0100)]
Finished the converyor belt, works like charm. I tried to visually fix the elevator, epicly failed, it doesn't even working anymore. SOMEBODY PLEASE HALP!

8 years agodocument conveyor changes
Rudolf Polzer [Thu, 29 Dec 2011 22:15:21 +0000 (23:15 +0100)]
document conveyor changes

8 years agoJust a commit, but not the real thing.
cbrutail [Thu, 29 Dec 2011 21:35:29 +0000 (22:35 +0100)]
Just a commit, but not the real thing.