]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
Mario [Fri, 23 Jan 2015 23:25:41 +0000 (10:25 +1100)]
Merge remote-tracking branch 'origin/master' into debugger/go
Mario [Wed, 21 Jan 2015 16:12:42 +0000 (03:12 +1100)]
Hide lightspeed (assuming a yes on polls, can be reverted if things somehow turn around)
Mario [Wed, 21 Jan 2015 16:04:24 +0000 (03:04 +1100)]
Merge remote-tracking branch 'origin/Mirio/silentsiege'
Rudolf Polzer [Fri, 9 Jan 2015 15:13:44 +0000 (07:13 -0800)]
Fix campaign level 6 :)
Mario [Fri, 9 Jan 2015 07:46:53 +0000 (18:46 +1100)]
Hide abyss (decision on whether to unhide or remove it will be voted upon after release)
Mario [Fri, 9 Jan 2015 07:43:29 +0000 (18:43 +1100)]
Force water on abyss, for warpzones
Mirio [Sun, 4 Jan 2015 16:20:36 +0000 (17:20 +0100)]
Fix an edge that makes you stuck in the wall/air
Mario [Sat, 20 Dec 2014 06:21:18 +0000 (17:21 +1100)]
Kill old link
Mario [Sat, 20 Dec 2014 06:18:11 +0000 (17:18 +1100)]
Merge branch 'Mario/cubemaps_revert_new'
Mario [Sat, 20 Dec 2014 06:17:29 +0000 (17:17 +1100)]
Restore exx to pre-merge
Mario [Sat, 20 Dec 2014 06:17:08 +0000 (17:17 +1100)]
Remove reflect textures
Mario [Sat, 20 Dec 2014 06:16:25 +0000 (17:16 +1100)]
The beginning of the end
Mario [Sat, 13 Dec 2014 05:47:15 +0000 (16:47 +1100)]
Merge branch 'mirceakitsune/world_cubemaps'
Mario [Sat, 13 Dec 2014 05:44:23 +0000 (16:44 +1100)]
Merge branch 'master' into mirceakitsune/world_cubemaps
Mario [Sat, 13 Dec 2014 01:23:35 +0000 (12:23 +1100)]
Make implosion use the new track
Mario [Sat, 13 Dec 2014 01:11:27 +0000 (12:11 +1100)]
Some minor revisions to the campaign, to match new weapons
Mario [Sat, 13 Dec 2014 01:06:13 +0000 (12:06 +1100)]
Merge remote-tracking branch 'origin/Mirio/credits'
Mirio [Fri, 12 Dec 2014 00:27:33 +0000 (01:27 +0100)]
Had to fix race level
Mario [Thu, 11 Dec 2014 23:42:19 +0000 (10:42 +1100)]
Merge remote-tracking branch 'origin/Mirio/campaign'
Mario [Thu, 11 Dec 2014 23:36:48 +0000 (10:36 +1100)]
Add domination support to implosion mapinfo
Mirio [Thu, 11 Dec 2014 23:23:15 +0000 (00:23 +0100)]
Change rc level into cts
Mirio [Thu, 11 Dec 2014 22:48:51 +0000 (23:48 +0100)]
Update campaign with levels for the new maps
Mario [Fri, 5 Dec 2014 01:06:13 +0000 (12:06 +1100)]
That should be the last of the badly named models
Mario [Fri, 5 Dec 2014 00:35:34 +0000 (11:35 +1100)]
Also fix red base terrain model
Mario [Fri, 5 Dec 2014 00:07:49 +0000 (11:07 +1100)]
Most probably fix catharsis
Mario [Thu, 4 Dec 2014 23:37:44 +0000 (10:37 +1100)]
Merge remote-tracking branch 'origin/master' into debugger/go
Conflicts:
scripts/shaderlist.txt
Debugger [Wed, 3 Dec 2014 17:32:25 +0000 (18:32 +0100)]
a few lights fixed
Debugger [Wed, 3 Dec 2014 17:18:23 +0000 (18:18 +0100)]
adapted nebulae with less brightness, fixed some lights
Mario [Tue, 2 Dec 2014 02:35:03 +0000 (13:35 +1100)]
Merge branch 'itsme/vorix'
Mario [Tue, 2 Dec 2014 02:33:49 +0000 (13:33 +1100)]
Merge branch 'master' into itsme/vorix
Mario [Tue, 2 Dec 2014 02:32:00 +0000 (13:32 +1100)]
Merge branch 'Mirio/implosion'
Mario [Tue, 2 Dec 2014 02:31:42 +0000 (13:31 +1100)]
Merge branch 'master' into Mirio/implosion
Mario [Tue, 2 Dec 2014 02:29:39 +0000 (13:29 +1100)]
Merge branch 'Mario/catharsis'
Mario [Tue, 2 Dec 2014 02:28:30 +0000 (13:28 +1100)]
Merge branch 'master' into Mario/catharsis
Mario [Sun, 30 Nov 2014 16:22:46 +0000 (03:22 +1100)]
Add some fixes by Mirio
Mario [Sat, 29 Nov 2014 15:07:15 +0000 (02:07 +1100)]
Fix tile
Mario [Sat, 29 Nov 2014 15:06:20 +0000 (02:06 +1100)]
Fix "tit"itle, remove forced r_water from mapinfo (no warpzones)
Mario [Sat, 29 Nov 2014 14:27:26 +0000 (01:27 +1100)]
Make some minor brushes details
Mario [Sat, 29 Nov 2014 13:17:18 +0000 (00:17 +1100)]
Merge branch 'master' into itsme/vorix
Mario [Thu, 27 Nov 2014 05:38:22 +0000 (16:38 +1100)]
Merge branch 'nyov/instagib-rename'
Mario [Thu, 27 Nov 2014 03:58:59 +0000 (14:58 +1100)]
Merge branch 'master' into mirceakitsune/world_cubemaps
Mario [Thu, 27 Nov 2014 03:56:36 +0000 (14:56 +1100)]
Merge branch 'Mirio/drain'
Mario [Thu, 27 Nov 2014 03:56:15 +0000 (14:56 +1100)]
Merge branch 'master' into Mirio/drain
Mirio [Thu, 27 Nov 2014 00:11:33 +0000 (01:11 +0100)]
Merge branch 'Mirio/implosion' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into mirio/implosion
Mirio [Thu, 27 Nov 2014 00:09:18 +0000 (01:09 +0100)]
Make jumppad triggers bigger
Mirio [Thu, 27 Nov 2014 00:02:50 +0000 (01:02 +0100)]
Merge branch 'master' into mirio/implosion
Mario [Wed, 26 Nov 2014 23:47:33 +0000 (10:47 +1100)]
Add implosion to shader list and add implosion rtlights
Rudolf Polzer [Wed, 26 Nov 2014 10:43:59 +0000 (11:43 +0100)]
Merge branch 'Mario/monsters'
Mirio [Fri, 21 Nov 2014 15:40:48 +0000 (16:40 +0100)]
Fix issue #89
Mario [Fri, 21 Nov 2014 14:40:43 +0000 (01:40 +1100)]
Catharsis, prepared for merge by Mirio
Mirio [Tue, 18 Nov 2014 16:17:17 +0000 (17:17 +0100)]
Add clips, lights from Marios minsta version. Add DOM controlpoints and support
Mirio [Tue, 18 Nov 2014 15:50:58 +0000 (16:50 +0100)]
Merge branch 'master' into mirio/implosion
nyov [Sun, 16 Nov 2014 04:17:34 +0000 (04:17 +0000)]
Renaming MinstaGib mode to InstaGib, as per xonvote (#31)
Mario [Sun, 16 Nov 2014 00:20:36 +0000 (11:20 +1100)]
Merge branch 'master' into Mario/monsters
Mario [Thu, 13 Nov 2014 17:24:21 +0000 (04:24 +1100)]
Merge branch 'Mirio/map_updates'
Mario [Thu, 13 Nov 2014 17:19:48 +0000 (04:19 +1100)]
Ignore Mac OS X .DS_Store files
Mirio [Thu, 31 Jul 2014 19:20:32 +0000 (21:20 +0200)]
Map options
Mirio [Thu, 31 Jul 2014 18:58:53 +0000 (20:58 +0200)]
Push Implosion
Debugger [Tue, 29 Jul 2014 12:48:05 +0000 (14:48 +0200)]
better map image
Debugger [Mon, 28 Jul 2014 10:23:24 +0000 (12:23 +0200)]
fixed some lights, fixed the jumppad effects
Debugger [Sat, 26 Jul 2014 12:47:50 +0000 (14:47 +0200)]
detailing brushes for better performance
Debugger [Sun, 20 Jul 2014 21:07:54 +0000 (23:07 +0200)]
fixing some minor bugs, jumppadfx textures dont work
Debugger [Sun, 20 Jul 2014 10:13:00 +0000 (12:13 +0200)]
finished texturing, fixed entities, cloned sides. v0.1
Debugger [Sat, 19 Jul 2014 21:43:31 +0000 (23:43 +0200)]
textured the mid, addded details, lots of structure fixes, some glowy pipe textures added
Debugger [Sat, 19 Jul 2014 16:42:26 +0000 (18:42 +0200)]
fix the stairs, add some lights, some details added at the bottom
Debugger [Fri, 18 Jul 2014 13:26:26 +0000 (15:26 +0200)]
autoscreenshot entities, fixed jumppads and borders, some colors, lights, started to work on the tower-top
Debugger [Thu, 17 Jul 2014 14:32:17 +0000 (16:32 +0200)]
textured half of the base, fix lower grounds, fix entities
Debugger [Wed, 16 Jul 2014 17:13:43 +0000 (19:13 +0200)]
jumppad textures added, started to texture the map, fix entities and jumppads
Debugger [Wed, 16 Jul 2014 10:50:50 +0000 (12:50 +0200)]
the needed sources to work on from
packer [Thu, 19 Jun 2014 16:01:06 +0000 (18:01 +0200)]
quad and ammo
packer [Thu, 19 Jun 2014 08:50:54 +0000 (10:50 +0200)]
update models
remove some barrels
some other stuff
Mirio [Wed, 18 Jun 2014 13:43:55 +0000 (15:43 +0200)]
Fix the leak
packer [Tue, 17 Jun 2014 17:06:13 +0000 (19:06 +0200)]
explosive barrels
Mirio [Tue, 17 Jun 2014 14:43:28 +0000 (16:43 +0200)]
Fix Bugs #1679, #1705, #1708
Mirio [Tue, 17 Jun 2014 14:26:12 +0000 (16:26 +0200)]
Fix Bug #1242 and make all barells consistent for Courtfun, Dance, Darkzone, Drain, Oilrig, Runningman, Runningmanctf and Solarium
Mirio [Tue, 17 Jun 2014 14:23:14 +0000 (16:23 +0200)]
Add Feature #1856
Mirio [Tue, 17 Jun 2014 14:22:04 +0000 (16:22 +0200)]
Merge branch 'master' into mirio/map_updates
Rudolf Polzer [Tue, 17 Jun 2014 14:01:36 +0000 (16:01 +0200)]
Merge remote-tracking branch 'origin/Mario/red-planet_nuke'
* origin/Mario/red-planet_nuke:
Remove red-planet
Mirio [Tue, 17 Jun 2014 13:45:51 +0000 (15:45 +0200)]
Fix Bug #1807
Mirio [Tue, 17 Jun 2014 13:10:59 +0000 (15:10 +0200)]
Fix Bug #1990
Mirio [Tue, 17 Jun 2014 12:54:04 +0000 (14:54 +0200)]
Fix Bug #1914
Mario [Sun, 15 Jun 2014 01:28:07 +0000 (11:28 +1000)]
Remove red-planet
Rudolf Polzer [Wed, 15 Jan 2014 13:52:43 +0000 (14:52 +0100)]
Even more waypoints. Connectivity seems ok, but there are some obviously unreachable waypoints (like way too high above floor). Who put them there?
Rudolf Polzer [Wed, 15 Jan 2014 13:43:22 +0000 (14:43 +0100)]
Who did they silentsiege waypoints? They were HORRIBLE.
Quick fix: ran the autowaypointer while playing the campaign level.
Should do for now.
Samual Lenks [Sun, 24 Nov 2013 18:59:47 +0000 (13:59 -0500)]
Merge remote-tracking branch 'origin/Mario/arena_nuke'
# By Mario
# Via Mario
* origin/Mario/arena_nuke:
Remove arena from a few missed mapinfos
Remove arena from mapinfos
Mario [Sun, 24 Nov 2013 04:40:48 +0000 (15:40 +1100)]
Remove arena from a few missed mapinfos
Mario [Sun, 24 Nov 2013 04:37:50 +0000 (15:37 +1100)]
Remove arena from mapinfos
Mario [Sat, 12 Oct 2013 18:54:28 +0000 (05:54 +1100)]
Remove old monsters
Rudolf Polzer [Fri, 11 Oct 2013 14:57:26 +0000 (16:57 +0200)]
Merge remote-tracking branch 'origin/divVerent/xoylent_sRGB'
Rudolf Polzer [Fri, 11 Oct 2013 14:48:06 +0000 (16:48 +0200)]
Merge remote-tracking branch 'origin/Mirio/mapinfos', fixes #1764
* origin/Mirio/mapinfos:
Remove rune from two mapinfos
Samual Lenks [Mon, 23 Sep 2013 19:56:34 +0000 (15:56 -0400)]
Decrease Xoylent_sRGB skybox brightness, adjust its color slightly
Rudolf Polzer [Sun, 22 Sep 2013 18:43:53 +0000 (20:43 +0200)]
Try EVEN less skylight.
Rudolf Polzer [Sun, 22 Sep 2013 08:04:40 +0000 (10:04 +0200)]
less light
Rudolf Polzer [Sat, 21 Sep 2013 11:18:20 +0000 (13:18 +0200)]
do compile
Rudolf Polzer [Fri, 20 Sep 2013 13:12:33 +0000 (15:12 +0200)]
let's try slightly less skylight
Matthias Krüger [Fri, 20 Sep 2013 07:36:06 +0000 (09:36 +0200)]
xoylent: remove nosRGB flag
Mario [Sun, 1 Sep 2013 19:29:11 +0000 (05:29 +1000)]
Change miniboss spawnflag value to original Quake value
Mario [Sun, 1 Sep 2013 17:42:46 +0000 (03:42 +1000)]
Add more spawnflags
Mario [Sun, 1 Sep 2013 17:33:47 +0000 (03:33 +1000)]
Fix spawnflags & remove netname
Mario [Sun, 1 Sep 2013 17:16:54 +0000 (03:16 +1000)]
Update spawnflags & remove tower defense entities
projects / xonotic / xonotic-maps.pk3dir.git / log