]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
12 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

12 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

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

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

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

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

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

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

12 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

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

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

12 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

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

12 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

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

12 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

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

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

12 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

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

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

12 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

12 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

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

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

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

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

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

12 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

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

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

12 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

12 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

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

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

12 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

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

12 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

12 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

12 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

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

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

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

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

12 years agoMerge branch 'master' into cbrutail/g-23_cant_take_it_anymore
cbrutail [Thu, 29 Dec 2011 16:02:49 +0000 (17:02 +0100)]
Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore

12 years agodocument conveyor
Rudolf Polzer [Thu, 29 Dec 2011 14:30:45 +0000 (15:30 +0100)]
document conveyor

12 years agodocument func_conveyor
Rudolf Polzer [Thu, 29 Dec 2011 14:16:11 +0000 (15:16 +0100)]
document func_conveyor

12 years agofix ctf mapinfos
Rudolf Polzer [Thu, 29 Dec 2011 11:29:24 +0000 (12:29 +0100)]
fix ctf mapinfos

12 years agoFixed scale of forklifts on the map (0.65), and made a conveyor belt.
cbrutail [Wed, 28 Dec 2011 23:22:06 +0000 (00:22 +0100)]
Fixed scale of forklifts on the map (0.65), and made a conveyor belt.

12 years agostate lighting mode explicitly in all options files (for transition of the default)
Rudolf Polzer [Sun, 25 Dec 2011 17:53:11 +0000 (18:53 +0100)]
state lighting mode explicitly in all options files (for transition of the default)

12 years agoMerge branch 'master' into divVerent/g-23-srgbcolor
Rudolf Polzer [Sun, 25 Dec 2011 17:51:21 +0000 (18:51 +0100)]
Merge branch 'master' into divVerent/g-23-srgbcolor

12 years agoARGH! Reduce floodlight. That fixes it.
Rudolf Polzer [Sun, 25 Dec 2011 17:14:43 +0000 (18:14 +0100)]
ARGH! Reduce floodlight. That fixes it.

12 years agoplease compile g-23 again
Rudolf Polzer [Sun, 25 Dec 2011 16:10:59 +0000 (17:10 +0100)]
please compile g-23 again

12 years agocompetitive my ass
cbrutail [Thu, 22 Dec 2011 22:51:28 +0000 (23:51 +0100)]
competitive my ass

12 years agofix floodlight amount
Rudolf Polzer [Sun, 18 Dec 2011 21:37:57 +0000 (22:37 +0100)]
fix floodlight amount

12 years agoFixes. Bummer.
cbrutail [Sun, 18 Dec 2011 21:33:13 +0000 (22:33 +0100)]
Fixes. Bummer.

12 years agoTrims of upper center floor, some clip changes requested by nifrek, and tZork's wind...
cbrutail [Sun, 18 Dec 2011 21:08:25 +0000 (22:08 +0100)]
Trims of upper center floor, some clip changes requested by nifrek, and tZork's wind tunnel shaft request.

12 years agog-23: use -sRGBcolor mode too, to have nicer color values in the .map again
Rudolf Polzer [Sun, 18 Dec 2011 20:12:08 +0000 (21:12 +0100)]
g-23: use -sRGBcolor mode too, to have nicer color values in the .map again

12 years agosRGB compile, here we go.
cbrutail [Sun, 18 Dec 2011 20:12:05 +0000 (21:12 +0100)]
sRGB compile, here we go.

12 years agoTwo small fix in playerclips.
cbrutail [Sun, 18 Dec 2011 19:33:14 +0000 (20:33 +0100)]
Two small fix in playerclips.

12 years agoFixing a small texture issue.
cbrutail [Sun, 18 Dec 2011 09:53:55 +0000 (10:53 +0100)]
Fixing a small texture issue.

12 years agoTrims. Me like.
cbrutail [Sun, 18 Dec 2011 00:40:53 +0000 (01:40 +0100)]
Trims. Me like.

