]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
9 years agoOptimizing the map so compiling vis part would be (hopefully) easier.
Łukasz Polek [Tue, 10 Feb 2015 18:15:17 +0000 (19:15 +0100)]
Optimizing the map so compiling vis part would be (hopefully) easier.

9 years agoFix lighting issues, first attempts to break the texturing monotony.
kuniuthefrogg [Fri, 6 Feb 2015 15:15:39 +0000 (16:15 +0100)]
Fix lighting issues, first attempts to break the texturing monotony.

9 years agoMerge remote-tracking branch 'origin/master' into kuniuthefrogg/apace
Mario [Fri, 23 Jan 2015 23:22:40 +0000 (10:22 +1100)]
Merge remote-tracking branch 'origin/master' into kuniuthefrogg/apace

9 years agoHide lightspeed (assuming a yes on polls, can be reverted if things somehow turn...
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)

9 years agoMerge remote-tracking branch 'origin/Mirio/silentsiege'
Mario [Wed, 21 Jan 2015 16:04:24 +0000 (03:04 +1100)]
Merge remote-tracking branch 'origin/Mirio/silentsiege'

9 years agoFix campaign level 6 :) xonotic-v0.8.0
Rudolf Polzer [Fri, 9 Jan 2015 15:13:44 +0000 (07:13 -0800)]
Fix campaign level 6 :)

9 years agoHide abyss (decision on whether to unhide or remove it will be voted upon after release)
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)

9 years agoForce water on abyss, for warpzones
Mario [Fri, 9 Jan 2015 07:43:29 +0000 (18:43 +1100)]
Force water on abyss, for warpzones

9 years agoFix an edge that makes you stuck in the wall/air
Mirio [Sun, 4 Jan 2015 16:20:36 +0000 (17:20 +0100)]
Fix an edge that makes you stuck in the wall/air

9 years agoKill old link
Mario [Sat, 20 Dec 2014 06:21:18 +0000 (17:21 +1100)]
Kill old link

9 years agoMerge branch 'Mario/cubemaps_revert_new'
Mario [Sat, 20 Dec 2014 06:18:11 +0000 (17:18 +1100)]
Merge branch 'Mario/cubemaps_revert_new'

9 years agoRestore exx to pre-merge
Mario [Sat, 20 Dec 2014 06:17:29 +0000 (17:17 +1100)]
Restore exx to pre-merge

9 years agoRemove reflect textures
Mario [Sat, 20 Dec 2014 06:17:08 +0000 (17:17 +1100)]
Remove reflect textures

9 years agoThe beginning of the end
Mario [Sat, 20 Dec 2014 06:16:25 +0000 (17:16 +1100)]
The beginning of the end

9 years agoMerge branch 'mirceakitsune/world_cubemaps'
Mario [Sat, 13 Dec 2014 05:47:15 +0000 (16:47 +1100)]
Merge branch 'mirceakitsune/world_cubemaps'

9 years agoMerge branch 'master' into mirceakitsune/world_cubemaps
Mario [Sat, 13 Dec 2014 05:44:23 +0000 (16:44 +1100)]
Merge branch 'master' into mirceakitsune/world_cubemaps

9 years agoMake implosion use the new track
Mario [Sat, 13 Dec 2014 01:23:35 +0000 (12:23 +1100)]
Make implosion use the new track

9 years agoSome minor revisions to the campaign, to match new weapons
Mario [Sat, 13 Dec 2014 01:11:27 +0000 (12:11 +1100)]
Some minor revisions to the campaign, to match new weapons

9 years agoMerge remote-tracking branch 'origin/Mirio/credits'
Mario [Sat, 13 Dec 2014 01:06:13 +0000 (12:06 +1100)]
Merge remote-tracking branch 'origin/Mirio/credits'

9 years agoHad to fix race level
Mirio [Fri, 12 Dec 2014 00:27:33 +0000 (01:27 +0100)]
Had to fix race level

9 years agoMerge remote-tracking branch 'origin/Mirio/campaign'
Mario [Thu, 11 Dec 2014 23:42:19 +0000 (10:42 +1100)]
Merge remote-tracking branch 'origin/Mirio/campaign'

9 years agoAdd domination support to implosion mapinfo
Mario [Thu, 11 Dec 2014 23:36:48 +0000 (10:36 +1100)]
Add domination support to implosion mapinfo

9 years agoChange rc level into cts
Mirio [Thu, 11 Dec 2014 23:23:15 +0000 (00:23 +0100)]
Change rc level into cts

