xonotic/xonotic-maps.pk3dir.git
9 years agoTUBA spawnflag for trigger_magicear
Rudolf Polzer [Sat, 19 Nov 2011 16:42:56 +0000 (17:42 +0100)]
TUBA spawnflag for trigger_magicear

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

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

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

9 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

9 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

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

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

9 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

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

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

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

10 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

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

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

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

10 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

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

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

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

10 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

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

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

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

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

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

10 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

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

10 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

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

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

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

10 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

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

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

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

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

10 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

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

10 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

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

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

10 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

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

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

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

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

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

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

10 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

10 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Tue, 13 Sep 2011 07:45:10 +0000 (09:45 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir

10 years agocampaign: adjust difficulty of the rc levels
Rudolf Polzer [Tue, 13 Sep 2011 07:44:27 +0000 (09:44 +0200)]
campaign: adjust difficulty of the rc levels

10 years agoupdate shaderlist.txt xonotic-v0.5.0
Rudolf Polzer [Sun, 4 Sep 2011 17:54:03 +0000 (19:54 +0200)]
update shaderlist.txt

10 years agooffsetmapping baselines for xoylent
Rudolf Polzer [Sat, 3 Sep 2011 19:45:41 +0000 (21:45 +0200)]
offsetmapping baselines for xoylent

10 years agofix another too weak offsetmapped texture
Rudolf Polzer [Sat, 3 Sep 2011 15:12:57 +0000 (17:12 +0200)]
fix another too weak offsetmapped texture

10 years agodowngrade useless normalmap to a warning (as the engine detects this now and turns...
Rudolf Polzer [Sat, 3 Sep 2011 14:59:32 +0000 (16:59 +0200)]
downgrade useless normalmap to a warning (as the engine detects this now and turns off offsetmapping)

10 years agofix one more level
Rudolf Polzer [Sat, 3 Sep 2011 14:09:35 +0000 (16:09 +0200)]
fix one more level

10 years agomore levelling for exx and trak5x
Rudolf Polzer [Sat, 3 Sep 2011 14:03:41 +0000 (16:03 +0200)]
more levelling for exx and trak5x

10 years agomore trivially made offsetmapping parameters, yet to be tuned (but at least not worse...
Rudolf Polzer [Sat, 3 Sep 2011 13:46:24 +0000 (15:46 +0200)]
more trivially made offsetmapping parameters, yet to be tuned (but at least not worse than none)

10 years agofix some more wrong ones
Rudolf Polzer [Sat, 3 Sep 2011 13:32:51 +0000 (15:32 +0200)]
fix some more wrong ones

10 years agofix height of floor_simplines in exx
Rudolf Polzer [Sat, 3 Sep 2011 13:19:03 +0000 (15:19 +0200)]
fix height of floor_simplines in exx

10 years agoexx offsetmapping height fixes
Rudolf Polzer [Sat, 3 Sep 2011 13:09:05 +0000 (15:09 +0200)]
exx offsetmapping height fixes

10 years agoproceduralx: offsetmapping parameters
Rudolf Polzer [Sat, 3 Sep 2011 12:21:28 +0000 (14:21 +0200)]
proceduralx: offsetmapping parameters

10 years agoadd one missing heightmap to narmorx
Rudolf Polzer [Sat, 3 Sep 2011 12:15:05 +0000 (14:15 +0200)]
add one missing heightmap to narmorx

10 years agonarmorx: offsetmapping parameters
Rudolf Polzer [Sat, 3 Sep 2011 12:12:13 +0000 (14:12 +0200)]
narmorx: offsetmapping parameters

helps dance a LOT

10 years agoheight-match ex2x (safe to do, no xonotic map uses it)
Rudolf Polzer [Sat, 3 Sep 2011 11:37:21 +0000 (13:37 +0200)]
height-match ex2x (safe to do, no xonotic map uses it)

10 years agofix more blendfunc use
Rudolf Polzer [Sat, 3 Sep 2011 11:33:54 +0000 (13:33 +0200)]
fix more blendfunc use

10 years agoalso include alphagen
Rudolf Polzer [Sat, 3 Sep 2011 11:31:02 +0000 (13:31 +0200)]
also include alphagen

10 years agofix some shader bugs
Rudolf Polzer [Sat, 3 Sep 2011 11:10:38 +0000 (13:10 +0200)]
fix some shader bugs

10 years agomore fixes
Rudolf Polzer [Sat, 3 Sep 2011 10:39:16 +0000 (12:39 +0200)]
more fixes

10 years agomore for the audit script
Rudolf Polzer [Sat, 3 Sep 2011 10:38:07 +0000 (12:38 +0200)]
more for the audit script

10 years agofix alpha channel auditing
Rudolf Polzer [Sat, 3 Sep 2011 10:26:20 +0000 (12:26 +0200)]
fix alpha channel auditing

10 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Sat, 3 Sep 2011 08:44:12 +0000 (10:44 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir

10 years agoalso audit alpha channel for shaders
Rudolf Polzer [Sat, 3 Sep 2011 08:40:21 +0000 (10:40 +0200)]
also audit alpha channel for shaders

10 years agoanother small and safe fix
Rudolf Polzer [Fri, 2 Sep 2011 18:24:00 +0000 (20:24 +0200)]
another small and safe fix

10 years agospecify offsetmapping bias on trak7x
Rudolf Polzer [Fri, 2 Sep 2011 18:22:15 +0000 (20:22 +0200)]
specify offsetmapping bias on trak7x

10 years agotexture fixes for trak7x
Rudolf Polzer [Fri, 2 Sep 2011 18:21:12 +0000 (20:21 +0200)]
texture fixes for trak7x

10 years agoignore .sh files
Rudolf Polzer [Fri, 2 Sep 2011 18:17:22 +0000 (20:17 +0200)]
ignore .sh files

10 years agofix offsetmapping directives in decals shader
Rudolf Polzer [Fri, 2 Sep 2011 18:10:25 +0000 (20:10 +0200)]
fix offsetmapping directives in decals shader

10 years agoassault campaign level: force the player red, not blue
Rudolf Polzer [Fri, 2 Sep 2011 17:59:24 +0000 (19:59 +0200)]
assault campaign level: force the player red, not blue

10 years agoalso disable nexball (bot AI can't do it)
Rudolf Polzer [Fri, 2 Sep 2011 15:40:13 +0000 (17:40 +0200)]
also disable nexball (bot AI can't do it)

10 years agoupdate .ent file too
Rudolf Polzer [Fri, 2 Sep 2011 15:00:24 +0000 (17:00 +0200)]
update .ent file too

10 years agoreorder trigger_warpzone fields
Rudolf Polzer [Fri, 2 Sep 2011 14:30:12 +0000 (16:30 +0200)]
reorder trigger_warpzone fields

10 years agoremove freezetag and CA from the campaign due to bot AI failure
Rudolf Polzer [Fri, 2 Sep 2011 10:08:14 +0000 (12:08 +0200)]
remove freezetag and CA from the campaign due to bot AI failure

10 years agobetter output
Rudolf Polzer [Thu, 1 Sep 2011 19:04:43 +0000 (21:04 +0200)]
better output

10 years agoshader audit: support auditing heights/normalmaps
Rudolf Polzer [Thu, 1 Sep 2011 18:47:23 +0000 (20:47 +0200)]
shader audit: support auditing heights/normalmaps

10 years agouse match8 here too
Rudolf Polzer [Thu, 1 Sep 2011 07:42:01 +0000 (09:42 +0200)]
use match8 here too

10 years agouse match8 here too
Rudolf Polzer [Thu, 1 Sep 2011 07:33:16 +0000 (09:33 +0200)]
use match8 here too

10 years agofix indent of dpoffsetmapping
Rudolf Polzer [Wed, 31 Aug 2011 06:58:50 +0000 (08:58 +0200)]
fix indent of dpoffsetmapping

10 years agoMore waypoints ....
mand1nga [Wed, 31 Aug 2011 00:02:49 +0000 (21:02 -0300)]
More waypoints ....

10 years agoUpdated waypoints
mand1nga [Tue, 30 Aug 2011 22:54:37 +0000 (19:54 -0300)]
Updated waypoints

10 years agoSquashed commit of the following (exomorph by morphed):
Rudolf Polzer [Tue, 30 Aug 2011 19:32:15 +0000 (21:32 +0200)]
Squashed commit of the following (exomorph by morphed):

commit f070e41910a3c043119fad251e12d79a7de15623
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Aug 30 21:04:37 2011 +0200

    fix metal_wall04_norm (by Morphed)

commit a2097b19b8c7f77f08f27c260bf0dbc0d8c4c1cf
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Aug 30 19:49:08 2011 +0200

    50% more offsetmapping intensity

commit 43fa0e252de143d67500ddb93cfead646b796110
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 15:25:45 2011 +0200

    reduce offsetmapping strength for this set

commit 83674a8dbcf4efdc8d733749d1de6429d2ba76e3
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 15:21:41 2011 +0200

    new and better matched normals, enjoy!

commit 07cb4af6b608ddc9053ab0846e033c2b76d349d3
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 15:08:34 2011 +0200

    more

commit 6458c85dee44a0138f6ea07a57e871afbbf86a80
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 15:08:09 2011 +0200

    improve normals maker again

commit 0ba37d03244b6166045c5046d104c12dacb8a0ca
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 14:30:11 2011 +0200

    improve normals maker script

commit 12572574652878605f9bca6795a8d88a5ad908b3
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Tue Aug 30 12:32:21 2011 +0200

    new gloss maps with higher alpha values (0..100% mapped to 33..100%)

commit 8d9c605f9740d8e0d1c56871b03290e263c69287
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 23:59:11 2011 +0200

    reflection maps and shader tweaks

commit d0cf30713e1396e72a89b0e6d3177c35ff7dc2dc
Merge: 6d002e5 73b5885
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 13:41:29 2011 +0200

    Merge remote-tracking branch 'remotes/origin/morphed/exomorph' into morphed/exomorph

commit 73b5885c96dd23467a07687864f0915173371b35
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 13:29:29 2011 +0200

    fix makenorms.sh for this set

commit 9c79ba1345229d4685e269a5f41052f6b25fa632
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 13:25:15 2011 +0200

    fix texture name typos "concete"

commit f069740756f20412e2b8ac7f058f3b075c62a1fb
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 13:23:13 2011 +0200

    more fixes

commit 6d002e59a5521da5e786cef4f4e6d37147b2d803
Merge: 231e780 2e67261
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 13:18:41 2011 +0200

    Merge remote-tracking branch 'remotes/origin/morphed/exomorph' into morphed/exomorph

commit d2ede0819e1a2b4938c900d6434b62cedafb1fe4
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 13:17:56 2011 +0200

    untested autogenerated exomorphx.shader

commit 231e7805384f45b064b765c9b39bc03ce0b5fe75
Merge: cc3c1f5 cf64f3d
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 13:01:19 2011 +0200

    Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into morphed/exomorph

commit 2e67261cda19f1029fd2f287970992e9a115cc32
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 12:58:03 2011 +0200

    add heightmaps to the normalmaps

commit a3fcb5b260aeea8f25f582462b7d6fb5eb3c4476
Author: Rudolf Polzer <divverent@alientrap.org>
Date:   Mon Aug 29 12:22:33 2011 +0200

    rename to exomorphx

commit cc3c1f5884a8bef4b940ba7d3224c3d00223cdea
Author: Morphed <Morphed@o2.pl>
Date:   Mon Aug 29 03:23:37 2011 +0200

    new texture set, its missing shader file

10 years agoNew waypoints for glowplant
mand1nga [Mon, 29 Aug 2011 18:01:55 +0000 (15:01 -0300)]
New waypoints for glowplant

10 years agoNew waypoints for space-elevator
mand1nga [Mon, 29 Aug 2011 15:45:59 +0000 (12:45 -0300)]
New waypoints for space-elevator

10 years agoNew waypoints for red-planet
mand1nga [Mon, 29 Aug 2011 15:18:20 +0000 (12:18 -0300)]
New waypoints for red-planet

10 years agomoew WP links
Rudolf Polzer [Mon, 29 Aug 2011 05:00:59 +0000 (07:00 +0200)]
moew WP links

10 years agoBetter waypoints
mand1nga [Sun, 28 Aug 2011 19:09:13 +0000 (16:09 -0300)]
Better waypoints

10 years agoabbreviate names, sorry
Rudolf Polzer [Sat, 27 Aug 2011 15:48:18 +0000 (17:48 +0200)]
abbreviate names, sorry

10 years agofix authors for stormkeep
Rudolf Polzer [Sat, 27 Aug 2011 15:43:59 +0000 (17:43 +0200)]
fix authors for stormkeep

10 years agoupdate gitattributes and mark some files as text
Rudolf Polzer [Sat, 27 Aug 2011 15:10:26 +0000 (17:10 +0200)]
update gitattributes and mark some files as text