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

10 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

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

10 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

10 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

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

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

10 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

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

10 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

10 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

10 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

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

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

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

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

10 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

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

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

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

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

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

10 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

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

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

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

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

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

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

10 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

10 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

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

10 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

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

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

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

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

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

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

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

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

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

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

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

11 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

11 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

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

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

11 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

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

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

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

11 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

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

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

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

11 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

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

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

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

11 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

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

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

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

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

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

11 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

11 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... ;(

11 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

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

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

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

11 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

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

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

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

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

11 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

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

11 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

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

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

11 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

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

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

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