]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
11 years agoMerge branch 'master' into matthiaskrgr/unsealedtrial2
Matthias Krüger [Tue, 6 Aug 2013 13:41:00 +0000 (15:41 +0200)]
Merge branch 'master' into matthiaskrgr/unsealedtrial2

11 years agounsealed: fix small texture alignment, merge 4 brushes into 2 brushes.
Matthias Krüger [Mon, 5 Aug 2013 21:13:55 +0000 (23:13 +0200)]
unsealed: fix small texture alignment, merge 4 brushes into 2 brushes.

11 years agounsealed: change the warning stripes surrounding the second floor windows to some...
Matthias Krüger [Mon, 5 Aug 2013 21:03:32 +0000 (23:03 +0200)]
unsealed: change the warning stripes surrounding the second floor windows to some metal texture + the new stripes overlaying them.

11 years agounsealed: add exx floor warningstripes as texture but only the stripes so that we...
Matthias Krüger [Mon, 5 Aug 2013 21:01:49 +0000 (23:01 +0200)]
unsealed: add exx floor warningstripes as texture but only the stripes so that we can put it on top of another texture.

11 years agoshaders: glassx: remove dpnoshadow flag.
Matthias Krüger [Mon, 5 Aug 2013 17:33:44 +0000 (19:33 +0200)]
shaders: glassx: remove dpnoshadow flag.

11 years agounsealed: oops, fix shaderfile; paths to orange lights.
Matthias Krüger [Mon, 5 Aug 2013 17:32:30 +0000 (19:32 +0200)]
unsealed: oops, fix shaderfile; paths to orange lights.

11 years agoRevert "unsealed: add lights to second floor surface."
Matthias Krüger [Mon, 5 Aug 2013 15:41:28 +0000 (17:41 +0200)]
Revert "unsealed: add lights to second floor surface."

This reverts commit 9a22ee59a3fefc907274d775b401c13dfd90e054.
Doesn't look that good actually.

11 years agounsealed: add lights to second floor surface.
Matthias Krüger [Mon, 5 Aug 2013 15:17:54 +0000 (17:17 +0200)]
unsealed: add lights to second floor surface.

11 years agounsealed: revert some other texture changes near base core that I accidentally...
Matthias Krüger [Mon, 5 Aug 2013 14:48:59 +0000 (16:48 +0200)]
unsealed: revert some other texture changes near base core that I accidentally...

11 years agounsealed: fix trim near window.
Matthias Krüger [Mon, 5 Aug 2013 14:47:55 +0000 (16:47 +0200)]
unsealed: fix trim near window.

11 years agounsealed: make trims aroung glas on the floor smaller.
Matthias Krüger [Mon, 5 Aug 2013 14:42:07 +0000 (16:42 +0200)]
unsealed: make trims aroung glas on the floor smaller.

11 years agounsealed: adjust light textures on stairs.
Matthias Krüger [Mon, 5 Aug 2013 10:23:44 +0000 (12:23 +0200)]
unsealed: adjust light textures on stairs.

11 years agounsealed: properly align some more textures.
Matthias Krüger [Mon, 5 Aug 2013 09:54:49 +0000 (11:54 +0200)]
unsealed: properly align some more textures.

11 years agounsealed: remove invisible brushes.
Matthias Krüger [Mon, 5 Aug 2013 09:52:43 +0000 (11:52 +0200)]
unsealed: remove invisible brushes.

11 years agounsealed: change some textures around the lightgrates.
Matthias Krüger [Sat, 3 Aug 2013 17:09:54 +0000 (19:09 +0200)]
unsealed: change some textures around the lightgrates.

11 years agounsealed: rework the stairs in the base, add lights, fix texture alignment.
Matthias Krüger [Sat, 3 Aug 2013 15:49:53 +0000 (17:49 +0200)]
unsealed: rework the stairs in the base, add lights, fix texture alignment.

11 years agounsealed: add orange light texture based on trak5x/light2a
Matthias Krüger [Sat, 3 Aug 2013 14:02:22 +0000 (16:02 +0200)]
unsealed: add orange light texture based on trak5x/light2a

11 years agounsealed: the map had "_lightmapscale" "1.5" set. Instead of setting this to the...
Matthias Krüger [Sat, 3 Aug 2013 10:28:41 +0000 (12:28 +0200)]
unsealed: the map had "_lightmapscale" "1.5" set. Instead of setting this to the entire map, only make it affect the ground model.

11 years agounsealed: some more texture alignments and changes
Matthias Krüger [Fri, 2 Aug 2013 22:19:37 +0000 (00:19 +0200)]
unsealed: some more texture alignments and changes

