]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
Mirio [Sat, 31 Dec 2016 12:30:27 +0000 (13:30 +0100)]
You will compile dance in 2016 wont you
kuniuthefrogg [Sat, 31 Dec 2016 10:32:02 +0000 (11:32 +0100)]
bugfix
Mirio [Thu, 29 Dec 2016 17:55:01 +0000 (18:55 +0100)]
Compile maps please
Mirio [Wed, 28 Dec 2016 19:58:15 +0000 (20:58 +0100)]
Update to new entity names and fix stuff
kuniuthefrogg [Tue, 27 Dec 2016 19:18:19 +0000 (20:18 +0100)]
small texture fix
kuniuthefrogg [Tue, 27 Dec 2016 15:19:48 +0000 (16:19 +0100)]
fix spawnpoints, add more glorious artwork by Mirio, new bot waypoints
Mirio [Tue, 27 Dec 2016 13:33:41 +0000 (14:33 +0100)]
Update versioning
Mirio [Tue, 27 Dec 2016 13:27:37 +0000 (14:27 +0100)]
Update maps with new entity maps
Mirio [Tue, 27 Dec 2016 13:19:12 +0000 (13:19 +0000)]
Merge branch 'DefaultUser/entity_def' into 'master'
Mirio [Sun, 25 Dec 2016 14:16:25 +0000 (15:16 +0100)]
Make a model solid, make stairs at nex less floaty, trims, clips, remove weapon decals
Mirio [Sun, 25 Dec 2016 13:44:29 +0000 (14:44 +0100)]
Merge branch 'master' into Justin/erbium
Mirio [Sun, 25 Dec 2016 13:42:41 +0000 (14:42 +0100)]
Merge branch 'master' into Mirio/dance
Mario [Sun, 25 Dec 2016 11:20:30 +0000 (21:20 +1000)]
Remove slowdown field from dance, poll passed
Mirio [Sun, 27 Nov 2016 16:18:39 +0000 (17:18 +0100)]
Add nopicmip to shader file
Mirio [Sat, 26 Nov 2016 22:29:09 +0000 (23:29 +0100)]
Update texture, add new texture
kuniuthefrogg [Sat, 26 Nov 2016 22:19:42 +0000 (23:19 +0100)]
scale 0.9
kuniuthefrogg [Sat, 26 Nov 2016 16:34:04 +0000 (17:34 +0100)]
more details, first try to scale it down a bit
Mirio [Wed, 23 Nov 2016 15:48:29 +0000 (16:48 +0100)]
Fix shader file
Mirio [Wed, 23 Nov 2016 15:47:03 +0000 (16:47 +0100)]
Merge branch 'master' into kuniuthefrogg/boil
kuniuthefrogg [Wed, 23 Nov 2016 11:15:01 +0000 (12:15 +0100)]
use Mirios txtures, bugfix
Mirio [Tue, 22 Nov 2016 22:59:37 +0000 (23:59 +0100)]
Add textures + shader
kuniuthefrogg [Tue, 22 Nov 2016 17:52:51 +0000 (18:52 +0100)]
more clipping, more lights, item placement updates
Mirio [Fri, 18 Nov 2016 16:54:24 +0000 (17:54 +0100)]
Fix bot number of KH level
kuniuthefrogg [Thu, 17 Nov 2016 19:07:25 +0000 (20:07 +0100)]
new DM map
Mirio [Mon, 7 Nov 2016 16:04:32 +0000 (17:04 +0100)]
Fix generator message
Mirio [Mon, 7 Nov 2016 11:35:10 +0000 (12:35 +0100)]
Fix teleporters, remove nex
Mirio [Mon, 7 Nov 2016 11:26:05 +0000 (12:26 +0100)]
Merge branch 'master' into Mirio/darkzone
Mirio [Mon, 7 Nov 2016 08:50:06 +0000 (09:50 +0100)]
Fix barrels
Mirio [Mon, 7 Nov 2016 08:15:40 +0000 (09:15 +0100)]
Break the glass, #121
Mirio [Mon, 7 Nov 2016 07:24:25 +0000 (08:24 +0100)]
Fix #122
Freddy [Sat, 5 Nov 2016 23:03:34 +0000 (00:03 +0100)]
Rename item_health_large to item_health_big
Freddy [Fri, 4 Nov 2016 17:19:37 +0000 (18:19 +0100)]
Rename item_armor_large to item_armor_mega
Mirio [Thu, 27 Oct 2016 14:57:38 +0000 (16:57 +0200)]
Revert making models solid
Mirio [Thu, 27 Oct 2016 00:00:58 +0000 (02:00 +0200)]
Eventually push map file...
Mirio [Wed, 26 Oct 2016 23:59:45 +0000 (01:59 +0200)]
Test different trim texture and solid models
Mirio [Wed, 26 Oct 2016 23:33:52 +0000 (01:33 +0200)]
Fix a texture error
Mirio [Wed, 26 Oct 2016 23:22:13 +0000 (01:22 +0200)]
Merge branch 'master' into justin/erbium
Mirio [Wed, 26 Oct 2016 22:38:09 +0000 (00:38 +0200)]
Merge branch 'maddin/map-warfare-updates'
Mirio [Wed, 26 Oct 2016 22:37:10 +0000 (00:37 +0200)]
Merge branch 'master' into maddin/map-warfare-updates
Mirio [Wed, 26 Oct 2016 22:36:09 +0000 (22:36 +0000)]
Merge branch 'packer/vorix' into 'master'
Mirio [Wed, 26 Oct 2016 22:35:07 +0000 (00:35 +0200)]
Merge branch 'master' into packer/vorix
Mirio [Wed, 26 Oct 2016 01:09:34 +0000 (03:09 +0200)]
Fix stuff reported by Spike. Add visuals to warpzone. Use traack Nanite
Mirio [Wed, 26 Oct 2016 00:35:25 +0000 (02:35 +0200)]
Merge branch 'master' into justin/erbium
Mirio [Tue, 25 Oct 2016 22:47:25 +0000 (00:47 +0200)]
Remove gametypefilter and fix z-fight
Mirio [Tue, 25 Oct 2016 22:37:47 +0000 (00:37 +0200)]
Merge branch 'master' into Mirio/geoplanetary
Mirio [Tue, 25 Oct 2016 22:34:40 +0000 (00:34 +0200)]
Merge branch 'master' into packer/vorix
Mirio [Tue, 25 Oct 2016 22:32:48 +0000 (00:32 +0200)]
Merge branch 'master' into Mirio/darkzone
Mirio [Tue, 25 Oct 2016 22:29:23 +0000 (00:29 +0200)]
Merge branch 'master' into maddin/map-warfare-updates
Mirio [Tue, 25 Oct 2016 22:28:49 +0000 (00:28 +0200)]
Merge branch 'master' into Mirio/fuse
Mirio [Tue, 25 Oct 2016 22:27:58 +0000 (00:27 +0200)]
Merge branch 'master' into Mirio/silentsiege
Mirio [Tue, 25 Oct 2016 22:21:15 +0000 (00:21 +0200)]
Merge branch 'master' into justin/erbium
Mirio [Thu, 20 Oct 2016 22:23:14 +0000 (22:23 +0000)]
Merge branch 'stormkeep-caulk-fix' into 'master'
stormkeep: fix visible caulk
Fixes visible caulk near 25 armor.
See merge request !55
t0uYK8Ne [Tue, 18 Oct 2016 04:41:13 +0000 (21:41 -0700)]
stormkeep: fix visible caulk
Mirio [Sat, 15 Oct 2016 02:31:12 +0000 (04:31 +0200)]
Merge branch 'master' into Justin/erbium
Mario [Tue, 16 Aug 2016 01:11:58 +0000 (11:11 +1000)]
Merge remote-tracking branch 'origin/matthiaskrgr/implosion_tubefix'
Mario [Mon, 8 Aug 2016 12:19:32 +0000 (22:19 +1000)]
Use .wav instead of .ogg in warfare map file, should fix precache warnings
Maddin [Fri, 29 Jul 2016 17:40:43 +0000 (19:40 +0200)]
Remove "surfaceparm nomarks" from weapclip so decals (e.g. from exploding
Matthias Krüger [Wed, 27 Jul 2016 14:36:25 +0000 (16:36 +0200)]
implosion: fix tubes not connected to brush (near map middle)
Mario [Wed, 13 Jul 2016 06:48:37 +0000 (16:48 +1000)]
Fix a minor texture issue on dance
Mario [Mon, 11 Jul 2016 14:29:06 +0000 (00:29 +1000)]
Remove non-team modes from dance (servers that wish to use this map in such modes can use their own mapinfo file), part of poll #227
Mario [Sat, 25 Jun 2016 21:30:19 +0000 (07:30 +1000)]
Fix Atelier speakers pointing to a non-existent sound file
Mario [Sun, 12 Jun 2016 08:15:25 +0000 (18:15 +1000)]
Correct spelling mistake in some commented out cvars
packer [Wed, 8 Jun 2016 18:32:19 +0000 (20:32 +0200)]
fix lava spot
Maddin [Thu, 2 Jun 2016 14:19:13 +0000 (16:19 +0200)]
fixed ceiling beneath MG, more clipping, some bot donotenter adjustments,
Mirio [Fri, 15 Apr 2016 19:18:41 +0000 (21:18 +0200)]
Fix texture alignment
Mirio [Wed, 6 Apr 2016 17:32:51 +0000 (17:32 +0000)]
Merge branch 'matthiaskrgr/afterslime_windowfix' into 'master'
afterslime: fix window when viewing from inside slime (area near mortar)
before:
front: (ok) 
back before 
(you can see through the sides which are solid viewed from the front)
back fixed: 
See merge request !51
Mirio [Sun, 27 Mar 2016 16:11:26 +0000 (18:11 +0200)]
Lots of clips and fixes
Matthias Krüger [Fri, 25 Mar 2016 02:09:17 +0000 (03:09 +0100)]
afterslime: fix window when viewing from inside slime (area near mortar)
Mirio [Thu, 24 Mar 2016 14:52:51 +0000 (15:52 +0100)]
Revert stuff
Mirio [Wed, 23 Mar 2016 08:46:22 +0000 (09:46 +0100)]
Clips clips clip
Mirio [Wed, 9 Mar 2016 17:12:50 +0000 (18:12 +0100)]
Merge branch 'master' into justin/erbium
Mirio [Wed, 9 Mar 2016 17:11:39 +0000 (18:11 +0100)]
Merge branch 'master' into mirio/darkzone
Mirio [Wed, 9 Mar 2016 17:11:13 +0000 (18:11 +0100)]
Merge branch 'master' into mirio/fuse
Mirio [Wed, 9 Mar 2016 17:10:17 +0000 (18:10 +0100)]
Merge branch 'master' into mirio/geoplanetary
packer [Sun, 21 Feb 2016 18:48:04 +0000 (19:48 +0100)]
Merge remote-tracking branch 'origin/master' into packer/vorix
packer [Sun, 21 Feb 2016 12:46:31 +0000 (13:46 +0100)]
fix boxes
Rudolf Polzer [Wed, 27 Jan 2016 18:54:37 +0000 (13:54 -0500)]
WTF, this texture had red and green channels swapped. Fixed.
Rudolf Polzer [Wed, 27 Jan 2016 18:33:27 +0000 (13:33 -0500)]
Fix some Y channels.
packer [Fri, 22 Jan 2016 12:01:09 +0000 (13:01 +0100)]
update location names
Mirio [Wed, 20 Jan 2016 09:10:25 +0000 (10:10 +0100)]
Fix missing texture
Mirio [Wed, 20 Jan 2016 09:00:38 +0000 (10:00 +0100)]
Merge branch 'master' into Justin/erbium
Mirio [Wed, 20 Jan 2016 08:58:50 +0000 (09:58 +0100)]
Merge branch 'master' into Mirio/darkzone
Mirio [Wed, 20 Jan 2016 08:56:03 +0000 (09:56 +0100)]
Merge branch 'master' into Mirio/geoplanetary
Mirio [Fri, 15 Jan 2016 15:42:20 +0000 (16:42 +0100)]
Merge branch 'master' into mirio/fuse
Rudolf Polzer [Fri, 15 Jan 2016 02:39:28 +0000 (03:39 +0100)]
Fix most of solarpanel.
Rudolf Polzer [Thu, 14 Jan 2016 22:05:57 +0000 (23:05 +0100)]
Update shaderlist.
Rudolf Polzer [Thu, 14 Jan 2016 22:05:02 +0000 (23:05 +0100)]
Fix catharsis and crystals shader (make them conform to shader-audit conventions)
Rudolf Polzer [Thu, 14 Jan 2016 21:57:29 +0000 (22:57 +0100)]
Fix blendfunc auditing for texture blending shaders.
Rudolf Polzer [Thu, 14 Jan 2016 02:47:34 +0000 (03:47 +0100)]
minor fixes
Mirio [Mon, 11 Jan 2016 03:42:53 +0000 (04:42 +0100)]
Weapon clips, so projectiles do not disappear
Mirio [Mon, 11 Jan 2016 03:34:36 +0000 (04:34 +0100)]
Enlarge teleporter trigger so you won't get stuck anymore
Mirio [Fri, 1 Jan 2016 16:46:12 +0000 (17:46 +0100)]
Move box slightly to allow trickjump
Mirio [Fri, 1 Jan 2016 16:43:02 +0000 (17:43 +0100)]
Clip places which you should not reach, clip doorways. Texture some parts that were caulk before
Mirio [Thu, 31 Dec 2015 00:12:22 +0000 (01:12 +0100)]
Fix warpzone sound volumes
Mario [Wed, 30 Dec 2015 21:32:53 +0000 (07:32 +1000)]
Add a note to misc_gamemodel preferring use of misc_clientmodel
Mirio [Wed, 28 Oct 2015 10:17:44 +0000 (11:17 +0100)]
More cleanup
Mirio [Wed, 28 Oct 2015 08:35:57 +0000 (09:35 +0100)]
Merge branch 'Mirio/darkzone' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into mirio/darkzone
Mirio [Tue, 27 Oct 2015 10:13:43 +0000 (11:13 +0100)]
Merge branch 'master' into Justin/erbium
Mirio [Tue, 27 Oct 2015 10:11:57 +0000 (11:11 +0100)]
map picture
Mirio [Tue, 27 Oct 2015 10:09:00 +0000 (11:09 +0100)]
Merge branch 'master' into mirio/geoplanetary
projects / xonotic / xonotic-maps.pk3dir.git / log