]>
de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/log
Rudolf Polzer [Wed, 4 Aug 2010 13:05:20 +0000 (15:05 +0200)]
fix shader file
Rudolf Polzer [Wed, 4 Aug 2010 13:04:56 +0000 (15:04 +0200)]
Merge branch 'master' into m0rfar/heaven
Conflicts:
scripts/exosystem.shader
Rudolf Polzer [Wed, 4 Aug 2010 13:02:42 +0000 (15:02 +0200)]
shader-audit: more fixes
Rudolf Polzer [Wed, 4 Aug 2010 12:55:11 +0000 (14:55 +0200)]
shader audit: handle skyboxes properly
MooKow [Wed, 4 Aug 2010 04:48:12 +0000 (06:48 +0200)]
New map g-23 (small deathmatch arena in space), first official version.
Rudolf Polzer [Mon, 2 Aug 2010 14:54:01 +0000 (16:54 +0200)]
adhere to xonotic shader naming convention
Rudolf Polzer [Mon, 2 Aug 2010 14:52:43 +0000 (16:52 +0200)]
add xonotic_jumppad01
Rudolf Polzer [Sun, 1 Aug 2010 18:40:08 +0000 (20:40 +0200)]
add two missing misc_model spawnflags
FruitieX [Sun, 1 Aug 2010 17:30:25 +0000 (20:30 +0300)]
more surfacelight...
FruitieX [Sun, 1 Aug 2010 16:35:38 +0000 (19:35 +0300)]
better idea, create separate shaders for surfacelight options
FruitieX [Sun, 1 Aug 2010 16:31:34 +0000 (19:31 +0300)]
Revert "remove the surfacelight after all. Let mapper decide with light ents is best, i guess"
This reverts commit
6c7ce601875aaf795c856570e16d9a2d031abe91 .
FruitieX [Sun, 1 Aug 2010 16:07:04 +0000 (19:07 +0300)]
remove the surfacelight after all. Let mapper decide with light ents is best, i guess
FruitieX [Fri, 30 Jul 2010 11:39:46 +0000 (14:39 +0300)]
let there be light... more light
FruitieX [Fri, 30 Jul 2010 11:33:37 +0000 (14:33 +0300)]
use surfacelight on all light textures
Rudolf Polzer [Wed, 28 Jul 2010 18:14:53 +0000 (20:14 +0200)]
allow map-specific shaders to customize outside textures
Rudolf Polzer [Wed, 28 Jul 2010 17:15:11 +0000 (19:15 +0200)]
fix comments
Rudolf Polzer [Wed, 28 Jul 2010 17:09:27 +0000 (19:09 +0200)]
update the rules, more strict, see http://nopaste.linux-dev.org/?7646 or grep source for ##
Rudolf Polzer [Wed, 28 Jul 2010 16:47:55 +0000 (18:47 +0200)]
shader audit: use liquids_water, liquids_slime etc. names please, is handled better by Radiant 1.4 that way
Rudolf Polzer [Mon, 26 Jul 2010 15:05:44 +0000 (17:05 +0200)]
shader audit: ignore .xcf, allow _suffix for effect textures
Rudolf Polzer [Mon, 26 Jul 2010 15:01:55 +0000 (17:01 +0200)]
new allowed paths: liquids/water, liquids/slime, liquids/lava, warpzone
Rudolf Polzer [Sat, 24 Jul 2010 15:09:50 +0000 (17:09 +0200)]
more crlf madness
Rudolf Polzer [Thu, 22 Jul 2010 13:37:50 +0000 (15:37 +0200)]
allow skybox foo_bar to use env/foo (common for having multiple shaders for one skybox)
Rudolf Polzer [Thu, 22 Jul 2010 13:35:52 +0000 (15:35 +0200)]
Merge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Thu, 22 Jul 2010 13:35:45 +0000 (15:35 +0200)]
detect skyparms
Rudolf Polzer [Thu, 22 Jul 2010 13:32:25 +0000 (15:32 +0200)]
Merge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Thu, 22 Jul 2010 13:32:10 +0000 (15:32 +0200)]
rename skyboxes to match audit script in main
Rudolf Polzer [Thu, 22 Jul 2010 13:30:24 +0000 (15:30 +0200)]
allow models/*
Rudolf Polzer [Thu, 22 Jul 2010 13:27:08 +0000 (15:27 +0200)]
shader audit: allow skies_*.shader defining textures/skies/*
Rudolf Polzer [Thu, 22 Jul 2010 13:01:52 +0000 (15:01 +0200)]
rename shader files properly
Rudolf Polzer [Thu, 22 Jul 2010 13:01:06 +0000 (15:01 +0200)]
add a preview image of calm_sea
Rudolf Polzer [Thu, 22 Jul 2010 12:59:53 +0000 (14:59 +0200)]
new skyboxes by cuinnton
Rudolf Polzer [Wed, 21 Jul 2010 17:53:11 +0000 (19:53 +0200)]
morphed's fan
Rudolf Polzer [Wed, 21 Jul 2010 11:36:22 +0000 (13:36 +0200)]
fix :P
Rudolf Polzer [Wed, 21 Jul 2010 11:35:20 +0000 (13:35 +0200)]
shader_audit: allow textures/map_*/*
Rudolf Polzer [Wed, 21 Jul 2010 11:10:58 +0000 (13:10 +0200)]
Merge branch 'master' into m0rfar/heaven
Rudolf Polzer [Wed, 21 Jul 2010 11:10:57 +0000 (13:10 +0200)]
Merge branch 'master' into fruitiex/warpzone
Rudolf Polzer [Wed, 21 Jul 2010 11:10:50 +0000 (13:10 +0200)]
Merge branch 'master' into cbrutail/shaders_fx_xonotic2
Rudolf Polzer [Wed, 21 Jul 2010 10:38:12 +0000 (12:38 +0200)]
new .gitattributes file
Rudolf Polzer [Wed, 21 Jul 2010 10:28:28 +0000 (12:28 +0200)]
CRLF fixes :P
Rudolf Polzer [Wed, 21 Jul 2010 10:16:06 +0000 (12:16 +0200)]
Merge remote branch 'origin/master' into fruitiex/warpzone
Rudolf Polzer [Wed, 21 Jul 2010 10:16:06 +0000 (12:16 +0200)]
Merge remote branch 'origin/master' into m0rfar/heaven
Rudolf Polzer [Wed, 21 Jul 2010 10:15:59 +0000 (12:15 +0200)]
Merge remote branch 'origin/master' into cbrutail/shaders_fx_xonotic2
Rudolf Polzer [Wed, 21 Jul 2010 10:01:32 +0000 (12:01 +0200)]
Merge branch 'origin/master' (early part) into m0rfar/heaven
Rudolf Polzer [Wed, 21 Jul 2010 10:01:30 +0000 (12:01 +0200)]
Merge branch 'origin/master' (early part) into fruitiex/warpzone
Rudolf Polzer [Wed, 21 Jul 2010 10:01:02 +0000 (12:01 +0200)]
Merge branch 'origin/master' (early part) into cbrutail/shaders_fx_xonotic2
Rudolf Polzer [Sun, 18 Jul 2010 14:26:52 +0000 (16:26 +0200)]
CRLF fixes
MooKow [Thu, 15 Jul 2010 23:25:06 +0000 (18:25 -0500)]
Fixes crete01_phoenix and _phoenixb normal map depth problems. If you want depth to match, keep px^2 same in the two files that you need seamless.
Rudolf Polzer [Thu, 15 Jul 2010 18:49:40 +0000 (20:49 +0200)]
make the repo pass the audit; move two textures to nexcompat (actually, q3 compat)
Rudolf Polzer [Thu, 15 Jul 2010 18:41:40 +0000 (20:41 +0200)]
better shader audit script - now all of tZork's shaders pass
Rudolf Polzer [Thu, 15 Jul 2010 18:02:29 +0000 (20:02 +0200)]
better
Rudolf Polzer [Thu, 15 Jul 2010 17:58:31 +0000 (19:58 +0200)]
shader-audit: use the parsed shader data instead of a stupid grep
Rudolf Polzer [Thu, 15 Jul 2010 15:45:00 +0000 (17:45 +0200)]
shader audit script improved (parses shaders now)
Rudolf Polzer [Thu, 15 Jul 2010 15:29:00 +0000 (17:29 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Thu, 15 Jul 2010 15:28:20 +0000 (17:28 +0200)]
add a simple is-there-a-shader-for-each-texture test script
cbrutail [Wed, 7 Jul 2010 12:11:36 +0000 (14:11 +0200)]
Added even more light textures to trak5x, and modified the shader file too.
cbrutail [Thu, 1 Jul 2010 13:49:10 +0000 (15:49 +0200)]
Tweaked the healpod1_d texture a bit.
cbrutail [Thu, 1 Jul 2010 12:31:21 +0000 (14:31 +0200)]
A new shader, it can be used for healpods. Might need some further tweaking.
cbrutail [Thu, 1 Jul 2010 10:48:30 +0000 (12:48 +0200)]
Added 4 lightning shaders. Textures were made by Oblivion.
cbrutail [Tue, 29 Jun 2010 12:56:06 +0000 (14:56 +0200)]
Fixing another typo... :F
cbrutail [Tue, 29 Jun 2010 12:52:14 +0000 (14:52 +0200)]
Fixed typo
cbrutail [Tue, 29 Jun 2010 12:03:20 +0000 (14:03 +0200)]
Some fx shaders, I think they might be useful. More to come soon.
Rudolf Polzer [Sat, 3 Jul 2010 16:51:11 +0000 (18:51 +0200)]
add mirror1.tga here where it belongs
Rudolf Polzer [Fri, 2 Jul 2010 08:31:40 +0000 (10:31 +0200)]
Merge remote branch 'refs/remotes/origin/cbrutail/skies_extragalactic'
Rudolf Polzer [Fri, 2 Jul 2010 08:28:50 +0000 (10:28 +0200)]
Merge remote branch 'refs/remotes/origin/cbrutail/exxphoenix'
cbrutail [Tue, 29 Jun 2010 11:06:05 +0000 (13:06 +0200)]
Changed typo in exx.shader. The normalmap is still b0rk3d, needs fixing ASAP.
Rudolf Polzer [Tue, 29 Jun 2010 06:02:51 +0000 (08:02 +0200)]
Merge remote branch 'refs/remotes/origin/cbrutail/exxphoenix'
cbrutail [Mon, 28 Jun 2010 16:50:26 +0000 (18:50 +0200)]
3 wonderful skyboxes from sev, based on the "newskies" he made for Nexuiz earlier. I1ve modified the shaderlist.txt too to include it.
Imho ready to merge into master.
cbrutail [Fri, 25 Jun 2010 14:37:05 +0000 (16:37 +0200)]
2 new textures for exx, based on floor_crete01. Temp only, a texture artist should create higher quality ones.
Changed exx.shader too
cbrutail [Fri, 25 Jun 2010 12:26:07 +0000 (14:26 +0200)]
Added some new light textures to trak5x, and modified the shader file accordingly too.
Rudolf Polzer [Thu, 24 Jun 2010 15:42:58 +0000 (17:42 +0200)]
move shaderlist.txt into the individual dirs again now that we can
FruitieX [Sat, 19 Jun 2010 20:05:13 +0000 (23:05 +0300)]
hudsetup, now without added textures
Kristian Johansson [Sat, 19 Jun 2010 16:29:29 +0000 (18:29 +0200)]
New sky, Heaven. Non sci-fi theme though.
Rudolf Polzer [Fri, 18 Jun 2010 12:31:36 +0000 (14:31 +0200)]
Merge remote branch 'origin/morphed/mapstuff'
Morphed [Thu, 17 Jun 2010 16:15:41 +0000 (18:15 +0200)]
fixed wrong textue on some lights
Rudolf Polzer [Thu, 17 Jun 2010 12:02:57 +0000 (14:02 +0200)]
do not track compiled BSPs of maps
Rudolf Polzer [Tue, 8 Jun 2010 10:03:28 +0000 (12:03 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Mon, 7 Jun 2010 20:18:26 +0000 (23:18 +0300)]
woops add the red shader too
FruitieX [Mon, 7 Jun 2010 20:05:41 +0000 (23:05 +0300)]
red warpzone edge
FruitieX [Mon, 7 Jun 2010 11:03:04 +0000 (14:03 +0300)]
new warpzone effect shader :)
Rudolf Polzer [Mon, 7 Jun 2010 07:41:22 +0000 (09:41 +0200)]
trigger_Warpzone ent description
Rudolf Polzer [Fri, 4 Jun 2010 18:33:23 +0000 (20:33 +0200)]
Merge remote branch 'refs/remotes/origin/tzork/texture-n-shader-fixes'
Morphed [Mon, 31 May 2010 00:44:29 +0000 (02:44 +0200)]
lighting overload
Morphed [Sun, 30 May 2010 22:53:35 +0000 (00:53 +0200)]
some more light models
Morphed [Sun, 30 May 2010 22:05:08 +0000 (00:05 +0200)]
more light models
Morphed [Sun, 30 May 2010 21:12:40 +0000 (23:12 +0200)]
let there be light model !
Jakob MG [Sun, 30 May 2010 17:02:22 +0000 (19:02 +0200)]
Better dpgloss* shader directives for exx. add common/hitskip. Colorize gloss of trak*x.
Jakob MG [Tue, 25 May 2010 14:10:41 +0000 (16:10 +0200)]
Add alpha channeles to decals (avoids teh mysterios rtlight gloss)
Use blendFunc filter in shader (aparently it works now)
Jakob MG [Sun, 23 May 2010 13:59:31 +0000 (15:59 +0200)]
Add decals shader & textures
Jakob MG [Sun, 23 May 2010 12:55:16 +0000 (14:55 +0200)]
exx fixes, tryign again.
Jakob MG [Thu, 20 May 2010 02:22:50 +0000 (04:22 +0200)]
Colorize exx _gloss maps & rewrite .shader (and fix some filenames)
Rudolf Polzer [Sat, 8 May 2010 18:43:47 +0000 (20:43 +0200)]
Merge commit 'origin/master' into divVerent/tag_seeker
Rudolf Polzer [Sat, 8 May 2010 17:26:35 +0000 (19:26 +0200)]
shaderlist.txt is not found here
Rudolf Polzer [Sat, 8 May 2010 13:01:32 +0000 (15:01 +0200)]
Merge remote branch 'origin/mirceakitsune/gravity_trigger'
Conflicts:
scripts/entities.def
Rudolf Polzer [Thu, 6 May 2010 14:55:25 +0000 (16:55 +0200)]
Merge remote branch 'origin/tzork/facility114x'
Conflicts:
scripts/shaderlist.txt
Rudolf Polzer [Thu, 6 May 2010 06:49:31 +0000 (08:49 +0200)]
document target_music and trigger_music
MirceaKitsune [Mon, 3 May 2010 18:21:38 +0000 (21:21 +0300)]
Description update
MirceaKitsune [Mon, 3 May 2010 16:10:01 +0000 (19:10 +0300)]
Fix entities.def error
MirceaKitsune [Mon, 3 May 2010 16:02:31 +0000 (19:02 +0300)]
Allow gravity zones to be triggered and toggled on or off.
MirceaKitsune [Mon, 3 May 2010 14:16:46 +0000 (17:16 +0300)]
entities.def for the gravity trigger. To be merged with the branch with the same name in xonotic-data.pk3dir
Rudolf Polzer [Sun, 2 May 2010 18:58:24 +0000 (20:58 +0200)]
*activator in target_spawn