xonotic/xonotic-maps.pk3dir.git
5 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

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

5 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

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

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

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

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

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

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

5 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

5 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

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

5 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

5 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

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

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

5 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

5 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

5 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

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

5 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

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

5 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

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

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

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

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

6 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

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

6 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

6 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

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

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

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

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

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

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

6 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

6 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

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

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

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

6 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

6 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

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

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

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

7 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

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

7 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

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

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

7 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

7 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

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

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

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

7 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

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

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

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

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

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

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

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

7 years agoMerge remote-tracking branch 'origin/matthiaskrgr/glassx'
Rudolf Polzer [Sat, 13 Jul 2013 09:18:25 +0000 (11:18 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/glassx'

7 years agoMerge remote-tracking branch 'origin/matthiaskrgr/courtfun'
Rudolf Polzer [Sat, 13 Jul 2013 09:17:22 +0000 (11:17 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/courtfun'

7 years agoMerge remote-tracking branch 'origin/matthiaskrgr/exploding_barrels'
Rudolf Polzer [Sat, 13 Jul 2013 09:17:12 +0000 (11:17 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/exploding_barrels'

7 years agoMerge remote-tracking branch 'origin/matthiaskrgr/surfaceparm_alphashadow'
Rudolf Polzer [Sat, 13 Jul 2013 09:17:05 +0000 (11:17 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/surfaceparm_alphashadow'

7 years agoMerge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents'
Rudolf Polzer [Sat, 13 Jul 2013 09:16:56 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents'

7 years agoMerge remote-tracking branch 'origin/matthiaskrgr/respawnrings_texture'
Rudolf Polzer [Sat, 13 Jul 2013 09:16:47 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/respawnrings_texture'

7 years agoMerge remote-tracking branch 'origin/matthiaskrgr/exx_floor-wrn01-red'
Rudolf Polzer [Sat, 13 Jul 2013 09:16:06 +0000 (11:16 +0200)]
Merge remote-tracking branch 'origin/matthiaskrgr/exx_floor-wrn01-red'

7 years agosilentsiege: remove red respawnrings.
Matthias Krüger [Sat, 13 Jul 2013 05:58:59 +0000 (07:58 +0200)]
silentsiege: remove red respawnrings.

7 years agodrain: remove blue respawnrings.
Matthias Krüger [Sat, 13 Jul 2013 05:49:12 +0000 (07:49 +0200)]
drain: remove blue respawnrings.

7 years agodance: remove red and blue respawnrings.
Matthias Krüger [Sat, 13 Jul 2013 05:41:48 +0000 (07:41 +0200)]
dance: remove red and blue respawnrings.

7 years agorespawnrings: ensure backwards compatibility for maps which are still using the old...
Matthias Krüger [Sat, 13 Jul 2013 05:29:04 +0000 (07:29 +0200)]
respawnrings: ensure backwards compatibility for maps which are still using the old ones, rename the new respawnrings to -highres.

7 years agoadd shaderfile.
Matthias Krüger [Wed, 10 Jul 2013 19:29:57 +0000 (21:29 +0200)]
add shaderfile.

7 years agoadd hexglass texture by Morphed.
Matthias Krüger [Wed, 10 Jul 2013 19:00:39 +0000 (21:00 +0200)]
add hexglass texture by Morphed.

7 years agoupdate item spawnring shader file.
Matthias Krüger [Wed, 10 Jul 2013 17:46:56 +0000 (19:46 +0200)]
update item spawnring shader file.

7 years agonew high-res respawnring textures
Matthias Krüger [Wed, 10 Jul 2013 17:44:40 +0000 (19:44 +0200)]
new high-res respawnring textures

for color in red blue yellow green black purple white ; do ;                                                                                                                                                                                                     matthias@t400 00
  convert -size 1024x1024 xc:transparent -fill transparent -stroke ${color} -strokewidth 15 \
          -draw "circle 512,512 512,30" respawnring-${color}.png
done

7 years agoMerge commit '145caec5a836be05bfd091f175605bed237516e3'
Rudolf Polzer [Mon, 8 Jul 2013 09:56:30 +0000 (11:56 +0200)]
Merge commit '145caec5a836be05bfd091f175605bed237516e3'

7 years agoMerge branch 'master' into matthiaskrgr/surfaceparm_alphashadow
Matthias Krüger [Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)]
Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow

7 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

7 years agoshaders: add surfaceparm alphashadow to following textures:
Matthias Krüger [Sun, 23 Jun 2013 16:14:15 +0000 (18:14 +0200)]
shaders: add surfaceparm alphashadow to following textures:
ex2x/base-chainlink
map_space-elevator/hangwires
textures/phillipk2x/floor-pk02_floor07
textures/phillipk2x/floor-pk02_floor10
textures/phillipk2x/floor-pk02_floor13a
textures/phillipk2x/floor-pk02_floor13b

7 years agotextures: exx/floor_wrn01-red: properly recolor from floor/floor_wrn01-blue.tga,...
Matthias Krüger [Thu, 20 Jun 2013 19:35:44 +0000 (21:35 +0200)]
textures: exx/floor_wrn01-red: properly recolor from floor/floor_wrn01-blue.tga, make it so that the original grey stripes do not become red.

7 years agomap: courtfun: remove some hlac related setting.
Matthias Krüger [Wed, 19 Jun 2013 18:34:04 +0000 (20:34 +0200)]
map: courtfun: remove some hlac related setting.

7 years agomap: abyss: add autoscreenshot entities.
Matthias Krüger [Sun, 9 Jun 2013 18:15:58 +0000 (20:15 +0200)]
map: abyss: add autoscreenshot entities.

7 years agomaps: darkzone, lightspeed, runningmanctf, bump map versions due to explodable barrels.
Matthias Krüger [Sun, 9 Jun 2013 08:20:14 +0000 (10:20 +0200)]
maps: darkzone, lightspeed, runningmanctf, bump map versions due to explodable barrels.

7 years agomap: darkzone: make 7 barrels explosive.
Matthias Krüger [Sat, 8 Jun 2013 20:13:28 +0000 (22:13 +0200)]
map: darkzone: make 7 barrels explosive.

7 years agomaps: lightspeed: make one barrel explodable.
Matthias Krüger [Sat, 8 Jun 2013 20:08:10 +0000 (22:08 +0200)]
maps: lightspeed: make one barrel explodable.

7 years agomap: runningmanctf: make two more barrels explodable.
Matthias Krüger [Sat, 8 Jun 2013 19:49:37 +0000 (21:49 +0200)]
map: runningmanctf: make two more barrels explodable.

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

7 years agomap: solarium: remove textures/map_solarium/waterfall/water2.tga and use textures...
Matthias Krüger [Sat, 8 Jun 2013 15:32:48 +0000 (17:32 +0200)]
map: solarium: remove textures/map_solarium/waterfall/water2.tga and use textures/liquids_water/water2.tga instead
since the files are the same.

7 years agomap: lightspeed: remove textures/map_lightspeed/light/light_1.tga and models/map_ligh...
Matthias Krüger [Sat, 8 Jun 2013 15:30:55 +0000 (17:30 +0200)]
map: lightspeed: remove textures/map_lightspeed/light/light_1.tga and models/map_lightspeed/vines/vines01.tga and use
textures/ex2x/light/light_1.tga and models/desertfactory/textures/misc/vines01.tga since the files are the same.

7 years agomaps: glowplant: remove textures/map_glowplant/gradient_light.tga and use textures...
Matthias Krüger [Sat, 8 Jun 2013 15:29:35 +0000 (17:29 +0200)]
maps: glowplant: remove textures/map_glowplant/gradient_light.tga and use textures/effects_lightning/gradient_white.tga instead
since the files are the same.

7 years agomaps: g-23: remove textures/map_g-23/conveyorbelt/conveyorbelt.tga and use textures...
Matthias Krüger [Sat, 8 Jun 2013 15:28:35 +0000 (17:28 +0200)]
maps: g-23: remove textures/map_g-23/conveyorbelt/conveyorbelt.tga and use textures/exx/trim/trim_psimple05.tga instead
since the files are the same.

7 years agomaps: darkzone: remove textures/map_darkzone/light/dz_bluelight.tga and use textures...
Matthias Krüger [Sat, 8 Jun 2013 15:26:29 +0000 (17:26 +0200)]
maps: darkzone: remove textures/map_darkzone/light/dz_bluelight.tga and use textures/ex2x/light/light_beam_blue.tga instead
since the files are the same.

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

7 years agofix damn lost wrong texture
kuniuthefrogg [Tue, 4 Jun 2013 20:29:23 +0000 (22:29 +0200)]
fix damn lost wrong texture

7 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