11 years agounsealed: some more small texture improvements
Matthias Krüger [Fri, 2 Aug 2013 22:07:15 +0000 (00:07 +0200)]
unsealed: some more small texture improvements

11 years agounsealed: fix texture alignment + add to light brushes
Matthias Krüger [Fri, 2 Aug 2013 22:02:47 +0000 (00:02 +0200)]
unsealed: fix texture alignment + add to light brushes

11 years agounsealed: put frame behind xonotic logo decal.
Matthias Krüger [Fri, 2 Aug 2013 18:33:36 +0000 (20:33 +0200)]
unsealed: put frame behind xonotic logo decal.

11 years agounsealed: add glass to the second floor so that we can look down into the first one.
Matthias Krüger [Fri, 2 Aug 2013 18:09:13 +0000 (20:09 +0200)]
unsealed: add glass to the second floor so that we can look down into the first one.

11 years agounsealed: I think it's the third time now I fixed this texture disalignment...
Matthias Krüger [Fri, 2 Aug 2013 16:51:11 +0000 (18:51 +0200)]
unsealed: I think it's the third time now I fixed this texture disalignment...

11 years agounsealed: solve some more disalignments
Matthias Krüger [Fri, 2 Aug 2013 13:18:04 +0000 (15:18 +0200)]
unsealed: solve some more disalignments

11 years agounsealed: sigh, why does it feel like I was doing the same fixes again and again?
Matthias Krüger [Fri, 2 Aug 2013 13:14:30 +0000 (15:14 +0200)]
unsealed: sigh, why does it feel like I was doing the same fixes again and again?

11 years agounsealed: change area around megahealth a bit.
Matthias Krüger [Fri, 2 Aug 2013 13:11:35 +0000 (15:11 +0200)]
unsealed: change area around megahealth a bit.

11 years agounsealed: more texture changes and fixes.
Matthias Krüger [Fri, 2 Aug 2013 11:59:08 +0000 (13:59 +0200)]
unsealed: more texture changes and fixes.

11 years agounsealed: fix some texture disalignments.
Matthias Krüger [Fri, 2 Aug 2013 09:07:15 +0000 (11:07 +0200)]
unsealed: fix some texture disalignments.

11 years agounsealed: make hunter turret socket a light.
Matthias Krüger [Fri, 2 Aug 2013 09:00:43 +0000 (11:00 +0200)]
unsealed: make hunter turret socket a light.

11 years agounsealed: even more texture fixes.
Matthias Krüger [Fri, 2 Aug 2013 07:02:20 +0000 (09:02 +0200)]
unsealed: even more texture fixes.

11 years agounsealed: fix some more light textures.
Matthias Krüger [Thu, 1 Aug 2013 23:36:14 +0000 (01:36 +0200)]
unsealed: fix some more light textures.

11 years agounsealed: fix light textures
Matthias Krüger [Thu, 1 Aug 2013 23:17:59 +0000 (01:17 +0200)]
unsealed: fix light textures

11 years agounsealed: move 2 mountains a bit so that we can squeeze through at their side again...
Matthias Krüger [Thu, 1 Aug 2013 20:23:27 +0000 (22:23 +0200)]
unsealed: move 2 mountains a bit so that we can squeeze through at their side again where I put the wall.

11 years agounsealed: some small texture fixes here and there
Matthias Krüger [Wed, 31 Jul 2013 20:35:57 +0000 (22:35 +0200)]
unsealed: some small texture fixes here and there

11 years agounsealed: start retexturing of the red base
Matthias Krüger [Wed, 31 Jul 2013 20:22:52 +0000 (22:22 +0200)]
unsealed: start retexturing of the red base

11 years agounsealed: add modified trak5x/floor_floor2 textures.
Matthias Krüger [Wed, 31 Jul 2013 14:47:12 +0000 (16:47 +0200)]
unsealed: add modified trak5x/floor_floor2 textures.

11 years agounsealed: bring back old minimap, not auto-generated.
Matthias Krüger [Tue, 30 Jul 2013 15:36:44 +0000 (17:36 +0200)]
unsealed: bring back old minimap, not auto-generated.

11 years agounsealed: don't generate a minimap / don't overwrite the existing minimap.
Matthias Krüger [Tue, 30 Jul 2013 15:34:43 +0000 (17:34 +0200)]
unsealed: don't generate a minimap / don't overwrite the existing minimap.

11 years agounsealed: remove another weaponclip from a tree
Matthias Krüger [Tue, 30 Jul 2013 13:19:28 +0000 (15:19 +0200)]
unsealed: remove another weaponclip from a tree

