]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
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 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.

11 years agomap: unsealedtrial2: enable new toys to get weapons back.
Matthias Krüger [Thu, 4 Jul 2013 16:36:48 +0000 (18:36 +0200)]
map: unsealedtrial2: enable new toys to get weapons back.

11 years agoMerge branch 'master' into matthiaskrgr/surfaceparm_alphashadow
Matthias Krüger [Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)]
Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow

11 years agomap: unsealed: add accidentally removed minimap.
Matthias Krüger [Tue, 2 Jul 2013 20:27:31 +0000 (22:27 +0200)]
map: unsealed: add accidentally removed minimap.

11 years agomap: unsealed: add proper shadows to trees.
Matthias Krüger [Tue, 2 Jul 2013 20:26:33 +0000 (22:26 +0200)]
map: unsealed: add proper shadows to trees.

11 years agomap: unsealedtrial2 bad attempt to add wind sound to the central mountain top. yet...
Matthias Krüger [Fri, 21 Jun 2013 18:01:07 +0000 (20:01 +0200)]
map: unsealedtrial2 bad attempt to add wind sound to the central mountain top. yet to be improved

11 years agomap: unsealedtrial2: add auto screenshot entities.
Matthias Krüger [Fri, 14 Jun 2013 17:11:16 +0000 (19:11 +0200)]
map: unsealedtrial2: add auto screenshot entities.

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

11 years agoforce shaderlist.txt to be built, fixes #1702
Rudolf Polzer [Sun, 23 Jun 2013 16:17:21 +0000 (18:17 +0200)]
force shaderlist.txt to be built, fixes #1702

11 years agoshaders: add surfaceparm alphashadow to following textures:
Matthias Krüger [Sun, 23 Jun 2013 16:14:15 +0000 (18:14 +0200)]
shaders: add surfaceparm alphashadow to following textures:
ex2x/base-chainlink
map_space-elevator/hangwires
textures/phillipk2x/floor-pk02_floor07
textures/phillipk2x/floor-pk02_floor10
textures/phillipk2x/floor-pk02_floor13a
textures/phillipk2x/floor-pk02_floor13b

11 years agotextures: exx/floor_wrn01-red: properly recolor from floor/floor_wrn01-blue.tga,...
Matthias Krüger [Thu, 20 Jun 2013 19:35:44 +0000 (21:35 +0200)]
textures: exx/floor_wrn01-red: properly recolor from floor/floor_wrn01-blue.tga, make it so that the original grey stripes do not become red.

11 years agomap: courtfun: remove some hlac related setting.
Matthias Krüger [Wed, 19 Jun 2013 18:34:04 +0000 (20:34 +0200)]
map: courtfun: remove some hlac related setting.

11 years agomap: abyss: add autoscreenshot entities.
Matthias Krüger [Sun, 9 Jun 2013 18:15:58 +0000 (20:15 +0200)]
map: abyss: add autoscreenshot entities.

11 years agomaps: darkzone, lightspeed, runningmanctf, bump map versions due to explodable barrels.
Matthias Krüger [Sun, 9 Jun 2013 08:20:14 +0000 (10:20 +0200)]
maps: darkzone, lightspeed, runningmanctf, bump map versions due to explodable barrels.

11 years agomap: darkzone: make 7 barrels explosive.
Matthias Krüger [Sat, 8 Jun 2013 20:13:28 +0000 (22:13 +0200)]
map: darkzone: make 7 barrels explosive.

11 years agomaps: lightspeed: make one barrel explodable.
Matthias Krüger [Sat, 8 Jun 2013 20:08:10 +0000 (22:08 +0200)]
maps: lightspeed: make one barrel explodable.

11 years agomap: runningmanctf: make two more barrels explodable.
Matthias Krüger [Sat, 8 Jun 2013 19:49:37 +0000 (21:49 +0200)]
map: runningmanctf: make two more barrels explodable.