12 years agoEven more playerclipping.
cbrutail [Sat, 17 Dec 2011 21:50:30 +0000 (22:50 +0100)]
Even more playerclipping.

12 years agoPlayerclips, and some small changes here and there. I can still revert them though.
cbrutail [Sat, 17 Dec 2011 20:20:23 +0000 (21:20 +0100)]
Playerclips, and some small changes here and there. I can still revert them though.

12 years agofix wrong keyword
Rudolf Polzer [Thu, 15 Dec 2011 21:18:38 +0000 (22:18 +0100)]
fix wrong keyword

12 years agooops, forgot this
Rudolf Polzer [Thu, 15 Dec 2011 20:21:12 +0000 (21:21 +0100)]
oops, forgot this

12 years agohelp radiant
Rudolf Polzer [Thu, 15 Dec 2011 19:59:41 +0000 (20:59 +0100)]
help radiant

12 years agoadd water0_cubemap_alphamod (alpha-moddable version, untesselated)
Rudolf Polzer [Thu, 15 Dec 2011 19:40:05 +0000 (20:40 +0100)]
add water0_cubemap_alphamod (alpha-moddable version, untesselated)

12 years agoadd alphamod shaders :)
Rudolf Polzer [Thu, 15 Dec 2011 19:05:07 +0000 (20:05 +0100)]
add alphamod shaders :)

12 years agoDarkzone really gets all the hint ;)
cbrutail [Wed, 14 Dec 2011 22:31:39 +0000 (23:31 +0100)]
Darkzone really gets all the hint ;)

12 years agoMore detailing and hinting.
cbrutail [Wed, 14 Dec 2011 07:37:39 +0000 (08:37 +0100)]
More detailing and hinting.

12 years agoMA room hinted.
cbrutail [Mon, 12 Dec 2011 23:54:38 +0000 (00:54 +0100)]
MA room hinted.

12 years agoThe map know has detail brushes. :P
cbrutail [Mon, 12 Dec 2011 23:19:42 +0000 (00:19 +0100)]
The map know has detail brushes. :P

12 years agoI see a Dark zone ahead ;)
cbrutail [Mon, 12 Dec 2011 20:33:05 +0000 (21:33 +0100)]
I see a Dark zone ahead ;)

12 years agofix "legacy type keyword" in lightspeed
Rudolf Polzer [Sun, 4 Dec 2011 13:59:37 +0000 (14:59 +0100)]
fix "legacy type keyword" in lightspeed

12 years agoreduced bot count on xoylent laser sumo to 2. Harmata is right.
Rudolf Polzer [Thu, 1 Dec 2011 08:12:51 +0000 (09:12 +0100)]
reduced bot count on xoylent laser sumo to 2. Harmata is right.

12 years agoforbid using spawnpoint.target as a trigger target. use target2 instead.
Rudolf Polzer [Fri, 25 Nov 2011 10:26:54 +0000 (11:26 +0100)]
forbid using spawnpoint.target as a trigger target. use target2 instead.

12 years agorecompile for bug-be-gone
Rudolf Polzer [Tue, 22 Nov 2011 11:13:25 +0000 (12:13 +0100)]
recompile for bug-be-gone

12 years agophilipk1x and philipk2x texture sets
Rudolf Polzer [Sun, 20 Nov 2011 15:55:31 +0000 (16:55 +0100)]
philipk1x and philipk2x texture sets

12 years agoupdate entities.ent
Rudolf Polzer [Sat, 19 Nov 2011 19:17:31 +0000 (20:17 +0100)]
update entities.ent

12 years agonow with appropriate sound :)
Rudolf Polzer [Sat, 19 Nov 2011 18:36:29 +0000 (19:36 +0100)]
now with appropriate sound :)

12 years agoadd yet another way to open sesame
Rudolf Polzer [Sat, 19 Nov 2011 17:45:02 +0000 (18:45 +0100)]
add yet another way to open sesame

too bad you have to have been inside it to get inside again...

