]>
de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/log
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 [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
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
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'
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.
Samual Lenks [Sun, 24 Nov 2013 18:59:47 +0000 (13:59 -0500)]
Merge remote-tracking branch 'origin/Mario/arena_nuke'
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
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
Mario [Sun, 1 Sep 2013 17:09:20 +0000 (03:09 +1000)]
Merge branch 'master' into Mario/monsters
Mirio [Thu, 29 Aug 2013 23:14:32 +0000 (01:14 +0200)]
Remove rune from two mapinfos
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.
projects / xonotic / xonotic-maps.pk3dir.git / log