11 years agounsealed: prevent bullets from passing crystals.
Matthias Krüger [Tue, 30 Jul 2013 11:30:35 +0000 (13:30 +0200)]
unsealed: prevent bullets from passing crystals.

11 years agounsealed: add crystals so inside of central mountain.
Matthias Krüger [Tue, 30 Jul 2013 10:47:11 +0000 (12:47 +0200)]
unsealed: add crystals so inside of central mountain.

11 years agounsealed: import crystal models by Morphed, taken from Justins Catharsis.
Matthias Krüger [Tue, 30 Jul 2013 09:23:21 +0000 (11:23 +0200)]
unsealed: import crystal models by Morphed, taken from Justins Catharsis.

11 years agounsealed: fix outer fence, once again... will this ever have an end?
Matthias Krüger [Tue, 30 Jul 2013 09:19:50 +0000 (11:19 +0200)]
unsealed: fix outer fence, once again... will this ever have an end?

11 years agounsealed: oops, I was too lazy while copying the lights to the red base... fix textur...
Matthias Krüger [Tue, 30 Jul 2013 09:17:15 +0000 (11:17 +0200)]
unsealed: oops, I was too lazy while copying the lights to the red base... fix textures.. :)

11 years agomap:unsealed: add tons of lights to the bases
Matthias Krüger [Tue, 30 Jul 2013 09:11:49 +0000 (11:11 +0200)]
map:unsealed: add tons of lights to the bases

11 years agounsealed: more light details
Matthias Krüger [Mon, 29 Jul 2013 11:26:53 +0000 (13:26 +0200)]
unsealed: more light details

11 years agounsealed: fix decals
Matthias Krüger [Mon, 29 Jul 2013 01:52:54 +0000 (03:52 +0200)]
unsealed: fix decals

11 years agounsealed: move electros out of the mountain (wtf?).
Matthias Krüger [Mon, 29 Jul 2013 01:01:02 +0000 (03:01 +0200)]
unsealed: move electros out of the mountain (wtf?).

11 years agounsealed: minor fixes here and there
Matthias Krüger [Mon, 29 Jul 2013 00:57:44 +0000 (02:57 +0200)]
unsealed: minor fixes here and there

11 years agounsealed: change light ramps a bit, caulk their backs, move 50armors a bit.
Matthias Krüger [Sun, 28 Jul 2013 21:16:11 +0000 (23:16 +0200)]
unsealed: change light ramps a bit, caulk their backs, move  50armors a bit.

11 years agounsealed: increase lightmapsize to 2048
Matthias Krüger [Sun, 28 Jul 2013 11:22:48 +0000 (13:22 +0200)]
unsealed: increase lightmapsize to 2048

11 years agounsealed: split up the walls into several pieces.
Matthias Krüger [Sun, 28 Jul 2013 00:47:44 +0000 (02:47 +0200)]
unsealed: split up the walls into several pieces.

11 years agounsealed: align wall properly.
Matthias Krüger [Sat, 27 Jul 2013 19:44:35 +0000 (21:44 +0200)]
unsealed: align wall properly.

11 years agounsealed: initial import of the outer wall surrounding the map from unsealed1.
Matthias Krüger [Sat, 27 Jul 2013 13:24:24 +0000 (15:24 +0200)]
unsealed: initial import of the outer wall surrounding the map from unsealed1.

11 years agounsealed: add 2 medium armors to each base
Matthias Krüger [Fri, 26 Jul 2013 22:17:00 +0000 (00:17 +0200)]
unsealed: add 2 medium armors to each base

11 years agomap: unsealed: use new trims on stairs inside bases.
Matthias Krüger [Fri, 26 Jul 2013 21:54:01 +0000 (23:54 +0200)]
map: unsealed: use new trims on stairs inside bases.

11 years agomap: unsealed: add recolored trims from trak5x
Matthias Krüger [Fri, 26 Jul 2013 21:29:37 +0000 (23:29 +0200)]
map: unsealed: add recolored trims from trak5x

11 years agounsealed: make a few jump-ramps look less boring.
Matthias Krüger [Fri, 26 Jul 2013 21:02:58 +0000 (23:02 +0200)]
unsealed: make a few jump-ramps look less boring.

11 years agomap: unsealed: fix another light object.
Matthias Krüger [Fri, 26 Jul 2013 17:39:50 +0000 (19:39 +0200)]
map: unsealed: fix another light object.