9 years agoUpdate campaign with levels for the new maps
Mirio [Thu, 11 Dec 2014 22:48:51 +0000 (23:48 +0100)]
Update campaign with levels for the new maps

9 years agoThat should be the last of the badly named models
Mario [Fri, 5 Dec 2014 01:06:13 +0000 (12:06 +1100)]
That should be the last of the badly named models

9 years agoAlso fix red base terrain model
Mario [Fri, 5 Dec 2014 00:35:34 +0000 (11:35 +1100)]
Also fix red base terrain model

9 years agoMost probably fix catharsis
Mario [Fri, 5 Dec 2014 00:07:49 +0000 (11:07 +1100)]
Most probably fix catharsis

9 years agoMerge branch 'itsme/vorix'
Mario [Tue, 2 Dec 2014 02:35:03 +0000 (13:35 +1100)]
Merge branch 'itsme/vorix'

9 years agoMerge branch 'master' into itsme/vorix
Mario [Tue, 2 Dec 2014 02:33:49 +0000 (13:33 +1100)]
Merge branch 'master' into itsme/vorix

9 years agoMerge branch 'Mirio/implosion'
Mario [Tue, 2 Dec 2014 02:32:00 +0000 (13:32 +1100)]
Merge branch 'Mirio/implosion'

9 years agoMerge branch 'master' into Mirio/implosion
Mario [Tue, 2 Dec 2014 02:31:42 +0000 (13:31 +1100)]
Merge branch 'master' into Mirio/implosion

9 years agoMerge branch 'Mario/catharsis'
Mario [Tue, 2 Dec 2014 02:29:39 +0000 (13:29 +1100)]
Merge branch 'Mario/catharsis'

9 years agoMerge branch 'master' into Mario/catharsis
Mario [Tue, 2 Dec 2014 02:28:30 +0000 (13:28 +1100)]
Merge branch 'master' into Mario/catharsis

9 years agoAdd some fixes by Mirio
Mario [Sun, 30 Nov 2014 16:22:46 +0000 (03:22 +1100)]
Add some fixes by Mirio

9 years agoFix tile
Mario [Sat, 29 Nov 2014 15:07:15 +0000 (02:07 +1100)]
Fix tile

9 years agoFix "tit"itle, remove forced r_water from mapinfo (no warpzones)
Mario [Sat, 29 Nov 2014 15:06:20 +0000 (02:06 +1100)]
Fix "tit"itle, remove forced r_water from mapinfo (no warpzones)

9 years agoMake some minor brushes details
Mario [Sat, 29 Nov 2014 14:27:26 +0000 (01:27 +1100)]
Make some minor brushes details

9 years agoMerge branch 'master' into itsme/vorix
Mario [Sat, 29 Nov 2014 13:17:18 +0000 (00:17 +1100)]
Merge branch 'master' into itsme/vorix

9 years agoMerge branch 'nyov/instagib-rename'
Mario [Thu, 27 Nov 2014 05:38:22 +0000 (16:38 +1100)]
Merge branch 'nyov/instagib-rename'

9 years agoMerge branch 'master' into mirceakitsune/world_cubemaps
Mario [Thu, 27 Nov 2014 03:58:59 +0000 (14:58 +1100)]
Merge branch 'master' into mirceakitsune/world_cubemaps

9 years agoMerge branch 'Mirio/drain'
Mario [Thu, 27 Nov 2014 03:56:36 +0000 (14:56 +1100)]
Merge branch 'Mirio/drain'

9 years agoMerge branch 'master' into Mirio/drain
Mario [Thu, 27 Nov 2014 03:56:15 +0000 (14:56 +1100)]
Merge branch 'master' into Mirio/drain

9 years agoMerge branch 'Mirio/implosion' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3di...
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

9 years agoMake jumppad triggers bigger
Mirio [Thu, 27 Nov 2014 00:09:18 +0000 (01:09 +0100)]
Make jumppad triggers bigger

9 years agoMerge branch 'master' into mirio/implosion
Mirio [Thu, 27 Nov 2014 00:02:50 +0000 (01:02 +0100)]
Merge branch 'master' into mirio/implosion

9 years agoAdd implosion to shader list and add implosion rtlights
Mario [Wed, 26 Nov 2014 23:47:33 +0000 (10:47 +1100)]
Add implosion to shader list and add implosion rtlights

9 years agoMerge branch 'Mario/monsters'
Rudolf Polzer [Wed, 26 Nov 2014 10:43:59 +0000 (11:43 +0100)]
Merge branch 'Mario/monsters'

9 years agoFix issue #89
Mirio [Fri, 21 Nov 2014 15:40:48 +0000 (16:40 +0100)]
Fix issue #89

