xonotic/xonotic-maps.pk3dir.git
9 years agoMerge branch 'master' into fruitiex/warpzone
Rudolf Polzer [Wed, 21 Jul 2010 11:10:57 +0000 (13:10 +0200)]
Merge branch 'master' into fruitiex/warpzone

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

9 years agoMerge 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 fruitiex/warpzone

9 years agoMerge branch 'origin/master' (early part) into fruitiex/warpzone
Rudolf Polzer [Wed, 21 Jul 2010 10:01:30 +0000 (12:01 +0200)]
Merge branch 'origin/master' (early part) into fruitiex/warpzone

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

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

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

9 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

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

9 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

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

9 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

9 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

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

9 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

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

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

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

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

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

9 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

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

9 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

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

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

9 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

9 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

9 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

9 years agowoops add the red shader too
FruitieX [Mon, 7 Jun 2010 20:18:26 +0000 (23:18 +0300)]
woops add the red shader too

9 years agored warpzone edge
FruitieX [Mon, 7 Jun 2010 20:05:41 +0000 (23:05 +0300)]
red warpzone edge

9 years agonew warpzone effect shader :)
FruitieX [Mon, 7 Jun 2010 11:03:04 +0000 (14:03 +0300)]
new warpzone effect shader :)

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

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

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

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

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

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

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

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

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

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

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

10 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

10 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

10 years agoMerge remote branch 'origin/mirceakitsune/gravity_trigger'
Rudolf Polzer [Sat, 8 May 2010 13:01:32 +0000 (15:01 +0200)]
Merge remote branch 'origin/mirceakitsune/gravity_trigger'

Conflicts:
scripts/entities.def

10 years agoMerge remote branch 'origin/tzork/facility114x'
Rudolf Polzer [Thu, 6 May 2010 14:55:25 +0000 (16:55 +0200)]
Merge remote branch 'origin/tzork/facility114x'

Conflicts:
scripts/shaderlist.txt

10 years agodocument target_music and trigger_music
Rudolf Polzer [Thu, 6 May 2010 06:49:31 +0000 (08:49 +0200)]
document target_music and trigger_music

10 years agoDescription update
MirceaKitsune [Mon, 3 May 2010 18:21:38 +0000 (21:21 +0300)]
Description update

10 years agoFix entities.def error
MirceaKitsune [Mon, 3 May 2010 16:10:01 +0000 (19:10 +0300)]
Fix entities.def error

10 years agoAllow gravity zones to be triggered and toggled on or off.
MirceaKitsune [Mon, 3 May 2010 16:02:31 +0000 (19:02 +0300)]
Allow gravity zones to be triggered and toggled on or off.

10 years agoentities.def for the gravity trigger. To be merged with the branch with the same...
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

10 years ago*activator in target_spawn
Rudolf Polzer [Sun, 2 May 2010 18:58:24 +0000 (20:58 +0200)]
*activator in target_spawn

10 years agoAdd common.shader & textures + radiant textures. We no longer need common-spog.pk3
Jakob MG [Thu, 29 Apr 2010 02:51:33 +0000 (04:51 +0200)]
Add common.shader & textures + radiant textures. We no longer need common-spog.pk3

10 years agoWops, shaderlist.txt want to be in ot it too!
Jakob MG [Wed, 28 Apr 2010 15:35:45 +0000 (17:35 +0200)]
Wops, shaderlist.txt want to be in ot it too!

10 years agoAdd Oblivion's facility114 textureset
Jakob MG [Wed, 28 Apr 2010 15:30:29 +0000 (17:30 +0200)]
Add Oblivion's facility114 textureset

10 years agoFix shaders, Add trak5Fix shaders, Add trak5xx
Jakob MG [Tue, 27 Apr 2010 21:09:17 +0000 (23:09 +0200)]
Fix shaders, Add trak5Fix shaders, Add trak5xx