11 years agounsealed: add xonotic logo decals, unfortunately invisible. It gets fixed later.
Matthias Krüger [Fri, 26 Jul 2013 15:24:01 +0000 (17:24 +0200)]
unsealed: add xonotic logo decals, unfortunately invisible. It gets fixed later.

11 years agounsealed: new attempt to turrets, only have one double-rocket turret behind the bumbl...
Matthias Krüger [Fri, 26 Jul 2013 12:45:27 +0000 (14:45 +0200)]
unsealed: new attempt to turrets, only have one double-rocket turret behind the bumble at each back of base.

11 years agounsealed: fix positions of a few ramps.
Matthias Krüger [Fri, 26 Jul 2013 09:29:54 +0000 (11:29 +0200)]
unsealed: fix positions of a few ramps.

11 years agomap: unsealed: remove weaponclip near aircraft spawnpoints
Matthias Krüger [Thu, 25 Jul 2013 23:23:29 +0000 (01:23 +0200)]
map: unsealed: remove weaponclip near aircraft spawnpoints

11 years agomap: unsealed: fix turrets, add small ramps+lamps inside of bases for trickjumps.
Matthias Krüger [Thu, 25 Jul 2013 23:09:55 +0000 (01:09 +0200)]
map: unsealed: fix turrets, add small ramps+lamps inside of bases for trickjumps.

11 years agomap: unsealed: add hunter turrets at upper back of bases.
Matthias Krüger [Thu, 25 Jul 2013 16:11:50 +0000 (18:11 +0200)]
map: unsealed: add hunter turrets at upper back of bases.

11 years agomap: unsealed: finally fix glass near landing platforms.
Matthias Krüger [Thu, 25 Jul 2013 16:10:59 +0000 (18:10 +0200)]
map: unsealed: finally fix glass near landing platforms.

11 years agounsealed: fix all the glass near plane spawnpoints
Matthias Krüger [Thu, 25 Jul 2013 10:13:24 +0000 (12:13 +0200)]
unsealed: fix all the glass near plane spawnpoints

11 years agounsealed: partly fix hexglass overlapping near aircraft spawnpoints.
Matthias Krüger [Wed, 24 Jul 2013 20:30:36 +0000 (22:30 +0200)]
unsealed: partly fix hexglass overlapping near aircraft spawnpoints.

11 years agomap: unsealed: remove weaponclip from tree trunks.
Matthias Krüger [Wed, 24 Jul 2013 16:37:50 +0000 (18:37 +0200)]
map: unsealed: remove weaponclip from tree trunks.

11 years agomap: unsealedtrial: color some surfaces and stairs in the bases.
Matthias Krüger [Wed, 24 Jul 2013 16:21:54 +0000 (18:21 +0200)]
map: unsealedtrial: color some surfaces and stairs in the bases.

11 years agotextures: glassx: enable culling.
Matthias Krüger [Tue, 23 Jul 2013 20:49:24 +0000 (22:49 +0200)]
textures: glassx: enable culling.

11 years agounsealed: remove now dublicated glassx textures.
Matthias Krüger [Tue, 23 Jul 2013 20:48:33 +0000 (22:48 +0200)]
unsealed: remove now dublicated glassx textures.

11 years agoMerge branch 'master' into matthiaskrgr/unsealedtrial2
Matthias Krüger [Tue, 23 Jul 2013 20:27:52 +0000 (22:27 +0200)]
Merge branch 'master' into matthiaskrgr/unsealedtrial2

11 years agofix glassx shader
Rudolf Polzer [Sat, 13 Jul 2013 09:21:53 +0000 (11:21 +0200)]
fix glassx shader