11 years agoremove redundant map pictures...
Rudolf Polzer [Sat, 8 Jun 2013 19:18:43 +0000 (21:18 +0200)]
remove redundant map pictures...

Please make sure only tga exists on map screenshots and no lossy crap!
Avoid dupes! And ideally base on shots from the screenshot server (you
can set screenshot locations, you know) and avoid changing color
mapping, so the previews match in-game visuals as much as possible.

11 years agomap: solarium: remove textures/map_solarium/waterfall/water2.tga and use textures...
Matthias Krüger [Sat, 8 Jun 2013 15:32:48 +0000 (17:32 +0200)]
map: solarium: remove textures/map_solarium/waterfall/water2.tga and use textures/liquids_water/water2.tga instead
since the files are the same.

11 years agomap: lightspeed: remove textures/map_lightspeed/light/light_1.tga and models/map_ligh...
Matthias Krüger [Sat, 8 Jun 2013 15:30:55 +0000 (17:30 +0200)]
map: lightspeed: remove textures/map_lightspeed/light/light_1.tga and models/map_lightspeed/vines/vines01.tga and use
textures/ex2x/light/light_1.tga and models/desertfactory/textures/misc/vines01.tga since the files are the same.

11 years agomaps: glowplant: remove textures/map_glowplant/gradient_light.tga and use textures...
Matthias Krüger [Sat, 8 Jun 2013 15:29:35 +0000 (17:29 +0200)]
maps: glowplant: remove textures/map_glowplant/gradient_light.tga and use textures/effects_lightning/gradient_white.tga instead
since the files are the same.

11 years agomaps: g-23: remove textures/map_g-23/conveyorbelt/conveyorbelt.tga and use textures...
Matthias Krüger [Sat, 8 Jun 2013 15:28:35 +0000 (17:28 +0200)]
maps: g-23: remove textures/map_g-23/conveyorbelt/conveyorbelt.tga and use textures/exx/trim/trim_psimple05.tga instead
since the files are the same.

11 years agomaps: darkzone: remove textures/map_darkzone/light/dz_bluelight.tga and use textures...
Matthias Krüger [Sat, 8 Jun 2013 15:26:29 +0000 (17:26 +0200)]
maps: darkzone: remove textures/map_darkzone/light/dz_bluelight.tga and use textures/ex2x/light/light_beam_blue.tga instead
since the files are the same.

