]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
11 years agoremove playerspawn near warpzone to prevent spawnraping maddin/map-stormkeep
maddin [Mon, 1 Jul 2013 15:33:09 +0000 (17:33 +0200)]
remove playerspawn near warpzone to prevent spawnraping

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

11 years agoBarrels go boom
Mirio [Sun, 2 Jun 2013 00:13:49 +0000 (02:13 +0200)]
Barrels go boom

11 years agoFix ticket 1582
Mirio [Sun, 2 Jun 2013 00:12:00 +0000 (02:12 +0200)]
Fix  ticket 1582

11 years agoUndo cortez's "updates"-- he used a broken/old version of the map...
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...

11 years agoMerge remote-tracking branch 'origin/Mirio/campaign'
Samual Lenks [Fri, 31 May 2013 15:58:32 +0000 (11:58 -0400)]
Merge remote-tracking branch 'origin/Mirio/campaign'

11 years agoMerge remote-tracking branch 'origin/debugger/glowplant'
Samual Lenks [Fri, 31 May 2013 15:58:11 +0000 (11:58 -0400)]
Merge remote-tracking branch 'origin/debugger/glowplant'

11 years agoMerge remote-tracking branch 'origin/debugger/dance'
Samual Lenks [Fri, 31 May 2013 15:57:41 +0000 (11:57 -0400)]
Merge remote-tracking branch 'origin/debugger/dance'

