xonotic/xonotic-maps.pk3dir.git
11 years agostart using skylight instead of stupid surfacelight for skies (compiles faster, looks...
Rudolf Polzer [Tue, 17 Aug 2010 05:00:58 +0000 (07:00 +0200)]
start using skylight instead of stupid surfacelight for skies (compiles faster, looks better)

11 years agoMerge remote branch 'refs/remotes/origin/mookow/map-g-23'
Rudolf Polzer [Sat, 14 Aug 2010 20:25:29 +0000 (22:25 +0200)]
Merge remote branch 'refs/remotes/origin/mookow/map-g-23'

11 years agoThe models now link to xonotic-maps.pk3dir instead of xonotic-data.pk3dir. And aww...
MooKow [Sat, 14 Aug 2010 18:23:18 +0000 (13:23 -0500)]
The models now link to xonotic-maps.pk3dir instead of xonotic-data.pk3dir. And aww look at the cute little mini-cubes!

11 years agoYeah, I changed it. To parasti: I moved the weapons/ammo to a non-floaty place in...
MooKow [Fri, 13 Aug 2010 23:04:31 +0000 (18:04 -0500)]
Yeah, I changed it. To parasti: I moved the weapons/ammo to a non-floaty place in the weapon-floaty room. The h/a can stay floating because they do that anyways. Dib: Your vent is fixed. Have fun :P

11 years agobigfan: remove useless .tga suffix
Rudolf Polzer [Mon, 9 Aug 2010 05:05:48 +0000 (07:05 +0200)]
bigfan: remove useless .tga suffix

11 years agoMerge remote branch 'refs/remotes/origin/tzork/terrain01x'
Rudolf Polzer [Mon, 9 Aug 2010 05:00:38 +0000 (07:00 +0200)]
Merge remote branch 'refs/remotes/origin/tzork/terrain01x'

Conflicts:
scripts/shaderlist.txt

11 years agoMerge remote branch 'refs/remotes/origin/mookow/facility114fix'
Rudolf Polzer [Mon, 9 Aug 2010 04:49:09 +0000 (06:49 +0200)]
Merge remote branch 'refs/remotes/origin/mookow/facility114fix'

11 years agoCenter the corridor03 texture properly
MooKow [Sun, 8 Aug 2010 04:33:40 +0000 (23:33 -0500)]
Center the corridor03 texture properly

11 years agoFixed some facility114 normalmaps.
MooKow [Sat, 7 Aug 2010 06:32:05 +0000 (01:32 -0500)]
Fixed some facility114 normalmaps.

11 years agoMerge remote branch 'origin/m0rfar/heaven'
Rudolf Polzer [Fri, 6 Aug 2010 23:02:18 +0000 (01:02 +0200)]
Merge remote branch 'origin/m0rfar/heaven'

11 years agoMerge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Fri, 6 Aug 2010 23:01:08 +0000 (01:01 +0200)]
Merge branch 'master' into divVerent/skyboxes

11 years agoadd leaves*.tga
Rudolf Polzer [Fri, 6 Aug 2010 22:59:15 +0000 (00:59 +0200)]
add leaves*.tga

11 years agoMerge remote branch 'origin/mookow/liquids'
Rudolf Polzer [Fri, 6 Aug 2010 22:56:55 +0000 (00:56 +0200)]
Merge remote branch 'origin/mookow/liquids'

Conflicts:
scripts/liquids.shader

11 years agoOops... Got the shader names right this time for that lava XD
MooKow [Fri, 6 Aug 2010 22:52:55 +0000 (17:52 -0500)]
Oops... Got the shader names right this time for that lava XD