10 years agoAdd trak4x
Jakob MG [Thu, 22 Apr 2010 16:19:20 +0000 (18:19 +0200)]
Add trak4x

10 years agoAdd shaderlist
Jakob MG [Thu, 22 Apr 2010 16:09:32 +0000 (18:09 +0200)]
Add shaderlist

10 years agoAdd renamed, shaded and retouched eX testures (as textrues/exx)
Jakob MG [Wed, 21 Apr 2010 20:25:42 +0000 (22:25 +0200)]
Add renamed, shaded and retouched eX testures (as textrues/exx)

10 years ago.gitattributes update for IDE project files
Rudolf Polzer [Sat, 17 Apr 2010 19:11:24 +0000 (21:11 +0200)]
.gitattributes update for IDE project files

10 years agofix lots of CRLFs
Rudolf Polzer [Sat, 17 Apr 2010 19:00:44 +0000 (21:00 +0200)]
fix lots of CRLFs

10 years ago.gitattributes
Rudolf Polzer [Sat, 17 Apr 2010 18:50:07 +0000 (20:50 +0200)]
.gitattributes

10 years agoadd seeker to entities.def
Rudolf Polzer [Tue, 13 Apr 2010 08:02:09 +0000 (10:02 +0200)]
add seeker to entities.def

10 years agowe need the .def stuff in the -maps repo, so we can later make radiant ONLY use that
Rudolf Polzer [Fri, 2 Apr 2010 19:32:01 +0000 (21:32 +0200)]
we need the .def stuff in the -maps repo, so we can later make radiant ONLY use that

10 years agoMerge branch 'm0rfar/wtf'
Rudolf Polzer [Fri, 2 Apr 2010 19:16:02 +0000 (21:16 +0200)]
Merge branch 'm0rfar/wtf'

Conflicts:
env/exosystem/exosystem2_bk.tga
env/exosystem/exosystem2_dn.tga
env/exosystem/exosystem2_ft.tga
env/exosystem/exosystem2_lf.tga
env/exosystem/exosystem2_preview.png
env/exosystem/exosystem2_rt.tga
env/exosystem/exosystem2_up.tga
env/exosystem/exosystem_bk.tga
env/exosystem/exosystem_dn.tga
env/exosystem/exosystem_ft.tga
env/exosystem/exosystem_lf.tga
env/exosystem/exosystem_preview.png
env/exosystem/exosystem_rt.tga
env/exosystem/exosystem_up.tga

10 years agoremove the old shaders too
Rudolf Polzer [Fri, 2 Apr 2010 17:59:41 +0000 (19:59 +0200)]
remove the old shaders too

10 years agoremove the old maps, so new ones can be added
Rudolf Polzer [Fri, 2 Apr 2010 17:58:56 +0000 (19:58 +0200)]
remove the old maps, so new ones can be added

10 years agoremove all files that are in nexcompat anyway
Rudolf Polzer [Fri, 2 Apr 2010 17:53:39 +0000 (19:53 +0200)]
remove all files that are in nexcompat anyway

10 years agoRLE compress exosystem skies
Kristian Johansson [Fri, 2 Apr 2010 12:33:48 +0000 (14:33 +0200)]
RLE compress exosystem skies

10 years agoentiites.def be not here
Rudolf Polzer [Mon, 22 Mar 2010 15:45:25 +0000 (16:45 +0100)]
entiites.def be not here

10 years agomodels/mapobjects need to be here too
Rudolf Polzer [Thu, 18 Mar 2010 18:51:16 +0000 (19:51 +0100)]
models/mapobjects need to be here too

10 years agomove skyboxes and shaders where they belong
Rudolf Polzer [Thu, 18 Mar 2010 18:42:23 +0000 (19:42 +0100)]
move skyboxes and shaders where they belong

10 years agoinitial checkin from nexuiz svn r8756
xonotic [Thu, 18 Mar 2010 13:30:15 +0000 (14:30 +0100)]
initial checkin from nexuiz svn r8756