]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
14 years agoremove the cubemaps that are too map specific. Remaining ones should be tweaked to...
FruitieX [Fri, 30 Jul 2010 00:04:46 +0000 (03:04 +0300)]
remove the cubemaps that are too map specific. Remaining ones should be tweaked to be really "generic" cubemaps so they can work anywhere. Currently all shaders only use the "grey" cubemap, which needs to be changed if we decide to go with cubemaps (which I hope we do :))

14 years agoall of exx
FruitieX [Thu, 29 Jul 2010 23:19:05 +0000 (02:19 +0300)]
all of exx

14 years agoall of trak5x, hope this ain't a fps hog
FruitieX [Thu, 29 Jul 2010 23:11:50 +0000 (02:11 +0300)]
all of trak5x, hope this ain't a fps hog

14 years agoall of trak4x gloss => reflect
FruitieX [Thu, 29 Jul 2010 23:02:18 +0000 (02:02 +0300)]
all of trak4x gloss => reflect

14 years agoMerge branch 'master' into fruitiex/cubemaps
FruitieX [Thu, 29 Jul 2010 22:53:43 +0000 (01:53 +0300)]
Merge branch 'master' into fruitiex/cubemaps

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Thu, 29 Jul 2010 22:53:36 +0000 (01:53 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

14 years agoremove this :P
FruitieX [Thu, 29 Jul 2010 22:51:18 +0000 (01:51 +0300)]
remove this :P

14 years agotrak5x walls all cubemapped for testing
FruitieX [Thu, 29 Jul 2010 22:50:55 +0000 (01:50 +0300)]
trak5x walls all cubemapped for testing

14 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

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

14 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 http://nopaste.linux-dev.org/?7646 or grep source for ##

14 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

14 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

14 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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Sat, 24 Jul 2010 17:10:24 +0000 (20:10 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Thu, 22 Jul 2010 13:56:33 +0000 (16:56 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

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

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

14 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/*

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Thu, 22 Jul 2010 09:22:08 +0000 (12:22 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Wed, 21 Jul 2010 17:43:47 +0000 (20:43 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

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

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Tue, 20 Jul 2010 17:42:19 +0000 (20:42 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

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

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

14 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

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

14 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

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

14 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

14 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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Fri, 9 Jul 2010 09:19:52 +0000 (12:19 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

14 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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Fri, 2 Jul 2010 12:34:04 +0000 (15:34 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

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

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Tue, 29 Jun 2010 08:14:04 +0000 (11:14 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Sun, 27 Jun 2010 21:07:13 +0000 (00:07 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

14 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

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

14 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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Thu, 24 Jun 2010 10:05:56 +0000 (13:05 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Sat, 19 Jun 2010 20:00:07 +0000 (23:00 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

14 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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Thu, 17 Jun 2010 13:17:43 +0000 (16:17 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

14 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

14 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

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Sun, 6 Jun 2010 18:47:10 +0000 (21:47 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

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

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

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

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

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Sat, 29 May 2010 16:03:51 +0000 (19:03 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

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

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Sat, 22 May 2010 20:45:57 +0000 (23:45 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Thu, 13 May 2010 11:38:18 +0000 (14:38 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Sat, 8 May 2010 19:50:16 +0000 (22:50 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

14 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

14 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

14 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

14 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

14 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

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

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

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Mon, 3 May 2010 15:02:08 +0000 (18:02 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

14 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

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

14 years agoMerge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Sat, 1 May 2010 08:56:14 +0000 (11:56 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir

14 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

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

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

14 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

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

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

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

14 years agodance! ;)
FruitieX [Sun, 18 Apr 2010 17:23:10 +0000 (20:23 +0300)]
dance! ;)

14 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

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

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

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

14 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