9 years agoCatharsis, prepared for merge by Mirio
Mario [Fri, 21 Nov 2014 14:40:43 +0000 (01:40 +1100)]
Catharsis, prepared for merge by Mirio

9 years agoAdd clips, lights from Marios minsta version. Add DOM controlpoints and support
Mirio [Tue, 18 Nov 2014 16:17:17 +0000 (17:17 +0100)]
Add clips, lights from Marios minsta version. Add DOM controlpoints and support

9 years agoMerge branch 'master' into mirio/implosion
Mirio [Tue, 18 Nov 2014 15:50:58 +0000 (16:50 +0100)]
Merge branch 'master' into mirio/implosion

10 years agoRenaming MinstaGib mode to InstaGib, as per xonvote (#31)
nyov [Sun, 16 Nov 2014 04:17:34 +0000 (04:17 +0000)]
Renaming MinstaGib mode to InstaGib, as per xonvote (#31)

10 years agoMerge branch 'master' into Mario/monsters 2/head
Mario [Sun, 16 Nov 2014 00:20:36 +0000 (11:20 +1100)]
Merge branch 'master' into Mario/monsters

10 years agoMerge branch 'Mirio/map_updates'
Mario [Thu, 13 Nov 2014 17:24:21 +0000 (04:24 +1100)]
Merge branch 'Mirio/map_updates'

10 years agoIgnore Mac OS X .DS_Store files
Mario [Thu, 13 Nov 2014 17:19:48 +0000 (04:19 +1100)]
Ignore Mac OS X .DS_Store files

10 years agoMap options
Mirio [Thu, 31 Jul 2014 19:20:32 +0000 (21:20 +0200)]
Map options

10 years agoPush Implosion
Mirio [Thu, 31 Jul 2014 18:58:53 +0000 (20:58 +0200)]
Push Implosion

10 years agoquad and ammo
packer [Thu, 19 Jun 2014 16:01:06 +0000 (18:01 +0200)]
quad and ammo

10 years agoupdate models
packer [Thu, 19 Jun 2014 08:50:54 +0000 (10:50 +0200)]
update models
remove some barrels
some other stuff

10 years agoFix the leak
Mirio [Wed, 18 Jun 2014 13:43:55 +0000 (15:43 +0200)]
Fix the leak

10 years agoexplosive barrels
packer [Tue, 17 Jun 2014 17:06:13 +0000 (19:06 +0200)]
explosive barrels

10 years agoFix Bugs #1679, #1705, #1708
Mirio [Tue, 17 Jun 2014 14:43:28 +0000 (16:43 +0200)]
Fix Bugs #1679, #1705, #1708

10 years agoFix Bug #1242 and make all barells consistent for Courtfun, Dance, Darkzone, Drain...
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

10 years agoAdd Feature #1856
Mirio [Tue, 17 Jun 2014 14:23:14 +0000 (16:23 +0200)]
Add Feature #1856

10 years agoMerge branch 'master' into mirio/map_updates
Mirio [Tue, 17 Jun 2014 14:22:04 +0000 (16:22 +0200)]
Merge branch 'master' into mirio/map_updates

10 years agoMerge remote-tracking branch 'origin/Mario/red-planet_nuke'
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

10 years agoFix Bug #1807
Mirio [Tue, 17 Jun 2014 13:45:51 +0000 (15:45 +0200)]
Fix Bug #1807

10 years agoFix Bug #1990
Mirio [Tue, 17 Jun 2014 13:10:59 +0000 (15:10 +0200)]
Fix Bug #1990

10 years agoFix Bug #1914
Mirio [Tue, 17 Jun 2014 12:54:04 +0000 (14:54 +0200)]
Fix Bug #1914

10 years agoRemove red-planet
Mario [Sun, 15 Jun 2014 01:28:07 +0000 (11:28 +1000)]
Remove red-planet

10 years agoEven more waypoints. Connectivity seems ok, but there are some obviously unreachable...
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?

10 years agoWho did they silentsiege waypoints? They were HORRIBLE.
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.

10 years agoMerge remote-tracking branch 'origin/Mario/arena_nuke'
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

10 years agoRemove arena from a few missed mapinfos
Mario [Sun, 24 Nov 2013 04:40:48 +0000 (15:40 +1100)]
Remove arena from a few missed mapinfos

10 years agoRemove arena from mapinfos
Mario [Sun, 24 Nov 2013 04:37:50 +0000 (15:37 +1100)]
Remove arena from mapinfos

11 years agoRemove old monsters
Mario [Sat, 12 Oct 2013 18:54:28 +0000 (05:54 +1100)]
Remove old monsters

11 years agoMerge remote-tracking branch 'origin/divVerent/xoylent_sRGB'
Rudolf Polzer [Fri, 11 Oct 2013 14:57:26 +0000 (16:57 +0200)]
Merge remote-tracking branch 'origin/divVerent/xoylent_sRGB'

11 years agoMerge remote-tracking branch 'origin/Mirio/mapinfos', fixes #1764
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

11 years agoDecrease Xoylent_sRGB skybox brightness, adjust its color slightly
Samual Lenks [Mon, 23 Sep 2013 19:56:34 +0000 (15:56 -0400)]
Decrease Xoylent_sRGB skybox brightness, adjust its color slightly

11 years agoTry EVEN less skylight.
Rudolf Polzer [Sun, 22 Sep 2013 18:43:53 +0000 (20:43 +0200)]
Try EVEN less skylight.

11 years agoless light
Rudolf Polzer [Sun, 22 Sep 2013 08:04:40 +0000 (10:04 +0200)]
less light

11 years agodo compile
Rudolf Polzer [Sat, 21 Sep 2013 11:18:20 +0000 (13:18 +0200)]
do compile

11 years agolet's try slightly less skylight
Rudolf Polzer [Fri, 20 Sep 2013 13:12:33 +0000 (15:12 +0200)]
let's try slightly less skylight

11 years agoxoylent: remove nosRGB flag
Matthias Krüger [Fri, 20 Sep 2013 07:36:06 +0000 (09:36 +0200)]
xoylent: remove nosRGB flag

11 years agoChange miniboss spawnflag value to original Quake value
Mario [Sun, 1 Sep 2013 19:29:11 +0000 (05:29 +1000)]
Change miniboss spawnflag value to original Quake value

11 years agoAdd more spawnflags
Mario [Sun, 1 Sep 2013 17:42:46 +0000 (03:42 +1000)]
Add more spawnflags

11 years agoFix spawnflags & remove netname
Mario [Sun, 1 Sep 2013 17:33:47 +0000 (03:33 +1000)]
Fix spawnflags & remove netname

11 years agoUpdate spawnflags & remove tower defense entities
Mario [Sun, 1 Sep 2013 17:16:54 +0000 (03:16 +1000)]
Update spawnflags & remove tower defense entities

11 years agoMerge branch 'master' into Mario/monsters
Mario [Sun, 1 Sep 2013 17:09:20 +0000 (03:09 +1000)]
Merge branch 'master' into Mario/monsters

11 years agoRemove rune from two mapinfos
Mirio [Thu, 29 Aug 2013 23:14:32 +0000 (01:14 +0200)]
Remove rune from two mapinfos

11 years agoRevert "moving 2 textures to 'base'"
Rudolf Polzer [Wed, 14 Aug 2013 08:33:16 +0000 (10:33 +0200)]
Revert "moving 2 textures to 'base'"

This reverts commit baf1d487a81f92b8452e38efdb0a18ca6a1bb211.

11 years agoRevert "renaming a few textures" as that breaks existing maps.
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.

11 years agoMerge remote-tracking branch 'origin/debugger/exomorphx', fixing #1751
Rudolf Polzer [Wed, 14 Aug 2013 08:17:06 +0000 (10:17 +0200)]
Merge remote-tracking branch 'origin/debugger/exomorphx', fixing #1751

11 years agomoving 2 textures to 'base'
Debugger [Mon, 12 Aug 2013 15:41:18 +0000 (17:41 +0200)]
moving 2 textures to 'base'

11 years agorenaming a few textures
Debugger [Sun, 11 Aug 2013 15:10:03 +0000 (17:10 +0200)]
renaming a few textures

11 years agoRevert "shaders: glassx: remove dpnoshadow flag."
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.

11 years agoshaders: glassx: remove dpnoshadow flag.
Matthias Krüger [Mon, 5 Aug 2013 17:33:44 +0000 (19:33 +0200)]
shaders: glassx: remove dpnoshadow flag.

11 years agoremoving empty lines
Debugger [Mon, 5 Aug 2013 15:30:19 +0000 (17:30 +0200)]
removing empty lines

11 years agotextures: glassx: enable culling.
Matthias Krüger [Tue, 23 Jul 2013 20:49:24 +0000 (22:49 +0200)]
textures: glassx: enable culling.

11 years agofix glassx shader
Rudolf Polzer [Sat, 13 Jul 2013 09:21:53 +0000 (11:21 +0200)]
fix glassx shader