11 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/silentsiege'
Samual Lenks [Fri, 31 May 2013 15:56:59 +0000 (11:56 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege'

11 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/drain_update'
Samual Lenks [Fri, 31 May 2013 15:56:16 +0000 (11:56 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/drain_update'

11 years agoSquashed commit of the following:
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

11 years agoFix typos
Mirio [Thu, 23 May 2013 13:51:17 +0000 (15:51 +0200)]
Fix typos

11 years agoupdated campaign
Mirio [Thu, 23 May 2013 13:37:22 +0000 (15:37 +0200)]
updated campaign

11 years agoadd a botclip in a water where bots get stuck.
kuniuthefrogg [Mon, 20 May 2013 15:57:52 +0000 (17:57 +0200)]
add a botclip in a water where bots get stuck.

11 years agoadd domination support
kuniuthefrogg [Mon, 20 May 2013 15:47:44 +0000 (17:47 +0200)]
add domination support

11 years agofixed some more barrels
Debugger [Fri, 17 May 2013 13:15:01 +0000 (15:15 +0200)]
fixed some more barrels

11 years agomade the second vent working
Debugger [Fri, 17 May 2013 13:08:00 +0000 (15:08 +0200)]
made the second vent working

11 years agolast time compiling failed at vis stage, so i tried to optimize it a bit.
kuniuthefrogg [Thu, 16 May 2013 20:34:08 +0000 (22:34 +0200)]
last time compiling failed at vis stage, so i tried to optimize it a bit.

11 years agofix a barrel inside a teleporter
kuniuthefrogg [Thu, 16 May 2013 19:56:11 +0000 (21:56 +0200)]
fix a barrel inside a teleporter

11 years agoscaling by 0.9
kuniuthefrogg [Tue, 14 May 2013 21:37:56 +0000 (23:37 +0200)]
scaling by 0.9

11 years agoMerge branch 'master' into kuniuthefrogg/silentsiege
kuniuthefrogg [Tue, 14 May 2013 21:34:49 +0000 (23:34 +0200)]
Merge branch 'master' into kuniuthefrogg/silentsiege

11 years agoMerge remote-tracking branch 'origin/fruitiex/runningmanfix'
Samual Lenks [Tue, 14 May 2013 04:55:54 +0000 (00:55 -0400)]
Merge remote-tracking branch 'origin/fruitiex/runningmanfix'

11 years agoMerge remote-tracking branch 'origin/debugger/solarium'
Samual Lenks [Tue, 14 May 2013 04:53:01 +0000 (00:53 -0400)]
Merge remote-tracking branch 'origin/debugger/solarium'

11 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/afterslime'
Samual Lenks [Tue, 14 May 2013 04:52:38 +0000 (00:52 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/afterslime'

11 years agoMerge remote-tracking branch 'origin/Mirio/space-elevator'
Samual Lenks [Tue, 14 May 2013 04:39:17 +0000 (00:39 -0400)]
Merge remote-tracking branch 'origin/Mirio/space-elevator'

11 years agoMerge remote-tracking branch 'origin/debugger/dance'
Samual Lenks [Tue, 14 May 2013 04:29:43 +0000 (00:29 -0400)]
Merge remote-tracking branch 'origin/debugger/dance'

11 years agoMerge remote-tracking branch 'origin/master' into debugger/dance
Samual Lenks [Tue, 14 May 2013 04:24:09 +0000 (00:24 -0400)]
Merge remote-tracking branch 'origin/master' into debugger/dance

11 years agoMerge remote-tracking branch 'origin/master' into debugger/dance
Samual Lenks [Tue, 14 May 2013 04:20:29 +0000 (00:20 -0400)]
Merge remote-tracking branch 'origin/master' into debugger/dance

11 years agoMerge remote-tracking branch 'origin/debugger/oilrig'
Samual Lenks [Tue, 14 May 2013 03:51:25 +0000 (23:51 -0400)]
Merge remote-tracking branch 'origin/debugger/oilrig'

11 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/silentsiege'
Samual Lenks [Tue, 14 May 2013 03:48:26 +0000 (23:48 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege'

11 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/drain_update'
Samual Lenks [Tue, 14 May 2013 03:48:20 +0000 (23:48 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/drain_update'

11 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/fuse_by_cityy'
Samual Lenks [Tue, 14 May 2013 03:38:02 +0000 (23:38 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/fuse_by_cityy'

11 years agoMerge remote-tracking branch 'origin/kuniuthefrogg/abyss'
Samual Lenks [Tue, 14 May 2013 03:36:12 +0000 (23:36 -0400)]
Merge remote-tracking branch 'origin/kuniuthefrogg/abyss'

11 years agoMerge remote-tracking branch 'origin/Mirio/leave_em_behind'
Samual Lenks [Tue, 14 May 2013 03:35:47 +0000 (23:35 -0400)]
Merge remote-tracking branch 'origin/Mirio/leave_em_behind'

11 years agoMerge remote-tracking branch 'origin/samual/cortez-darkzone-updates'
Samual Lenks [Tue, 14 May 2013 03:33:19 +0000 (23:33 -0400)]
Merge remote-tracking branch 'origin/samual/cortez-darkzone-updates'

Conflicts:
maps/darkzone.map
maps/darkzone.map.options

11 years agoMerge remote-tracking branch 'origin/cbrutail/nexballarena_cortez'
Samual Lenks [Tue, 14 May 2013 03:28:04 +0000 (23:28 -0400)]
Merge remote-tracking branch 'origin/cbrutail/nexballarena_cortez'

11 years agoMerge remote-tracking branch 'origin/debugger/glowplant'
Samual Lenks [Tue, 14 May 2013 03:27:41 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/debugger/glowplant'

11 years agoMerge remote-tracking branch 'origin/debugger/newtonian-nightmare'
Samual Lenks [Tue, 14 May 2013 03:27:35 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/debugger/newtonian-nightmare'

11 years agoMerge remote-tracking branch 'origin/debugger/courtfun'
Samual Lenks [Tue, 14 May 2013 03:27:26 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/debugger/courtfun'

11 years agoMerge remote-tracking branch 'origin/Mirio/solarium'
Samual Lenks [Tue, 14 May 2013 03:27:18 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/Mirio/solarium'

11 years agoMerge remote-tracking branch 'origin/Mirio/lightspeed'
Samual Lenks [Tue, 14 May 2013 03:27:13 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/Mirio/lightspeed'

11 years agoMerge remote-tracking branch 'origin/Mirio/techassault'
Samual Lenks [Tue, 14 May 2013 03:27:05 +0000 (23:27 -0400)]
Merge remote-tracking branch 'origin/Mirio/techassault'

11 years agoMerge remote-tracking branch 'origin/Mirio/g-23'
Samual Lenks [Tue, 14 May 2013 03:26:59 +0000 (23:26 -0400)]
Merge remote-tracking branch 'origin/Mirio/g-23'

11 years agoMerge remote-tracking branch 'origin/Mirio/darkzone'
Samual Lenks [Tue, 14 May 2013 03:26:54 +0000 (23:26 -0400)]
Merge remote-tracking branch 'origin/Mirio/darkzone'

11 years agoMerge remote-tracking branch 'origin/Mirio/stormkeep'
Samual Lenks [Tue, 14 May 2013 03:26:47 +0000 (23:26 -0400)]
Merge remote-tracking branch 'origin/Mirio/stormkeep'

11 years agoscale 0.9
kuniuthefrogg [Mon, 13 May 2013 20:18:04 +0000 (22:18 +0200)]
scale 0.9

11 years agosome more bugs reported and fixed.
kuniuthefrogg [Mon, 13 May 2013 16:06:10 +0000 (18:06 +0200)]
some more bugs reported and fixed.

11 years agoAdd some updates to DarkZone by cortez
Samual Lenks [Thu, 9 May 2013 22:31:49 +0000 (18:31 -0400)]
Add some updates to DarkZone by cortez

11 years agoz-fights, some polishing. Should be ok.
kuniuthefrogg [Wed, 8 May 2013 20:12:16 +0000 (22:12 +0200)]
z-fights, some polishing. Should be ok.

11 years agohopefully final bugfix
kuniuthefrogg [Wed, 8 May 2013 15:03:33 +0000 (17:03 +0200)]
hopefully final bugfix

11 years agolittle experiment
kuniuthefrogg [Wed, 8 May 2013 14:40:07 +0000 (16:40 +0200)]
little experiment

11 years agobreakable barrels, textures fixed, way to powerups fixed, entities fixed, clips fixed
Debugger [Wed, 8 May 2013 12:37:15 +0000 (14:37 +0200)]
breakable barrels, textures fixed, way to powerups fixed, entities fixed, clips fixed

11 years agomapimage, mapinfo, tons of texture alignments
Debugger [Wed, 8 May 2013 11:09:54 +0000 (13:09 +0200)]
mapimage, mapinfo, tons of texture alignments

11 years agofresh map picture.
kuniuthefrogg [Tue, 7 May 2013 22:16:49 +0000 (00:16 +0200)]
fresh map picture.

11 years agoMore bugs reported. And fixed.
kuniuthefrogg [Tue, 7 May 2013 22:14:17 +0000 (00:14 +0200)]
More bugs reported. And fixed.

11 years agobugfix
kuniuthefrogg [Tue, 7 May 2013 21:52:10 +0000 (23:52 +0200)]
bugfix

11 years agofix some annoying movement obstacles.
kuniuthefrogg [Mon, 6 May 2013 20:43:02 +0000 (22:43 +0200)]
fix some annoying movement obstacles.