]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
cbrutail [Tue, 24 Sep 2013 14:41:12 +0000 (16:41 +0200)]
Limbo map to fool around. It's fun!
Rudolf Polzer [Wed, 14 Aug 2013 08:33:16 +0000 (10:33 +0200)]
Revert "moving 2 textures to 'base'"
This reverts commit
baf1d487a81f92b8452e38efdb0a18ca6a1bb211 .
Rudolf Polzer [Wed, 14 Aug 2013 08:28:12 +0000 (10:28 +0200)]
Revert "renaming a few textures" as that breaks existing maps.
If you want to rename textures, make the previous shader name continue
working. Possibly hide it from Radiant though (q3map_deprecateShader can
e.g. do that).
This reverts commit
57116a039162d2a4099a7e00857a0c5ebe8f0077 .
Rudolf Polzer [Wed, 14 Aug 2013 08:17:06 +0000 (10:17 +0200)]
Merge remote-tracking branch 'origin/debugger/exomorphx', fixing #1751
Debugger [Mon, 12 Aug 2013 15:41:18 +0000 (17:41 +0200)]
moving 2 textures to 'base'
Debugger [Sun, 11 Aug 2013 15:10:03 +0000 (17:10 +0200)]
renaming a few textures
Rudolf Polzer [Tue, 6 Aug 2013 13:29:04 +0000 (15:29 +0200)]
Revert "shaders: glassx: remove dpnoshadow flag."
We probably want to have this treated as translucent for realtime light
purposes.
This reverts commit
1f485252c05fda98d1ff550582e6802fd195535e .
Matthias Krüger [Mon, 5 Aug 2013 17:33:44 +0000 (19:33 +0200)]
shaders: glassx: remove dpnoshadow flag.
Debugger [Mon, 5 Aug 2013 15:30:19 +0000 (17:30 +0200)]
removing empty lines
Matthias Krüger [Tue, 23 Jul 2013 20:49:24 +0000 (22:49 +0200)]
textures: glassx: enable culling.
Rudolf Polzer [Sat, 13 Jul 2013 09:21:53 +0000 (11:21 +0200)]
fix glassx shader
Rudolf Polzer [Sat, 13 Jul 2013 09:18:25 +0000 (11:18 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/glassx'
Rudolf Polzer [Sat, 13 Jul 2013 09:17:22 +0000 (11:17 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/courtfun'
Rudolf Polzer [Sat, 13 Jul 2013 09:17:12 +0000 (11:17 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/exploding_barrels'
Rudolf Polzer [Sat, 13 Jul 2013 09:17:05 +0000 (11:17 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/surfaceparm_alphashadow'
Rudolf Polzer [Sat, 13 Jul 2013 09:16:56 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents'
Rudolf Polzer [Sat, 13 Jul 2013 09:16:47 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/respawnrings_texture'
Rudolf Polzer [Sat, 13 Jul 2013 09:16:06 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/exx_floor-wrn01-red'
Matthias Krüger [Sat, 13 Jul 2013 05:58:59 +0000 (07:58 +0200)]
silentsiege: remove red respawnrings.
Matthias Krüger [Sat, 13 Jul 2013 05:49:12 +0000 (07:49 +0200)]
drain: remove blue respawnrings.
Matthias Krüger [Sat, 13 Jul 2013 05:41:48 +0000 (07:41 +0200)]
dance: remove red and blue respawnrings.
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.
Matthias Krüger [Wed, 10 Jul 2013 19:29:57 +0000 (21:29 +0200)]
add shaderfile.
Matthias Krüger [Wed, 10 Jul 2013 19:00:39 +0000 (21:00 +0200)]
add hexglass texture by Morphed.
Matthias Krüger [Wed, 10 Jul 2013 17:46:56 +0000 (19:46 +0200)]
update item spawnring shader file.
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
Rudolf Polzer [Mon, 8 Jul 2013 09:56:30 +0000 (11:56 +0200)]
Matthias Krüger [Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)]
Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow
Rudolf Polzer [Sun, 23 Jun 2013 16:17:21 +0000 (18:17 +0200)]
force shaderlist.txt to be built, fixes #1702
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
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.
Matthias Krüger [Wed, 19 Jun 2013 18:34:04 +0000 (20:34 +0200)]
map: courtfun: remove some hlac related setting.
Matthias Krüger [Sun, 9 Jun 2013 18:15:58 +0000 (20:15 +0200)]
map: abyss: add autoscreenshot entities.
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.
Matthias Krüger [Sat, 8 Jun 2013 20:13:28 +0000 (22:13 +0200)]
map: darkzone: make 7 barrels explosive.
Matthias Krüger [Sat, 8 Jun 2013 20:08:10 +0000 (22:08 +0200)]
maps: lightspeed: make one barrel explodable.
Matthias Krüger [Sat, 8 Jun 2013 19:49:37 +0000 (21:49 +0200)]
map: runningmanctf: make two more barrels explodable.
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.
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.
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.
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.
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.
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.
Samual Lenks [Tue, 4 Jun 2013 20:55:28 +0000 (16:55 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege_bad_texture_fix'
kuniuthefrogg [Tue, 4 Jun 2013 20:29:23 +0000 (22:29 +0200)]
fix damn lost wrong texture
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
Samual Lenks [Tue, 4 Jun 2013 16:16:21 +0000 (12:16 -0400)]
Merge remote-tracking branch 'origin/Mirio/campaign'
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
Samual Lenks [Tue, 4 Jun 2013 16:12:58 +0000 (12:12 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningmanctf'
Mirio [Tue, 4 Jun 2013 12:34:40 +0000 (14:34 +0200)]
Fix color code of DOM controlpoint entity
Mirio [Tue, 4 Jun 2013 12:33:36 +0000 (14:33 +0200)]
Fix color code of DOM controlpoint entites
Mirio [Tue, 4 Jun 2013 12:30:26 +0000 (14:30 +0200)]
Fix 3 levels, campaign is fully playable now
Samual Lenks [Mon, 3 Jun 2013 22:37:55 +0000 (18:37 -0400)]
Merge remote-tracking branch 'origin/Mirio/mapoptions'
Mirio [Mon, 3 Jun 2013 20:33:44 +0000 (22:33 +0200)]
drain
Mirio [Mon, 3 Jun 2013 20:30:44 +0000 (22:30 +0200)]
.map.options files + mapinfo update for stormkeep
Samual Lenks [Mon, 3 Jun 2013 20:08:15 +0000 (16:08 -0400)]
Merge remote-tracking branch 'origin/Mirio/silentsiege'
Samual Lenks [Mon, 3 Jun 2013 17:45:04 +0000 (13:45 -0400)]
Merge remote-tracking branch 'origin/Mirio/stormkeep'
Samual Lenks [Mon, 3 Jun 2013 17:23:24 +0000 (13:23 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningman'
Samual Lenks [Mon, 3 Jun 2013 17:22:45 +0000 (13:22 -0400)]
Merge remote-tracking branch 'origin/Mirio/glowplant'
Samual Lenks [Mon, 3 Jun 2013 17:22:14 +0000 (13:22 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningmanctf'
Samual Lenks [Mon, 3 Jun 2013 17:20:37 +0000 (13:20 -0400)]
Merge remote-tracking branch 'origin/Mirio/drain'
Samual Lenks [Mon, 3 Jun 2013 17:19:37 +0000 (13:19 -0400)]
Keepaway stays on Afterslime :P
Samual Lenks [Mon, 3 Jun 2013 17:18:56 +0000 (13:18 -0400)]
Merge remote-tracking branch 'origin/Mirio/afterslime'
Mirio [Mon, 3 Jun 2013 17:13:44 +0000 (19:13 +0200)]
Remove target from info_autoscreenshot, fix typo 'capture' -> 'captured'
Samual Lenks [Mon, 3 Jun 2013 16:47:53 +0000 (12:47 -0400)]
Merge remote-tracking branch 'origin/master' into Mirio/silentsiege
Samual Lenks [Mon, 3 Jun 2013 16:46:44 +0000 (12:46 -0400)]
Replace space-elevator map image
Mirio [Mon, 3 Jun 2013 16:46:25 +0000 (18:46 +0200)]
Author name
Samual Lenks [Mon, 3 Jun 2013 16:44:21 +0000 (12:44 -0400)]
Merge remote-tracking branch 'origin/matthiaskrgr/space-elevator_autoSC_ent'
Samual Lenks [Mon, 3 Jun 2013 16:28:56 +0000 (12:28 -0400)]
Merge remote-tracking branch 'origin/matthiaskrgr/map_descs'
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
Mirio [Sun, 2 Jun 2013 21:36:21 +0000 (23:36 +0200)]
domination entities message added
Matthias Krüger [Sun, 2 Jun 2013 21:33:29 +0000 (23:33 +0200)]
maps: fuse: mapdescription "Winner 2012" -> "Winner of 2012"
Mirio [Sun, 2 Jun 2013 21:31:40 +0000 (23:31 +0200)]
Fix previous leak
Matthias Krüger [Sun, 2 Jun 2013 21:29:12 +0000 (23:29 +0200)]
maps: g23 : shorten mapdescription.
Matthias Krüger [Sun, 2 Jun 2013 21:19:15 +0000 (23:19 +0200)]
Merge branch 'master' into matthiaskrgr/space-elevator_autoSC_ent
Mirio [Sun, 2 Jun 2013 17:47:53 +0000 (19:47 +0200)]
Fix previous leak
Mirio [Sun, 2 Jun 2013 17:46:14 +0000 (19:46 +0200)]
Fix previous leak
Mirio [Sun, 2 Jun 2013 17:45:17 +0000 (19:45 +0200)]
Fix previous leak
Rudolf Polzer [Sun, 2 Jun 2013 17:21:18 +0000 (19:21 +0200)]
try fixing silentsiege by importing the gspawn1 model from final_rage
Matthias Krüger [Sun, 2 Jun 2013 13:23:52 +0000 (15:23 +0200)]
map: space-elevator: change first auto-screenshot entity.
Mirio [Sun, 2 Jun 2013 00:33:24 +0000 (02:33 +0200)]
Fix DOM entities and barrel area
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
Mirio [Sun, 2 Jun 2013 00:19:24 +0000 (02:19 +0200)]
Fix DOM entities
Mirio [Sun, 2 Jun 2013 00:17:03 +0000 (02:17 +0200)]
Fix DOM entities, fix ticket 1593
Mirio [Sun, 2 Jun 2013 00:15:11 +0000 (02:15 +0200)]
Barrels go boom, fix DOM entities
Mirio [Sun, 2 Jun 2013 00:13:49 +0000 (02:13 +0200)]
Barrels go boom
Mirio [Sun, 2 Jun 2013 00:12:00 +0000 (02:12 +0200)]
Fix ticket 1582
Samual Lenks [Fri, 31 May 2013 16:32:32 +0000 (12:32 -0400)]
Undo cortez's "updates"-- he used a broken/old version of the map...
Samual Lenks [Fri, 31 May 2013 15:58:32 +0000 (11:58 -0400)]
Merge remote-tracking branch 'origin/Mirio/campaign'
Samual Lenks [Fri, 31 May 2013 15:58:11 +0000 (11:58 -0400)]
Merge remote-tracking branch 'origin/debugger/glowplant'
Samual Lenks [Fri, 31 May 2013 15:57:41 +0000 (11:57 -0400)]
Merge remote-tracking branch 'origin/debugger/dance'
Samual Lenks [Fri, 31 May 2013 15:56:59 +0000 (11:56 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege'
Samual Lenks [Fri, 31 May 2013 15:56:16 +0000 (11:56 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/drain_update'
Rudolf Polzer [Sat, 25 May 2013 15:29:03 +0000 (17:29 +0200)]
Squashed commit of the following:
commit
03aaedf468c72ad7fdaebc7333804d3ff0f28ec2
Author: Debugger <pyngot@hotmail.com>
Date: Sat May 25 12:11:13 2013 +0200
remove DOM support for 0.7 as there is some buggy stuff on the map. TODO: add this in further versions
commit
569d6da1e1536d041ad668e1a260089b9577c6ac
Author: Debugger <pyngot@hotmail.com>
Date: Sun May 19 15:33:14 2013 +0200
some models hinted, texture bugs fixed and a few entities fixed
commit
aa2fc424673c8891b9f9b6148988fc27449e2942
Author: Debugger <pyngot@hotmail.com>
Date: Sun May 19 14:02:12 2013 +0200
fix broken stuff. another cdtrack, dom_controlpoints replaced
commit
65fb68eedada4e8e1181b32b4b7f7356174d6bb2
Author: Debugger <pyngot@hotmail.com>
Date: Sat May 18 20:13:29 2013 +0200
texture fixes, a lot of ambient sounds, model fixes
commit
1bfed51d05192cc3507f10370ed5bccbb675d7db
Author: Debugger <pyngot@hotmail.com>
Date: Sat May 18 18:24:33 2013 +0200
solid models, finally. Entity cleanup and DOM controlpoints added
commit
e66e34eacaf47fe4a8ba311e95c03c7991bffb79
Author: Debugger <pyngot@hotmail.com>
Date: Sat May 18 17:47:27 2013 +0200
clipping & barrels
commit
97baee8aa89adad43d329d4e36e388ad6837503a
Author: Debugger <pyngot@hotmail.com>
Date: Fri May 17 15:25:57 2013 +0200
some models clipped
Mirio [Thu, 23 May 2013 13:51:17 +0000 (15:51 +0200)]
Fix typos
Mirio [Thu, 23 May 2013 13:37:22 +0000 (15:37 +0200)]
updated campaign
kuniuthefrogg [Mon, 20 May 2013 15:57:52 +0000 (17:57 +0200)]
add a botclip in a water where bots get stuck.
kuniuthefrogg [Mon, 20 May 2013 15:47:44 +0000 (17:47 +0200)]
add domination support
Debugger [Sat, 18 May 2013 14:08:04 +0000 (16:08 +0200)]
more textures for the exomorphx texture set; extended it in order to make it easier to use
Debugger [Sat, 18 May 2013 13:54:28 +0000 (15:54 +0200)]
extended shader file for additional textures