11 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/silentsiege_bad_texture_fix' xonotic-v0.7.0
Samual Lenks [Tue, 4 Jun 2013 20:55:28 +0000 (16:55 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege_bad_texture_fix'

11 years agofix damn lost wrong texture
kuniuthefrogg [Tue, 4 Jun 2013 20:29:23 +0000 (22:29 +0200)]
fix damn lost wrong texture

11 years agoMerge remote-tracking branch 'origin/Mirio/afterslime'
Samual Lenks [Tue, 4 Jun 2013 16:23:43 +0000 (12:23 -0400)]
Merge remote-tracking branch 'origin/Mirio/afterslime'

Conflicts:
maps/afterslime.map.options

11 years agoMerge remote-tracking branch 'origin/Mirio/campaign'
Samual Lenks [Tue, 4 Jun 2013 16:16:21 +0000 (12:16 -0400)]
Merge remote-tracking branch 'origin/Mirio/campaign'

11 years agoAlso incrememnt runningmanctf version as it had changes to .map just now
Samual Lenks [Tue, 4 Jun 2013 16:15:02 +0000 (12:15 -0400)]
Also incrememnt runningmanctf version as it had changes to .map just now

11 years agoMerge remote-tracking branch 'origin/Mirio/runningmanctf'
Samual Lenks [Tue, 4 Jun 2013 16:12:58 +0000 (12:12 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningmanctf'

11 years agoFix color code of DOM controlpoint entity
Mirio [Tue, 4 Jun 2013 12:34:40 +0000 (14:34 +0200)]
Fix color code of DOM controlpoint entity

11 years agoFix color code of DOM controlpoint entites
Mirio [Tue, 4 Jun 2013 12:33:36 +0000 (14:33 +0200)]
Fix color code of DOM controlpoint entites

11 years agoFix 3 levels, campaign is fully playable now
Mirio [Tue, 4 Jun 2013 12:30:26 +0000 (14:30 +0200)]
Fix 3 levels, campaign is fully playable now

11 years agoMerge remote-tracking branch 'origin/Mirio/mapoptions'
Samual Lenks [Mon, 3 Jun 2013 22:37:55 +0000 (18:37 -0400)]
Merge remote-tracking branch 'origin/Mirio/mapoptions'

11 years agodrain
Mirio [Mon, 3 Jun 2013 20:33:44 +0000 (22:33 +0200)]
drain

11 years ago.map.options files + mapinfo update for stormkeep
Mirio [Mon, 3 Jun 2013 20:30:44 +0000 (22:30 +0200)]
.map.options files + mapinfo update for stormkeep

11 years agoMerge remote-tracking branch 'origin/Mirio/silentsiege'
Samual Lenks [Mon, 3 Jun 2013 20:08:15 +0000 (16:08 -0400)]
Merge remote-tracking branch 'origin/Mirio/silentsiege'

11 years agoMerge remote-tracking branch 'origin/Mirio/stormkeep'
Samual Lenks [Mon, 3 Jun 2013 17:45:04 +0000 (13:45 -0400)]
Merge remote-tracking branch 'origin/Mirio/stormkeep'

11 years agoMerge remote-tracking branch 'origin/Mirio/runningman'
Samual Lenks [Mon, 3 Jun 2013 17:23:24 +0000 (13:23 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningman'

11 years agoMerge remote-tracking branch 'origin/Mirio/glowplant'
Samual Lenks [Mon, 3 Jun 2013 17:22:45 +0000 (13:22 -0400)]
Merge remote-tracking branch 'origin/Mirio/glowplant'

11 years agoMerge remote-tracking branch 'origin/Mirio/runningmanctf'
Samual Lenks [Mon, 3 Jun 2013 17:22:14 +0000 (13:22 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningmanctf'

11 years agoMerge remote-tracking branch 'origin/Mirio/drain'
Samual Lenks [Mon, 3 Jun 2013 17:20:37 +0000 (13:20 -0400)]
Merge remote-tracking branch 'origin/Mirio/drain'

11 years agoKeepaway stays on Afterslime :P
Samual Lenks [Mon, 3 Jun 2013 17:19:37 +0000 (13:19 -0400)]
Keepaway stays on Afterslime :P

11 years agoMerge remote-tracking branch 'origin/Mirio/afterslime'
Samual Lenks [Mon, 3 Jun 2013 17:18:56 +0000 (13:18 -0400)]
Merge remote-tracking branch 'origin/Mirio/afterslime'

11 years agoRemove target from info_autoscreenshot, fix typo 'capture' -> 'captured'
Mirio [Mon, 3 Jun 2013 17:13:44 +0000 (19:13 +0200)]
Remove target from info_autoscreenshot, fix typo 'capture' -> 'captured'

11 years agoMerge remote-tracking branch 'origin/master' into Mirio/silentsiege
Samual Lenks [Mon, 3 Jun 2013 16:47:53 +0000 (12:47 -0400)]
Merge remote-tracking branch 'origin/master' into Mirio/silentsiege

11 years agoReplace space-elevator map image
Samual Lenks [Mon, 3 Jun 2013 16:46:44 +0000 (12:46 -0400)]
Replace space-elevator map image

11 years agoAuthor name
Mirio [Mon, 3 Jun 2013 16:46:25 +0000 (18:46 +0200)]
Author name

11 years agoMerge remote-tracking branch 'origin/matthiaskrgr/space-elevator_autoSC_ent'
Samual Lenks [Mon, 3 Jun 2013 16:44:21 +0000 (12:44 -0400)]
Merge remote-tracking branch 'origin/matthiaskrgr/space-elevator_autoSC_ent'

11 years agoMerge remote-tracking branch 'origin/matthiaskrgr/map_descs'
Samual Lenks [Mon, 3 Jun 2013 16:28:56 +0000 (12:28 -0400)]
Merge remote-tracking branch 'origin/matthiaskrgr/map_descs'

11 years agomap: courtfun: desc: ctf map which supports other gamemodes as well
Matthias Krüger [Sun, 2 Jun 2013 21:38:15 +0000 (23:38 +0200)]
map: courtfun: desc: ctf map which supports other gamemodes as well

11 years agodomination entities message added
Mirio [Sun, 2 Jun 2013 21:36:21 +0000 (23:36 +0200)]
domination entities message added

11 years agomaps: fuse: mapdescription "Winner 2012" -> "Winner of 2012"
Matthias Krüger [Sun, 2 Jun 2013 21:33:29 +0000 (23:33 +0200)]
maps: fuse: mapdescription "Winner 2012" -> "Winner of 2012"

11 years agoFix previous leak
Mirio [Sun, 2 Jun 2013 21:31:40 +0000 (23:31 +0200)]
Fix previous leak

11 years agomaps: g23 : shorten mapdescription.
Matthias Krüger [Sun, 2 Jun 2013 21:29:12 +0000 (23:29 +0200)]
maps: g23 : shorten mapdescription.

11 years agoMerge branch 'master' into matthiaskrgr/space-elevator_autoSC_ent
Matthias Krüger [Sun, 2 Jun 2013 21:19:15 +0000 (23:19 +0200)]
Merge branch 'master' into matthiaskrgr/space-elevator_autoSC_ent

11 years agoFix previous leak
Mirio [Sun, 2 Jun 2013 17:47:53 +0000 (19:47 +0200)]
Fix previous leak

11 years agoFix previous leak
Mirio [Sun, 2 Jun 2013 17:46:14 +0000 (19:46 +0200)]
Fix previous leak

11 years agoFix previous leak
Mirio [Sun, 2 Jun 2013 17:45:17 +0000 (19:45 +0200)]
Fix previous leak

11 years agotry fixing silentsiege by importing the gspawn1 model from final_rage
Rudolf Polzer [Sun, 2 Jun 2013 17:21:18 +0000 (19:21 +0200)]
try fixing silentsiege by importing the gspawn1 model from final_rage

11 years agomap: space-elevator: change first auto-screenshot entity.
Matthias Krüger [Sun, 2 Jun 2013 13:23:52 +0000 (15:23 +0200)]
map: space-elevator: change first auto-screenshot entity.

11 years agoFix DOM entities and barrel area
Mirio [Sun, 2 Jun 2013 00:33:24 +0000 (02:33 +0200)]
Fix DOM entities and barrel area

11 years agoFix DOM entities, info_autoscreenshot entities. Remove KA, because ball spawns outsid...
Mirio [Sun, 2 Jun 2013 00:21:14 +0000 (02:21 +0200)]
Fix DOM entities, info_autoscreenshot entities. Remove KA, because ball spawns outside the map too much atm - fix later

11 years agoFix DOM entities
Mirio [Sun, 2 Jun 2013 00:19:24 +0000 (02:19 +0200)]
Fix DOM entities

11 years agoFix DOM entities, fix ticket 1593
Mirio [Sun, 2 Jun 2013 00:17:03 +0000 (02:17 +0200)]
Fix DOM entities, fix ticket 1593

11 years agoBarrels go boom, fix DOM entities
Mirio [Sun, 2 Jun 2013 00:15:11 +0000 (02:15 +0200)]
Barrels go boom, fix DOM entities