]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
FruitieX [Tue, 8 Jun 2010 07:08:25 +0000 (10:08 +0300)]
make jumppad/launchpad use trak5x textures, fix the shaders
FruitieX [Sun, 30 May 2010 10:11:11 +0000 (13:11 +0300)]
xonotic jumppad model
FruitieX [Sun, 30 May 2010 10:06:49 +0000 (13:06 +0300)]
add gloss/norm map for the colored versions of the concrete texture
FruitieX [Sun, 30 May 2010 10:02:03 +0000 (13:02 +0300)]
start retexturing space elevator, add some color variations to various textures, as well as morphed's procedural concrete texture (thx)
FruitieX [Sat, 29 May 2010 18:56:33 +0000 (21:56 +0300)]
space elevator (borked atm :P) + polluted earth skybox
FruitieX [Sat, 29 May 2010 18:05:59 +0000 (21:05 +0300)]
add calm_sea skybox, do various fixes
FruitieX [Sat, 29 May 2010 15:54:26 +0000 (18:54 +0300)]
add surfacelight to the light textures
FruitieX [Sat, 29 May 2010 15:53:24 +0000 (18:53 +0300)]
stormkeep2 with warpzones
FruitieX [Sat, 29 May 2010 15:44:23 +0000 (18:44 +0300)]
Merge branch 'master' into fruitiex/stormkeep2
FruitieX [Sat, 22 May 2010 20:45:57 +0000 (23:45 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
Jakob MG [Thu, 20 May 2010 02:22:50 +0000 (04:22 +0200)]
Colorize exx _gloss maps & rewrite .shader (and fix some filenames)
FruitieX [Thu, 13 May 2010 11:38:18 +0000 (14:38 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
FruitieX [Sun, 9 May 2010 16:57:11 +0000 (19:57 +0300)]
stormkeep2 with warpzones, beware screwed up texturing/shaders
FruitieX [Sat, 8 May 2010 19:50:16 +0000 (22:50 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
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.
FruitieX [Mon, 3 May 2010 15:02:08 +0000 (18:02 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
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
FruitieX [Sat, 1 May 2010 08:56:14 +0000 (11:56 +0300)]
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
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
Jakob MG [Wed, 28 Apr 2010 15:35:45 +0000 (17:35 +0200)]
Wops, shaderlist.txt want to be in ot it too!
Jakob MG [Wed, 28 Apr 2010 15:30:29 +0000 (17:30 +0200)]
Add Oblivion's facility114 textureset
Jakob MG [Tue, 27 Apr 2010 21:09:17 +0000 (23:09 +0200)]
Fix shaders, Add trak5Fix shaders, Add trak5xx
Jakob MG [Thu, 22 Apr 2010 16:19:20 +0000 (18:19 +0200)]
Add trak4x
Jakob MG [Thu, 22 Apr 2010 16:09:32 +0000 (18:09 +0200)]
Add shaderlist
Jakob MG [Wed, 21 Apr 2010 20:25:42 +0000 (22:25 +0200)]
Add renamed, shaded and retouched eX testures (as textrues/exx)
FruitieX [Sun, 18 Apr 2010 17:23:10 +0000 (20:23 +0300)]
dance! ;)
Rudolf Polzer [Sat, 17 Apr 2010 19:11:24 +0000 (21:11 +0200)]
.gitattributes update for IDE project files
Rudolf Polzer [Sat, 17 Apr 2010 19:00:44 +0000 (21:00 +0200)]
fix lots of CRLFs
Rudolf Polzer [Sat, 17 Apr 2010 18:50:07 +0000 (20:50 +0200)]
.gitattributes
Rudolf Polzer [Tue, 13 Apr 2010 08:02:09 +0000 (10:02 +0200)]
add seeker to entities.def
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
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
Rudolf Polzer [Fri, 2 Apr 2010 17:59:41 +0000 (19:59 +0200)]
remove the old shaders too
Rudolf Polzer [Fri, 2 Apr 2010 17:58:56 +0000 (19:58 +0200)]
remove the old maps, so new ones can be added
Rudolf Polzer [Fri, 2 Apr 2010 17:53:39 +0000 (19:53 +0200)]
remove all files that are in nexcompat anyway
Kristian Johansson [Fri, 2 Apr 2010 12:33:48 +0000 (14:33 +0200)]
RLE compress exosystem skies
Rudolf Polzer [Mon, 22 Mar 2010 15:45:25 +0000 (16:45 +0100)]
entiites.def be not here
Rudolf Polzer [Thu, 18 Mar 2010 18:51:16 +0000 (19:51 +0100)]
models/mapobjects need to be here too
Rudolf Polzer [Thu, 18 Mar 2010 18:42:23 +0000 (19:42 +0100)]
move skyboxes and shaders where they belong
xonotic [Thu, 18 Mar 2010 13:30:15 +0000 (14:30 +0100)]
initial checkin from nexuiz svn r8756