12 years agoTUBA spawnflag for trigger_magicear
Rudolf Polzer [Sat, 19 Nov 2011 16:42:56 +0000 (17:42 +0100)]
TUBA spawnflag for trigger_magicear

12 years agoxoylent: add some stuff
Rudolf Polzer [Sat, 29 Oct 2011 10:28:10 +0000 (12:28 +0200)]
xoylent: add some stuff

12 years agosplit up the rain entities
Rudolf Polzer [Sat, 19 Nov 2011 13:52:43 +0000 (14:52 +0100)]
split up the rain entities

12 years agoremove three brushless rain entities. Maybe they cause no harm, they sure cause no...
Rudolf Polzer [Sat, 19 Nov 2011 12:20:37 +0000 (13:20 +0100)]
remove three brushless rain entities. Maybe they cause no harm, they sure cause no gain.

12 years agotry using -fast vis to see if this fixes the skybox flicker bug
Rudolf Polzer [Thu, 17 Nov 2011 09:00:33 +0000 (10:00 +0100)]
try using -fast vis to see if this fixes the skybox flicker bug

12 years agog-23: first map to get sRGB updated
Rudolf Polzer [Wed, 16 Nov 2011 09:27:41 +0000 (10:27 +0100)]
g-23: first map to get sRGB updated

12 years agomore lightspeed compiles please
Rudolf Polzer [Tue, 15 Nov 2011 21:26:49 +0000 (22:26 +0100)]
more lightspeed compiles please

12 years agooops, shader was called different
Rudolf Polzer [Tue, 15 Nov 2011 21:26:11 +0000 (22:26 +0100)]
oops, shader was called different

12 years agoadd a few clips to make the map more laser friendly
Rudolf Polzer [Tue, 15 Nov 2011 21:13:26 +0000 (22:13 +0100)]
add a few clips to make the map more laser friendly

12 years agodefine the "lcd_map" shader
Rudolf Polzer [Tue, 15 Nov 2011 20:59:18 +0000 (21:59 +0100)]
define the "lcd_map" shader

13 years agochnaged sensation3 to cdtrack 14
cbrutail [Fri, 28 Oct 2011 07:04:55 +0000 (09:04 +0200)]
chnaged sensation3 to cdtrack 14

13 years agoChosen a soundtrack, and fixed a minor stuff in mapinfo.
cbrutail [Fri, 28 Oct 2011 06:18:33 +0000 (08:18 +0200)]
Chosen a soundtrack, and fixed a minor stuff in mapinfo.

13 years agoMerge branch 'master' into cbrutail/map-lightspeed
cbrutail [Fri, 28 Oct 2011 06:04:46 +0000 (08:04 +0200)]
Merge branch 'master' into cbrutail/map-lightspeed

13 years agoMerge remote-tracking branch 'origin/atheros/secret'
Rudolf Polzer [Thu, 27 Oct 2011 12:32:14 +0000 (14:32 +0200)]
Merge remote-tracking branch 'origin/atheros/secret'

13 years agoMerge remote-tracking branch 'origin/atheros/item_keys'
Rudolf Polzer [Mon, 24 Oct 2011 09:54:23 +0000 (11:54 +0200)]
Merge remote-tracking branch 'origin/atheros/item_keys'

13 years agoUpdated func_door entity
Przemysław Grzywacz [Tue, 18 Oct 2011 21:32:18 +0000 (23:32 +0200)]
Updated func_door entity

13 years agogeneric item_key and changes to old key related entities
Przemysław Grzywacz [Tue, 18 Oct 2011 21:07:32 +0000 (23:07 +0200)]
generic item_key and changes to old key related entities

13 years agoMerge remote-tracking branch 'origin/cbrutail/textures-facility114inx-additionals'
Rudolf Polzer [Tue, 18 Oct 2011 13:18:57 +0000 (15:18 +0200)]
Merge remote-tracking branch 'origin/cbrutail/textures-facility114inx-additionals'