11 years agoMerge remote-tracking branch 'origin/matthiaskrgr/glassx'
Rudolf Polzer [Sat, 13 Jul 2013 09:18:25 +0000 (11:18 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/glassx'

11 years agoMerge remote-tracking branch 'origin/matthiaskrgr/courtfun'
Rudolf Polzer [Sat, 13 Jul 2013 09:17:22 +0000 (11:17 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/courtfun'

11 years agoMerge remote-tracking branch 'origin/matthiaskrgr/exploding_barrels'
Rudolf Polzer [Sat, 13 Jul 2013 09:17:12 +0000 (11:17 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/exploding_barrels'

11 years agoMerge remote-tracking branch 'origin/matthiaskrgr/surfaceparm_alphashadow'
Rudolf Polzer [Sat, 13 Jul 2013 09:17:05 +0000 (11:17 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/surfaceparm_alphashadow'

11 years agoMerge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents'
Rudolf Polzer [Sat, 13 Jul 2013 09:16:56 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents'

11 years agoMerge remote-tracking branch 'origin/matthiaskrgr/respawnrings_texture'
Rudolf Polzer [Sat, 13 Jul 2013 09:16:47 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/respawnrings_texture'

11 years agoMerge remote-tracking branch 'origin/matthiaskrgr/exx_floor-wrn01-red'
Rudolf Polzer [Sat, 13 Jul 2013 09:16:06 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/exx_floor-wrn01-red'

11 years agosilentsiege: remove red respawnrings.
Matthias Krüger [Sat, 13 Jul 2013 05:58:59 +0000 (07:58 +0200)]
silentsiege: remove red respawnrings.

11 years agodrain: remove blue respawnrings.
Matthias Krüger [Sat, 13 Jul 2013 05:49:12 +0000 (07:49 +0200)]
drain: remove blue respawnrings.

11 years agodance: remove red and blue respawnrings.
Matthias Krüger [Sat, 13 Jul 2013 05:41:48 +0000 (07:41 +0200)]
dance: remove red and blue respawnrings.

11 years agorespawnrings: ensure backwards compatibility for maps which are still using the old...
Matthias Krüger [Sat, 13 Jul 2013 05:29:04 +0000 (07:29 +0200)]
respawnrings: ensure backwards compatibility for maps which are still using the old ones, rename the new respawnrings to -highres.

11 years agoadd shaderfile.
Matthias Krüger [Wed, 10 Jul 2013 19:29:57 +0000 (21:29 +0200)]
add shaderfile.

11 years agoadd hexglass texture by Morphed.
Matthias Krüger [Wed, 10 Jul 2013 19:00:39 +0000 (21:00 +0200)]
add hexglass texture by Morphed.

11 years agoupdate item spawnring shader file.
Matthias Krüger [Wed, 10 Jul 2013 17:46:56 +0000 (19:46 +0200)]
update item spawnring shader file.

11 years agonew high-res respawnring textures
Matthias Krüger [Wed, 10 Jul 2013 17:44:40 +0000 (19:44 +0200)]
new high-res respawnring textures

for color in red blue yellow green black purple white ; do ;                                                                                                                                                                                                     matthias@t400 00
  convert -size 1024x1024 xc:transparent -fill transparent -stroke ${color} -strokewidth 15 \
          -draw "circle 512,512 512,30" respawnring-${color}.png
done

11 years agoMerge commit '145caec5a836be05bfd091f175605bed237516e3'
Rudolf Polzer [Mon, 8 Jul 2013 09:56:30 +0000 (11:56 +0200)]
Merge commit '145caec5a836be05bfd091f175605bed237516e3'

11 years agomap: unsealed: readd minimap.
Matthias Krüger [Sat, 6 Jul 2013 13:16:51 +0000 (15:16 +0200)]
map: unsealed: readd minimap.

11 years agomap: unsealed: bump map version, new map description and small stuff like that.
Matthias Krüger [Sat, 6 Jul 2013 13:16:03 +0000 (15:16 +0200)]
map: unsealed: bump map version, new map description and small stuff like that.

11 years agomap: unsealed: new mappic.
Matthias Krüger [Sat, 6 Jul 2013 13:12:40 +0000 (15:12 +0200)]
map: unsealed: new mappic.

11 years agoclean up map_unsealedtrial2.shader a bit.
Matthias Krüger [Sat, 6 Jul 2013 12:59:21 +0000 (14:59 +0200)]
clean up map_unsealedtrial2.shader a bit.

11 years agomap: unsealed: add more wind wounds to mountain tops.
Matthias Krüger [Sat, 6 Jul 2013 07:24:11 +0000 (09:24 +0200)]
map: unsealed: add more wind wounds to mountain tops.

11 years agomap: unsealed: randomly™ scale trees up and down to make them look more natural.
Matthias Krüger [Fri, 5 Jul 2013 22:19:23 +0000 (00:19 +0200)]
map: unsealed: randomly™ scale trees up and down to make them look more natural.

11 years agomap: unsealed: add humm noise to lights.
Matthias Krüger [Fri, 5 Jul 2013 22:08:29 +0000 (00:08 +0200)]
map: unsealed: add humm noise to lights.

11 years agounsealed: add sounds inside/under the mountain
Matthias Krüger [Fri, 5 Jul 2013 21:42:50 +0000 (23:42 +0200)]
unsealed: add sounds inside/under the mountain

11 years agounsealed: add more sounds on top of the central mountain.
Matthias Krüger [Fri, 5 Jul 2013 20:52:55 +0000 (22:52 +0200)]
unsealed: add more sounds on top of the central mountain.