]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
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 agomore textures for the exomorphx texture set; extended it in order to make it easier...
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

11 years agoextended shader file for additional textures
Debugger [Sat, 18 May 2013 13:54:28 +0000 (15:54 +0200)]
extended shader file for additional textures

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 agoUpdate entities.ent with new monster names
Mario [Wed, 15 May 2013 04:44:50 +0000 (14:44 +1000)]
Update entities.ent with new monster names

11 years agoMerge branch 'master' into Mario/monsters
Mario [Wed, 15 May 2013 04:37:18 +0000 (14:37 +1000)]
Merge branch 'master' into Mario/monsters

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.

11 years agonew map pic, fix some reported bugs
kuniuthefrogg [Mon, 6 May 2013 20:19:19 +0000 (22:19 +0200)]
new map pic, fix some reported bugs

11 years agoit seems map leaked last time. Weird, but let's hope it won't leak now.
kuniuthefrogg [Mon, 6 May 2013 15:44:53 +0000 (17:44 +0200)]
it seems map leaked last time. Weird, but let's hope it won't leak now.

11 years agoedited mapinfo
Debugger [Sun, 5 May 2013 13:56:25 +0000 (15:56 +0200)]
edited mapinfo

11 years agoanother texture bug fixed
Debugger [Tue, 30 Apr 2013 18:41:52 +0000 (20:41 +0200)]
another texture bug fixed

11 years agobreakable barrels added and texture bugs fixed
Debugger [Tue, 30 Apr 2013 18:38:35 +0000 (20:38 +0200)]
breakable barrels added and texture bugs fixed

11 years agofinally, fixed
Debugger [Tue, 30 Apr 2013 18:22:39 +0000 (20:22 +0200)]
finally, fixed

11 years agoremoved mg ammo
Debugger [Tue, 30 Apr 2013 18:11:31 +0000 (20:11 +0200)]
removed mg ammo

11 years agoreplaced the mapimage by a new one
Debugger [Tue, 30 Apr 2013 18:06:49 +0000 (20:06 +0200)]
replaced the mapimage by a new one

11 years agomore clipping, texture alignments, minor architecture changes, add one more spawnpoint
kuniuthefrogg [Mon, 29 Apr 2013 20:34:27 +0000 (22:34 +0200)]
more clipping, texture alignments, minor architecture changes, add one more spawnpoint

11 years agoremoved some unnoticeabel water: small reflexion bug fixed
Debugger [Sun, 28 Apr 2013 15:18:35 +0000 (17:18 +0200)]
removed some unnoticeabel water: small reflexion bug fixed

11 years agoAdd tower defense entities
Mario [Tue, 23 Apr 2013 14:53:11 +0000 (00:53 +1000)]
Add tower defense entities

11 years agoAdd all monsters to netradiant entity list
Mario [Tue, 23 Apr 2013 14:30:50 +0000 (00:30 +1000)]
Add all monsters to netradiant entity list

11 years agoSilent Siege - duel/ffa map by Justin
kuniuthefrogg [Mon, 22 Apr 2013 22:08:39 +0000 (00:08 +0200)]
Silent Siege - duel/ffa map by Justin

11 years agosmall revision
kuniuthefrogg [Mon, 22 Apr 2013 21:25:28 +0000 (23:25 +0200)]
small revision

11 years agoanother try
kuniuthefrogg [Mon, 22 Apr 2013 21:19:49 +0000 (23:19 +0200)]
another try

11 years agoMerge remote-tracking branch 'origin/Mirio/xoylent'
Samual Lenks [Mon, 22 Apr 2013 21:18:20 +0000 (17:18 -0400)]
Merge remote-tracking branch 'origin/Mirio/xoylent'

11 years agoMerge remote-tracking branch 'origin/Mirio/red-planet'
Samual Lenks [Mon, 22 Apr 2013 21:15:00 +0000 (17:15 -0400)]
Merge remote-tracking branch 'origin/Mirio/red-planet'

11 years agoRemove team modes from Runningman, move TDM to RunningmanCTF
Samual Lenks [Mon, 22 Apr 2013 21:07:06 +0000 (17:07 -0400)]
Remove team modes from Runningman, move TDM to RunningmanCTF

11 years agoMerge remote-tracking branch 'origin/Mirio/runningmanctf'
Samual Lenks [Mon, 22 Apr 2013 21:04:57 +0000 (17:04 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningmanctf'

11 years agoMerge remote-tracking branch 'origin/Mirio/runningman'
Samual Lenks [Mon, 22 Apr 2013 21:03:50 +0000 (17:03 -0400)]
Merge remote-tracking branch 'origin/Mirio/runningman'

11 years agonew mappic, more playerclip, fix spawnpoint error
kuniuthefrogg [Mon, 22 Apr 2013 20:35:35 +0000 (22:35 +0200)]
new mappic, more playerclip, fix spawnpoint error

11 years agonew mappic, updated mapinfo, final polishing of item layout and barels and clips...
kuniuthefrogg [Mon, 22 Apr 2013 17:46:05 +0000 (19:46 +0200)]
new mappic, updated mapinfo, final polishing of item layout and barels and clips and such

11 years agoSet hidden, mapinfo, screenshot
Mirio [Mon, 22 Apr 2013 11:56:21 +0000 (13:56 +0200)]
Set hidden, mapinfo, screenshot

11 years agoMap cleanup, mapinfo, screenshot
Mirio [Mon, 22 Apr 2013 11:54:42 +0000 (13:54 +0200)]
Map cleanup, mapinfo, screenshot

11 years agoFix trigger_hurt, add screenshot
Mirio [Sun, 21 Apr 2013 20:05:40 +0000 (22:05 +0200)]
Fix trigger_hurt, add screenshot

11 years agoexplodeable barrels added
Debugger [Sun, 21 Apr 2013 19:44:27 +0000 (21:44 +0200)]
explodeable barrels added

11 years agoBarrels go boom
Mirio [Sun, 21 Apr 2013 19:42:23 +0000 (21:42 +0200)]
Barrels go boom

11 years agoautomatically turn on reflexions for clients
Debugger [Sun, 21 Apr 2013 19:24:17 +0000 (21:24 +0200)]
automatically turn on reflexions for clients

11 years agofixed some visual errors plus mapinfo/infoscreenshots
Debugger [Sun, 21 Apr 2013 19:19:39 +0000 (21:19 +0200)]
fixed some visual errors plus mapinfo/infoscreenshots

11 years agoBarrels go boom
Mirio [Sun, 21 Apr 2013 19:19:10 +0000 (21:19 +0200)]
Barrels go boom

11 years agomapinfo, autoscreenshots fixed
Debugger [Sun, 21 Apr 2013 16:52:34 +0000 (18:52 +0200)]
mapinfo, autoscreenshots fixed

11 years agofixed some console output bug
Debugger [Sun, 21 Apr 2013 16:10:09 +0000 (18:10 +0200)]
fixed some console output bug