xonotic/xonotic-maps.pk3dir.git
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.

8 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

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

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

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

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

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

8 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

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

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

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

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

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

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

8 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

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

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

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

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

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

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

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

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

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

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

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

8 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 ;)

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

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

8 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

8 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 ;)

8 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

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

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

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

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

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

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

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

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

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

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

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

8 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

8 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

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

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

8 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

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

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

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

9 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

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

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

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

9 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

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

9 years agotrigger_secret entity
Przemysław Grzywacz [Sun, 16 Oct 2011 21:17:09 +0000 (23:17 +0200)]
trigger_secret entity

9 years agoRed and green jumppad textures + shaders.
cbrutail [Fri, 14 Oct 2011 13:43:07 +0000 (15:43 +0200)]
Red and green jumppad textures + shaders.

9 years agoChanged GOLDEN to GOLD key in map entities
przemek [Thu, 13 Oct 2011 08:35:30 +0000 (10:35 +0200)]
Changed GOLDEN to GOLD key in map entities

9 years agoMerge remote-tracking branch 'origin/cbrutail/texturesex2x-greentrims'
Rudolf Polzer [Sun, 9 Oct 2011 14:21:34 +0000 (16:21 +0200)]
Merge remote-tracking branch 'origin/cbrutail/texturesex2x-greentrims'

9 years agoGreenedge warpzone
cbrutail [Sun, 9 Oct 2011 13:31:05 +0000 (15:31 +0200)]
Greenedge warpzone

9 years agoentities definitions for data branch atheros/item_keys (item_key1, item_key2, trigger...
przemek [Sun, 9 Oct 2011 13:05:16 +0000 (15:05 +0200)]
entities definitions for data branch atheros/item_keys (item_key1, item_key2, trigger_keylock)

9 years agoHAH! I LIED! These are not trim recolors, but light. Green, to be precise. Shader...
cbrutail [Thu, 6 Oct 2011 20:27:24 +0000 (22:27 +0200)]
HAH! I LIED! These are not trim recolors, but light. Green, to be precise. Shader modified too.

9 years agofixing ma' branch
cbrutail [Tue, 4 Oct 2011 06:49:51 +0000 (08:49 +0200)]
fixing ma' branch

9 years agoMerge branch 'master' into cbrutail/map-lightspeed
cbrutail [Tue, 4 Oct 2011 06:40:12 +0000 (08:40 +0200)]
Merge branch 'master' into cbrutail/map-lightspeed

9 years agoThere. I've switched back spawnpoints to old, booooring, red in red base blue in...
cbrutail [Mon, 3 Oct 2011 22:39:18 +0000 (00:39 +0200)]
There. I've switched back spawnpoints to old, booooring, red in red base blue in blue base. Booo... ;(

9 years agoMerge branch 'master' into cbrutail/map-lightspeed
cbrutail [Mon, 3 Oct 2011 22:15:17 +0000 (00:15 +0200)]
Merge branch 'master' into cbrutail/map-lightspeed

Conflicts:
scripts/liquids_water.shader

I hope I don't fuck up my branch

9 years agoMerge remote-tracking branch 'origin/cbrutail/newtexture-facility114inxtrim_green'
Rudolf Polzer [Mon, 3 Oct 2011 14:17:24 +0000 (16:17 +0200)]
Merge remote-tracking branch 'origin/cbrutail/newtexture-facility114inxtrim_green'

9 years agoNew green trim textures + shaders.
cbrutail [Mon, 3 Oct 2011 13:53:59 +0000 (15:53 +0200)]
New green trim textures + shaders.

9 years agoMerge remote-tracking branch 'origin/cbrutail/leavefix220911'
Rudolf Polzer [Mon, 3 Oct 2011 13:36:42 +0000 (15:36 +0200)]
Merge remote-tracking branch 'origin/cbrutail/leavefix220911'

9 years agoMerge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Sun, 2 Oct 2011 18:48:34 +0000 (20:48 +0200)]
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir

9 years agoadd "botclip" shader
Rudolf Polzer [Sun, 2 Oct 2011 18:47:21 +0000 (20:47 +0200)]
add "botclip" shader

9 years ago Added deformVertexes wave function to slime coming out from pipes, so they look...
cbrutail [Fri, 30 Sep 2011 06:40:28 +0000 (08:40 +0200)]
 Added deformVertexes wave function to slime coming out from pipes, so they look more realistic. Also, gave Cortez proper credit.

9 years agoFixed a texture
cbrutail [Fri, 30 Sep 2011 06:00:10 +0000 (08:00 +0200)]
Fixed a texture

9 years agoRemove courtfun-t1.map (http://dev.xonotic.org/issues/687)
Jakob MG [Tue, 27 Sep 2011 04:16:33 +0000 (06:16 +0200)]
Remove courtfun-t1.map (dev.xonotic.org/issues/687)

9 years agolast q3map2 compile failed, revert to previous one
Rudolf Polzer [Mon, 19 Sep 2011 14:05:04 +0000 (16:05 +0200)]
last q3map2 compile failed, revert to previous one

9 years agooops, forgot this
Rudolf Polzer [Fri, 16 Sep 2011 21:11:57 +0000 (23:11 +0200)]
oops, forgot this

9 years agoUse a different way of surface merging (-meta) to get less surfaces and improve fps
Rudolf Polzer [Fri, 16 Sep 2011 21:10:20 +0000 (23:10 +0200)]
Use a different way of surface merging (-meta) to get less surfaces and improve fps

9 years agoleave em behind: 22 sec
Rudolf Polzer [Tue, 13 Sep 2011 20:24:12 +0000 (22:24 +0200)]
leave em behind: 22 sec

9 years agomake messages more consistent
Rudolf Polzer [Tue, 13 Sep 2011 12:46:30 +0000 (14:46 +0200)]
make messages more consistent

9 years agohide warnings for cases where we know it's fine
Rudolf Polzer [Tue, 13 Sep 2011 12:40:04 +0000 (14:40 +0200)]
hide warnings for cases where we know it's fine

9 years agorefactor erroring/warning
Rudolf Polzer [Tue, 13 Sep 2011 12:38:27 +0000 (14:38 +0200)]
refactor erroring/warning

9 years agoimprove texture blend handling
Rudolf Polzer [Tue, 13 Sep 2011 12:35:41 +0000 (14:35 +0200)]
improve texture blend handling

9 years agomore fixes. All EE are fixed now.
Rudolf Polzer [Tue, 13 Sep 2011 11:46:46 +0000 (13:46 +0200)]
more fixes. All EE are fixed now.

9 years agoshader audit: another fix
Rudolf Polzer [Tue, 13 Sep 2011 11:19:39 +0000 (13:19 +0200)]
shader audit: another fix

9 years agoshader audit script fixes (don't report same shader twice)
Rudolf Polzer [Tue, 13 Sep 2011 11:15:46 +0000 (13:15 +0200)]
shader audit script fixes (don't report same shader twice)

9 years agosome shader fixes again
Rudolf Polzer [Tue, 13 Sep 2011 11:15:37 +0000 (13:15 +0200)]
some shader fixes again

9 years agomake the laser sumo level easier
Rudolf Polzer [Tue, 13 Sep 2011 07:45:58 +0000 (09:45 +0200)]
make the laser sumo level easier