]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
Mirio [Sat, 11 Mar 2017 15:17:38 +0000 (16:17 +0100)]
Merge branch 'master' into Mirio/crystalcave
Mario [Fri, 10 Mar 2017 22:29:22 +0000 (08:29 +1000)]
Fix bad cvar in courtfun mapinfo
Mirio [Fri, 10 Mar 2017 20:41:13 +0000 (21:41 +0100)]
Update campaign
Mirio [Fri, 10 Mar 2017 20:37:03 +0000 (20:37 +0000)]
Merge branch 'Justin/erbium' into 'master'
Justin/erbium
See merge request !30
Mirio [Fri, 10 Mar 2017 20:35:59 +0000 (21:35 +0100)]
Fix conflict
Mirio [Fri, 10 Mar 2017 20:33:52 +0000 (21:33 +0100)]
Merge branch 'master' into Justin/erbium
Mirio [Fri, 10 Mar 2017 20:26:11 +0000 (20:26 +0000)]
Merge branch 'Mirio/geoplanetary' into 'master'
Mirio/geoplanetary
See merge request !67
Mirio [Fri, 10 Mar 2017 20:24:42 +0000 (21:24 +0100)]
Merge branch 'master' into Mirio/geoplanetary
Mirio [Fri, 10 Mar 2017 20:23:30 +0000 (21:23 +0100)]
Update versioning
Mirio [Fri, 10 Mar 2017 20:19:46 +0000 (20:19 +0000)]
Merge branch 't0uYK8Ne/finalrage' into 'master'
t0uYK8Ne/finalrage
See merge request !69
Mirio [Fri, 10 Mar 2017 20:19:03 +0000 (21:19 +0100)]
Merge branch 'master' into t0uYK8Ne/finalrage
Mirio [Fri, 10 Mar 2017 20:16:58 +0000 (21:16 +0100)]
Fix NULL texture
Mirio [Fri, 10 Mar 2017 20:13:36 +0000 (21:13 +0100)]
New mappicture, one last caulk
Mirio [Fri, 10 Mar 2017 20:09:00 +0000 (21:09 +0100)]
Fix autoscreenshot entity
Mirio [Fri, 10 Mar 2017 20:06:57 +0000 (21:06 +0100)]
Clip railings
t0uYK8Ne [Fri, 10 Mar 2017 18:47:39 +0000 (10:47 -0800)]
finalrage: use warpzone backdrop
t0uYK8Ne [Fri, 10 Mar 2017 18:35:51 +0000 (10:35 -0800)]
finalrage: don't draw the sides of the lava
t0uYK8Ne [Fri, 10 Mar 2017 18:26:02 +0000 (10:26 -0800)]
finalrage: add ceiling trim to devastator room
Also some minor brush cleanup.
Mirio [Fri, 10 Mar 2017 13:58:44 +0000 (14:58 +0100)]
Merge branch 'master' into Justin/erbium
Mirio [Fri, 10 Mar 2017 13:58:01 +0000 (14:58 +0100)]
Still found something
Mirio [Fri, 10 Mar 2017 13:06:56 +0000 (14:06 +0100)]
Fix NULL texture error
Mirio [Fri, 10 Mar 2017 00:47:11 +0000 (01:47 +0100)]
Texture fixes
Mirio [Fri, 10 Mar 2017 00:16:21 +0000 (01:16 +0100)]
Merge branch 'master' into Mirio/geoplanetary
Mirio [Fri, 10 Mar 2017 00:15:15 +0000 (00:15 +0000)]
Merge branch 'matthiaskrgr/barrels' into 'master'
maps: catharsis, courtfun, dance, drain, glowplant, oilrig, runningman, runningmanctf, solarium, vorix: unify barrel explosions to more sane values.
See merge request !68
Mirio [Fri, 10 Mar 2017 00:14:29 +0000 (01:14 +0100)]
Update versioning
Matthias Krüger [Thu, 9 Mar 2017 23:18:26 +0000 (00:18 +0100)]
maps: catharsis, courtfun, dance, drain, glowplant, oilrig, runningman, runningmanctf, solarium, vorix: unify barrel explosions to more sane values.
dmg: 25 -> 40
dmg_edge: 25 -> 30
dmg_force: 600 -> 200
dmg_radius: x -> 190
Mirio [Thu, 9 Mar 2017 21:23:47 +0000 (22:23 +0100)]
Fix leak
Mirio [Thu, 9 Mar 2017 18:04:23 +0000 (19:04 +0100)]
Fix things reported by t0
Mirio [Thu, 9 Mar 2017 17:26:02 +0000 (18:26 +0100)]
Hopefully final fixes
Mirio [Wed, 8 Mar 2017 19:36:06 +0000 (20:36 +0100)]
Merge branch 'master' into Mirio/geoplanetary
Mirio [Wed, 8 Mar 2017 19:36:00 +0000 (20:36 +0100)]
Mappicture
Mirio [Wed, 8 Mar 2017 17:49:42 +0000 (18:49 +0100)]
Fix description
Mirio [Wed, 8 Mar 2017 17:47:21 +0000 (18:47 +0100)]
aaaaand more fixes
Mirio [Wed, 8 Mar 2017 16:01:42 +0000 (17:01 +0100)]
Fix textures
Mirio [Wed, 8 Mar 2017 15:54:14 +0000 (16:54 +0100)]
Update shader
Mirio [Wed, 8 Mar 2017 15:46:11 +0000 (16:46 +0100)]
Update shader
Mirio [Wed, 8 Mar 2017 15:40:45 +0000 (16:40 +0100)]
Merge branch 'master' into Mirio/geoplanetary
Mirio [Tue, 7 Mar 2017 18:46:37 +0000 (19:46 +0100)]
Fix leak
Mirio [Tue, 7 Mar 2017 18:11:38 +0000 (19:11 +0100)]
More fixes
Mirio [Tue, 7 Mar 2017 18:10:35 +0000 (19:10 +0100)]
More fixes
Mirio [Tue, 7 Mar 2017 12:39:51 +0000 (13:39 +0100)]
Merge branch 'master' into justin/erbium
Mirio [Tue, 7 Mar 2017 12:39:28 +0000 (13:39 +0100)]
Update campaign
Mirio [Tue, 7 Mar 2017 12:37:12 +0000 (13:37 +0100)]
merge conflict
Mirio [Tue, 7 Mar 2017 12:33:21 +0000 (13:33 +0100)]
Merge branch 'master' into justin/erbium
Mirio [Tue, 7 Mar 2017 12:33:15 +0000 (13:33 +0100)]
More clips clips clips
Mario [Tue, 7 Mar 2017 12:16:30 +0000 (22:16 +1000)]
Remove g-23 (poll passed)
Mirio [Tue, 7 Mar 2017 00:40:11 +0000 (01:40 +0100)]
Tiny update
Mirio [Tue, 7 Mar 2017 00:35:33 +0000 (01:35 +0100)]
More fixes
Mirio [Mon, 6 Mar 2017 21:28:55 +0000 (22:28 +0100)]
Merge branch 'master' into justin/erbium
Mirio [Mon, 6 Mar 2017 16:22:04 +0000 (17:22 +0100)]
Merge branch 't0uYK8Ne/fix-125'
t0uYK8Ne [Mon, 6 Mar 2017 15:19:43 +0000 (07:19 -0800)]
drain: adjust clip position (fixes #125)
Mirio [Mon, 6 Mar 2017 13:12:28 +0000 (14:12 +0100)]
Fix wrong path to sound file
Mirio [Mon, 6 Mar 2017 13:04:06 +0000 (14:04 +0100)]
Fix object errors in Darkzone
Mirio [Mon, 6 Mar 2017 13:03:31 +0000 (14:03 +0100)]
Update authors within mapfile
Mirio [Sun, 5 Mar 2017 16:03:51 +0000 (17:03 +0100)]
New waypoints for Darkzone, add weapon clip
Mirio [Sun, 5 Mar 2017 15:26:05 +0000 (16:26 +0100)]
Update mapinfo
Mirio [Sat, 4 Mar 2017 15:48:13 +0000 (15:48 +0000)]
Merge branch 't0uYK8Ne/fuse' into 'master'
t0uYK8Ne/fuse
See merge request !65
t0uYK8Ne [Sat, 4 Mar 2017 07:09:24 +0000 (23:09 -0800)]
fuse: fix z-fighting
t0uYK8Ne [Sat, 4 Mar 2017 07:00:39 +0000 (23:00 -0800)]
fuse: fix visible caulk
t0uYK8Ne [Sat, 4 Mar 2017 05:20:02 +0000 (21:20 -0800)]
fuse: change a clip to weapclip
t0uYK8Ne [Sat, 4 Mar 2017 05:16:34 +0000 (21:16 -0800)]
fuse: minor adjustment to pipes in mega room
t0uYK8Ne [Sat, 4 Mar 2017 05:10:25 +0000 (21:10 -0800)]
fuse: adjust a clip
Mirio [Fri, 3 Mar 2017 23:06:02 +0000 (23:06 +0000)]
Merge branch 'Mirio/dance' into 'master'
Break the glass, #121
See merge request !56
Mirio [Fri, 3 Mar 2017 23:04:39 +0000 (23:04 +0000)]
Merge branch 't0uYK8Ne/afterslime' into 'master'
t0uYK8Ne/afterslime
Closes #120
See merge request !64
t0uYK8Ne [Fri, 3 Mar 2017 22:08:56 +0000 (14:08 -0800)]
Merge branch 'master' into t0uYK8Ne/afterslime
Mirio [Fri, 3 Mar 2017 19:02:56 +0000 (20:02 +0100)]
Remove clientsettemp cvar
Mirio [Fri, 3 Mar 2017 19:00:57 +0000 (20:00 +0100)]
Update entity names
Mirio [Fri, 3 Mar 2017 17:13:57 +0000 (18:13 +0100)]
Fix error again
Mirio [Fri, 3 Mar 2017 16:48:40 +0000 (17:48 +0100)]
Fix error
Mirio [Fri, 3 Mar 2017 16:37:57 +0000 (17:37 +0100)]
Merge branch 'Mirio/darkzone'
Mirio [Fri, 3 Mar 2017 16:30:07 +0000 (17:30 +0100)]
Merge conflict
Mirio [Fri, 3 Mar 2017 16:20:48 +0000 (16:20 +0000)]
Merge branch 'kuniuthefrogg/boil' into 'master'
kuniuthefrogg/boil
See merge request !58
Mirio [Fri, 3 Mar 2017 16:17:18 +0000 (17:17 +0100)]
New mappicture and waypoints
Mirio [Fri, 3 Mar 2017 16:02:21 +0000 (17:02 +0100)]
Merge branch 'master' into kuniuthefrogg/boil
t0uYK8Ne [Thu, 2 Mar 2017 22:35:13 +0000 (14:35 -0800)]
afterslime: add area outside upper windows
Fixes #120.
Mirio [Tue, 28 Feb 2017 18:50:49 +0000 (19:50 +0100)]
Recompile due to xonoticgit branch -D divVerent/simplified-sound-sliders
Mirio [Tue, 28 Feb 2017 18:47:56 +0000 (19:47 +0100)]
Recompile this
Mirio [Tue, 28 Feb 2017 18:47:27 +0000 (19:47 +0100)]
Merge branch 'master' into kuniuthefrogg/boil
Mirio [Sun, 26 Feb 2017 19:36:59 +0000 (20:36 +0100)]
Merge branch 'Mirio/silentsiege'
Mirio [Sun, 26 Feb 2017 19:35:52 +0000 (20:35 +0100)]
Fix it up
Mirio [Sun, 26 Feb 2017 19:26:11 +0000 (20:26 +0100)]
Merge branch 'master' into Mirio/silentsiege
Mirio [Sun, 26 Feb 2017 19:24:57 +0000 (20:24 +0100)]
Merge branch 'Mirio/fuse'
Mirio [Sun, 26 Feb 2017 19:19:12 +0000 (20:19 +0100)]
merge conflict
Mirio [Sun, 26 Feb 2017 18:48:10 +0000 (18:48 +0000)]
Merge branch 't0uYK8Ne/map-fixes' into 'master'
t0uYK8Ne/map fixes
See merge request !63
t0uYK8Ne [Fri, 24 Feb 2017 01:35:58 +0000 (17:35 -0800)]
afterslime: fix z-fighting (pipes near strength)
Mirio [Mon, 20 Feb 2017 12:27:59 +0000 (13:27 +0100)]
merge conflict
t0uYK8Ne [Sun, 19 Feb 2017 21:33:31 +0000 (13:33 -0800)]
Fix paths to lights
t0uYK8Ne [Sun, 19 Feb 2017 19:29:39 +0000 (11:29 -0800)]
solarium: clip pipes near big armor
t0uYK8Ne [Sun, 19 Feb 2017 19:14:55 +0000 (11:14 -0800)]
solarium: extend the water to the end of the tunnel
t0uYK8Ne [Sun, 19 Feb 2017 18:40:17 +0000 (10:40 -0800)]
vorix: texture fix, add missing brush
t0uYK8Ne [Sun, 19 Feb 2017 18:20:03 +0000 (10:20 -0800)]
vorix: delete duplicate railing pieces
t0uYK8Ne [Sun, 19 Feb 2017 18:09:47 +0000 (10:09 -0800)]
stormkeep: lower ceiling clip in mortar room
t0uYK8Ne [Sun, 19 Feb 2017 18:01:24 +0000 (10:01 -0800)]
stormkeep: texture fixes
t0uYK8Ne [Sun, 19 Feb 2017 16:49:48 +0000 (08:49 -0800)]
silentsiege: texture fixes
t0uYK8Ne [Sun, 19 Feb 2017 16:01:33 +0000 (08:01 -0800)]
atelier: extend the trim to the wall
t0uYK8Ne [Sun, 19 Feb 2017 15:42:37 +0000 (07:42 -0800)]
space-elevator: delete unused teleporter destination
t0uYK8Ne [Sun, 19 Feb 2017 15:37:38 +0000 (07:37 -0800)]
space-elevator: minor geometry fixes
t0uYK8Ne [Sun, 19 Feb 2017 15:02:39 +0000 (07:02 -0800)]
space-elevator: texture fixes
Mirio [Thu, 9 Feb 2017 14:09:59 +0000 (14:09 +0000)]
Merge branch 't0uYK8Ne/ent-typos-fix' into 'master'
Fix typos in entities.ent
See merge request !62
t0uYK8Ne [Wed, 8 Feb 2017 22:21:23 +0000 (14:21 -0800)]
Fix typos in entities.ent
projects / xonotic / xonotic-maps.pk3dir.git / log