]>
de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/log
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
remove some barrels
some other stuff
Mirio [Thu, 19 Jun 2014 01:21:34 +0000 (03:21 +0200)]
Merge branch 'master' into mirio/glowplant
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
Mirio [Tue, 17 Jun 2014 12:38:57 +0000 (14:38 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into mirio/glowplant
Mario [Sun, 15 Jun 2014 01:28:07 +0000 (11:28 +1000)]
Remove red-planet
maddin [Sat, 1 Feb 2014 18:43:39 +0000 (19:43 +0100)]
Warfare V4. See the forum for changes...
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
maddin [Fri, 22 Nov 2013 19:02:39 +0000 (20:02 +0100)]
readded the custom sky shader and commented out the editorimage line (sky) in the shaderfile due to some strange reason... maybe it helps
maddin [Thu, 21 Nov 2013 21:24:54 +0000 (22:24 +0100)]
change the sky shader to skies/exosystem
maddin [Thu, 21 Nov 2013 17:43:20 +0000 (18:43 +0100)]
added autoscreenshot entity, removed lightmapsamplesize parm in worldspawn, removed null model (because we don´t need it), replaced explosive barrels, using standard compile options now
maddin [Thu, 21 Nov 2013 16:34:54 +0000 (17:34 +0100)]
hopefully fix failure of map compile by reducing samplesize and lightmapsize
maddin [Thu, 21 Nov 2013 16:28:15 +0000 (17:28 +0100)]
initial commit for the map warfare. includes all necessary files
Matthias Krüger [Tue, 12 Nov 2013 07:07:43 +0000 (08:07 +0100)]
Merge branch 'master' into matthiaskrgr/dance
Mario [Sat, 12 Oct 2013 18:54:28 +0000 (05:54 +1100)]
Remove old monsters
Matthias Krüger [Fri, 11 Oct 2013 15:41:52 +0000 (17:41 +0200)]
Merge branch 'master' into matthiaskrgr/hudsetup
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
Matthias Krüger [Wed, 25 Sep 2013 22:06:03 +0000 (00:06 +0200)]
map: hudsetup: if I did everything right the map should not show up in any menu now.
Matthias Krüger [Tue, 24 Sep 2013 16:37:25 +0000 (18:37 +0200)]
dance: make the outer lights pink.
No, acutally I didn't but I decreased the yellowishness a bit.
Matthias Krüger [Tue, 24 Sep 2013 14:24:21 +0000 (16:24 +0200)]
dance: make outer lights a bit yellowishly.
Samual Lenks [Mon, 23 Sep 2013 19:56:34 +0000 (15:56 -0400)]
Decrease Xoylent_sRGB skybox brightness, adjust its color slightly
Matthias Krüger [Mon, 23 Sep 2013 15:09:32 +0000 (17:09 +0200)]
dance: increase light strength of light inside the map from 175 to 240 as requested by CuBe0wL.
Matthias Krüger [Mon, 23 Sep 2013 07:17:57 +0000 (09:17 +0200)]
dance: decrease light strength from 400 to 175. Let's see how this turns out.
Rudolf Polzer [Sun, 22 Sep 2013 18:43:53 +0000 (20:43 +0200)]
Try EVEN less skylight.
Matthias Krüger [Sun, 22 Sep 2013 11:43:16 +0000 (13:43 +0200)]
map: dance: attempt to more realistic lights.
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
Matthias Krüger [Fri, 20 Sep 2013 14:04:09 +0000 (16:04 +0200)]
map: dance: make the lights outside on the map (above the blocks going along the map) basically the same as the lights inside the map on the ceiling.
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
Matthias Krüger [Sat, 14 Sep 2013 09:14:55 +0000 (11:14 +0200)]
hudsetup: decaulk a bit to prevent minimap "artifacts".
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
Matthias Krüger [Thu, 29 Aug 2013 12:17:03 +0000 (14:17 +0200)]
hudsetup: increase samplesize from 6 to 4.
Matthias Krüger [Tue, 20 Aug 2013 11:57:36 +0000 (13:57 +0200)]
hudsetup: add mappic.
Matthias Krüger [Tue, 20 Aug 2013 11:35:10 +0000 (13:35 +0200)]
hudsetup: add autoscreenshot entitie
Matthias Krüger [Tue, 20 Aug 2013 11:13:41 +0000 (13:13 +0200)]
hudsetup: add mapinfo file with new "noautomaplist" flag.
Matthias Krüger [Tue, 20 Aug 2013 11:08:36 +0000 (13:08 +0200)]
hudsetup: add hudsetup.map.options
Matthias Krüger [Tue, 20 Aug 2013 11:07:03 +0000 (13:07 +0200)]
maps: hudsetup: move map down by one directory, remove lightmaps and bsp.
Mirio [Sun, 18 Aug 2013 17:17:00 +0000 (19:17 +0200)]
Move Electro
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
Mirio [Sat, 3 Aug 2013 05:51:35 +0000 (07:51 +0200)]
info_autoscreenshot entities, mappicture, dump trap idea
Mirio [Thu, 1 Aug 2013 00:26:21 +0000 (02:26 +0200)]
Change jumppad models, test lights, test trap
Mirio [Fri, 26 Jul 2013 01:59:02 +0000 (03:59 +0200)]
Swamp Strength, clip clip, add more health, add Electro and Hagar, change jumppad model, test funky sparks
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.
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.
Matthias Krüger [Wed, 10 Jul 2013 19:29:57 +0000 (21:29 +0200)]
add shaderfile.
Matthias Krüger [Wed, 10 Jul 2013 19:00:39 +0000 (21:00 +0200)]
add hexglass texture by Morphed.
Matthias Krüger [Wed, 10 Jul 2013 17:46:56 +0000 (19:46 +0200)]
update item spawnring shader file.
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
itsme [Tue, 9 Jul 2013 15:20:05 +0000 (17:20 +0200)]
fix lava pools
itsme [Tue, 9 Jul 2013 13:55:49 +0000 (15:55 +0200)]
add map preview picture