11 years agoRemoved protolava and added lava0 (originally xonotic-nexcompat.pk3dir/textures/storm...
MooKow [Fri, 6 Aug 2010 22:50:52 +0000 (17:50 -0500)]
Removed protolava and added lava0 (originally xonotic-nexcompat.pk3dir/textures/stormkeep/lava.tga)

11 years agoUpdate g-23
Rudolf Polzer [Fri, 6 Aug 2010 22:45:42 +0000 (00:45 +0200)]
Update g-23

Conflicts:
maps/g-23.map

11 years agofix the liquids shader files
Rudolf Polzer [Fri, 6 Aug 2010 22:41:51 +0000 (00:41 +0200)]
fix the liquids shader files

11 years agoMerge remote branch 'origin/mookow/liquids'
Rudolf Polzer [Fri, 6 Aug 2010 22:39:46 +0000 (00:39 +0200)]
Merge remote branch 'origin/mookow/liquids'

11 years agoSorting out this liquids stuff. This should be as clean as it gets :D
MooKow [Fri, 6 Aug 2010 22:37:56 +0000 (17:37 -0500)]
Sorting out this liquids stuff. This should be as clean as it gets :D

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Fri, 6 Aug 2010 20:24:04 +0000 (22:24 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

11 years agoadd the models that are actually meant to be used on maps
Rudolf Polzer [Thu, 5 Aug 2010 17:51:12 +0000 (19:51 +0200)]
add the models that are actually meant to be used on maps

11 years agoshader-audit: fix the mktemp fix
Rudolf Polzer [Thu, 5 Aug 2010 11:26:51 +0000 (13:26 +0200)]
shader-audit: fix the mktemp fix

11 years agoFix CRLF (again..?!)
Jakob MG [Thu, 5 Aug 2010 11:17:28 +0000 (13:17 +0200)]
Fix CRLF (again..?!)

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into tzork/terrain01x
Jakob MG [Thu, 5 Aug 2010 11:07:55 +0000 (13:07 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into tzork/terrain01x

11 years agoshader-audit: work without mktemp
Rudolf Polzer [Thu, 5 Aug 2010 11:03:00 +0000 (13:03 +0200)]
shader-audit: work without mktemp

11 years agoFix a few normal map alphas (to sharp, looked horrid with offsettmapping)
Jakob MG [Wed, 4 Aug 2010 20:50:25 +0000 (22:50 +0200)]
Fix a few normal map alphas (to sharp, looked horrid with offsettmapping)

11 years agoAdd testureset terrain01x
Jakob MG [Wed, 4 Aug 2010 18:19:17 +0000 (20:19 +0200)]
Add testureset terrain01x

11 years agofix a typo - now this branch passes shader-audit too
Rudolf Polzer [Wed, 4 Aug 2010 13:09:37 +0000 (15:09 +0200)]
fix a typo - now this branch passes shader-audit too

11 years agoMerge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Wed, 4 Aug 2010 13:09:05 +0000 (15:09 +0200)]
Merge branch 'master' into divVerent/skyboxes

11 years agofix shader file
Rudolf Polzer [Wed, 4 Aug 2010 13:05:20 +0000 (15:05 +0200)]
fix shader file

11 years agoMerge branch 'master' into m0rfar/heaven
Rudolf Polzer [Wed, 4 Aug 2010 13:04:56 +0000 (15:04 +0200)]
Merge branch 'master' into m0rfar/heaven

Conflicts:
scripts/exosystem.shader

11 years agoshader-audit: more fixes
Rudolf Polzer [Wed, 4 Aug 2010 13:02:42 +0000 (15:02 +0200)]
shader-audit: more fixes

11 years agoshader audit: handle skyboxes properly
Rudolf Polzer [Wed, 4 Aug 2010 12:55:11 +0000 (14:55 +0200)]
shader audit: handle skyboxes properly

11 years agoNew map g-23 (small deathmatch arena in space), first official version.
MooKow [Wed, 4 Aug 2010 04:48:12 +0000 (06:48 +0200)]
New map g-23 (small deathmatch arena in space), first official version.

11 years agoadhere to xonotic shader naming convention
Rudolf Polzer [Mon, 2 Aug 2010 14:54:01 +0000 (16:54 +0200)]
adhere to xonotic shader naming convention

11 years agoadd xonotic_jumppad01
Rudolf Polzer [Mon, 2 Aug 2010 14:52:43 +0000 (16:52 +0200)]
add xonotic_jumppad01

11 years agoadd two missing misc_model spawnflags
Rudolf Polzer [Sun, 1 Aug 2010 18:40:08 +0000 (20:40 +0200)]
add two missing misc_model spawnflags

11 years agoallow map-specific shaders to customize outside textures
Rudolf Polzer [Wed, 28 Jul 2010 18:14:53 +0000 (20:14 +0200)]
allow map-specific shaders to customize outside textures

11 years agofix comments
Rudolf Polzer [Wed, 28 Jul 2010 17:15:11 +0000 (19:15 +0200)]
fix comments

11 years agoupdate the rules, more strict, see http://nopaste.linux-dev.org/?7646 or grep source...
Rudolf Polzer [Wed, 28 Jul 2010 17:09:27 +0000 (19:09 +0200)]
update the rules, more strict, see nopaste.linux-dev.org/?7646 or grep source for ##

11 years agoshader audit: use liquids_water, liquids_slime etc. names please, is handled better...
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

11 years agoshader audit: ignore .xcf, allow _suffix for effect textures
Rudolf Polzer [Mon, 26 Jul 2010 15:05:44 +0000 (17:05 +0200)]
shader audit: ignore .xcf, allow _suffix for effect textures

11 years agonew allowed paths: liquids/water, liquids/slime, liquids/lava, warpzone
Rudolf Polzer [Mon, 26 Jul 2010 15:01:55 +0000 (17:01 +0200)]
new allowed paths: liquids/water, liquids/slime, liquids/lava, warpzone

11 years agomore crlf madness
Rudolf Polzer [Sat, 24 Jul 2010 15:09:50 +0000 (17:09 +0200)]
more crlf madness

11 years agoallow skybox foo_bar to use env/foo (common for having multiple shaders for one skybox)
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)

11 years agoMerge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Thu, 22 Jul 2010 13:35:52 +0000 (15:35 +0200)]
Merge branch 'master' into divVerent/skyboxes

11 years agodetect skyparms
Rudolf Polzer [Thu, 22 Jul 2010 13:35:45 +0000 (15:35 +0200)]
detect skyparms

11 years agoMerge branch 'master' into divVerent/skyboxes
Rudolf Polzer [Thu, 22 Jul 2010 13:32:25 +0000 (15:32 +0200)]
Merge branch 'master' into divVerent/skyboxes

11 years agorename skyboxes to match audit script in main
Rudolf Polzer [Thu, 22 Jul 2010 13:32:10 +0000 (15:32 +0200)]
rename skyboxes to match audit script in main

11 years agoallow models/*
Rudolf Polzer [Thu, 22 Jul 2010 13:30:24 +0000 (15:30 +0200)]
allow models/*

11 years agoshader audit: allow skies_*.shader defining textures/skies/*
Rudolf Polzer [Thu, 22 Jul 2010 13:27:08 +0000 (15:27 +0200)]
shader audit: allow skies_*.shader defining textures/skies/*

11 years agorename shader files properly
Rudolf Polzer [Thu, 22 Jul 2010 13:01:52 +0000 (15:01 +0200)]
rename shader files properly

11 years agoadd a preview image of calm_sea
Rudolf Polzer [Thu, 22 Jul 2010 13:01:06 +0000 (15:01 +0200)]
add a preview image of calm_sea

11 years agonew skyboxes by cuinnton
Rudolf Polzer [Thu, 22 Jul 2010 12:59:53 +0000 (14:59 +0200)]
new skyboxes by cuinnton

11 years agomorphed's fan
Rudolf Polzer [Wed, 21 Jul 2010 17:53:11 +0000 (19:53 +0200)]
morphed's fan

11 years agofix :P
Rudolf Polzer [Wed, 21 Jul 2010 11:36:22 +0000 (13:36 +0200)]
fix :P

11 years agoshader_audit: allow textures/map_*/*
Rudolf Polzer [Wed, 21 Jul 2010 11:35:20 +0000 (13:35 +0200)]
shader_audit: allow textures/map_*/*

11 years agoMerge branch 'master' into m0rfar/heaven
Rudolf Polzer [Wed, 21 Jul 2010 11:10:58 +0000 (13:10 +0200)]
Merge branch 'master' into m0rfar/heaven

11 years agonew .gitattributes file
Rudolf Polzer [Wed, 21 Jul 2010 10:38:12 +0000 (12:38 +0200)]
new .gitattributes file

11 years agoCRLF fixes :P
Rudolf Polzer [Wed, 21 Jul 2010 10:28:28 +0000 (12:28 +0200)]
CRLF fixes :P

11 years agoMerge remote branch 'origin/master' into m0rfar/heaven
Rudolf Polzer [Wed, 21 Jul 2010 10:16:06 +0000 (12:16 +0200)]
Merge remote branch 'origin/master' into m0rfar/heaven

11 years agoMerge branch 'origin/master' (early part) into m0rfar/heaven
Rudolf Polzer [Wed, 21 Jul 2010 10:01:32 +0000 (12:01 +0200)]
Merge branch 'origin/master' (early part) into m0rfar/heaven

11 years agoCRLF fixes
Rudolf Polzer [Sun, 18 Jul 2010 14:26:52 +0000 (16:26 +0200)]
CRLF fixes

11 years agoFixes crete01_phoenix and _phoenixb normal map depth problems. If you want depth...
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.

11 years agomake the repo pass the audit; move two textures to nexcompat (actually, q3 compat)
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)

11 years agobetter shader audit script - now all of tZork's shaders pass
Rudolf Polzer [Thu, 15 Jul 2010 18:41:40 +0000 (20:41 +0200)]
better shader audit script - now all of tZork's shaders pass

11 years agobetter
Rudolf Polzer [Thu, 15 Jul 2010 18:02:29 +0000 (20:02 +0200)]
better

11 years agoshader-audit: use the parsed shader data instead of a stupid grep
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

11 years agoshader audit script improved (parses shaders now)
Rudolf Polzer [Thu, 15 Jul 2010 15:45:00 +0000 (17:45 +0200)]
shader audit script improved (parses shaders now)

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Thu, 15 Jul 2010 15:29:00 +0000 (17:29 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

11 years agoadd a simple is-there-a-shader-for-each-texture test script
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

11 years agoAdded even more light textures to trak5x, and modified the shader file too.
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.

11 years agoadd mirror1.tga here where it belongs
Rudolf Polzer [Sat, 3 Jul 2010 16:51:11 +0000 (18:51 +0200)]
add mirror1.tga here where it belongs

11 years agoMerge remote branch 'refs/remotes/origin/cbrutail/skies_extragalactic'
Rudolf Polzer [Fri, 2 Jul 2010 08:31:40 +0000 (10:31 +0200)]
Merge remote branch 'refs/remotes/origin/cbrutail/skies_extragalactic'

11 years agoMerge remote branch 'refs/remotes/origin/cbrutail/exxphoenix'
Rudolf Polzer [Fri, 2 Jul 2010 08:28:50 +0000 (10:28 +0200)]
Merge remote branch 'refs/remotes/origin/cbrutail/exxphoenix'

11 years agoChanged typo in exx.shader. The normalmap is still b0rk3d, needs fixing ASAP.
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.

11 years agoMerge remote branch 'refs/remotes/origin/cbrutail/exxphoenix'
Rudolf Polzer [Tue, 29 Jun 2010 06:02:51 +0000 (08:02 +0200)]
Merge remote branch 'refs/remotes/origin/cbrutail/exxphoenix'

11 years ago3 wonderful skyboxes from sev, based on the "newskies" he made for Nexuiz earlier...
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.

11 years ago2 new textures for exx, based on floor_crete01. Temp only, a texture artist should...
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

11 years agoAdded some new light textures to trak5x, and modified the shader file accordingly...
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.

11 years agomove shaderlist.txt into the individual dirs again now that we can
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

11 years agohudsetup, now without added textures
FruitieX [Sat, 19 Jun 2010 20:05:13 +0000 (23:05 +0300)]
hudsetup, now without added textures

11 years agoNew sky, Heaven. Non sci-fi theme though.
Kristian Johansson [Sat, 19 Jun 2010 16:29:29 +0000 (18:29 +0200)]
New sky, Heaven. Non sci-fi theme though.

11 years agoMerge remote branch 'origin/morphed/mapstuff'
Rudolf Polzer [Fri, 18 Jun 2010 12:31:36 +0000 (14:31 +0200)]
Merge remote branch 'origin/morphed/mapstuff'

11 years agofixed wrong textue on some lights
Morphed [Thu, 17 Jun 2010 16:15:41 +0000 (18:15 +0200)]
fixed wrong textue on some lights

11 years agodo not track compiled BSPs of maps
Rudolf Polzer [Thu, 17 Jun 2010 12:02:57 +0000 (14:02 +0200)]
do not track compiled BSPs of maps

11 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Rudolf Polzer [Tue, 8 Jun 2010 10:03:28 +0000 (12:03 +0200)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

11 years agotrigger_Warpzone ent description
Rudolf Polzer [Mon, 7 Jun 2010 07:41:22 +0000 (09:41 +0200)]
trigger_Warpzone ent description

11 years agoMerge remote branch 'refs/remotes/origin/tzork/texture-n-shader-fixes'
Rudolf Polzer [Fri, 4 Jun 2010 18:33:23 +0000 (20:33 +0200)]
Merge remote branch 'refs/remotes/origin/tzork/texture-n-shader-fixes'

11 years agolighting overload
Morphed [Mon, 31 May 2010 00:44:29 +0000 (02:44 +0200)]
lighting overload

11 years agosome more light models
Morphed [Sun, 30 May 2010 22:53:35 +0000 (00:53 +0200)]
some more light models

11 years agomore light models
Morphed [Sun, 30 May 2010 22:05:08 +0000 (00:05 +0200)]
more light models

11 years agolet there be light model !
Morphed [Sun, 30 May 2010 21:12:40 +0000 (23:12 +0200)]
let there be light model !

11 years agoBetter dpgloss* shader directives for exx. add common/hitskip. Colorize gloss of...
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.

11 years agoAdd alpha channeles to decals (avoids teh mysterios rtlight gloss)
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)

11 years agoAdd decals shader & textures
Jakob MG [Sun, 23 May 2010 13:59:31 +0000 (15:59 +0200)]
Add decals shader & textures

11 years agoexx fixes, tryign again.
Jakob MG [Sun, 23 May 2010 12:55:16 +0000 (14:55 +0200)]
exx fixes, tryign again.

11 years agoColorize exx _gloss maps & rewrite .shader (and fix some filenames)
Jakob MG [Thu, 20 May 2010 02:22:50 +0000 (04:22 +0200)]
Colorize exx _gloss maps & rewrite .shader (and fix some filenames)

11 years agoMerge commit 'origin/master' into divVerent/tag_seeker
Rudolf Polzer [Sat, 8 May 2010 18:43:47 +0000 (20:43 +0200)]
Merge commit 'origin/master' into divVerent/tag_seeker

11 years agoshaderlist.txt is not found here
Rudolf Polzer [Sat, 8 May 2010 17:26:35 +0000 (19:26 +0200)]
shaderlist.txt is not found here