]>
de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/log
Mirio [Fri, 31 Mar 2017 18:35:31 +0000 (20:35 +0200)]
HQ waypoints v1.2-1.3, see #130
Mirio [Thu, 30 Mar 2017 17:52:16 +0000 (17:52 +0000)]
Merge branch 'maddin/shader-weapclip' into 'master'
Remove "surfaceparm nomarks" from weapclip shader
See merge request !54
Mirio [Thu, 30 Mar 2017 17:50:27 +0000 (19:50 +0200)]
Merge branch 'master' into maddin/shader-weapclip
Mirio [Wed, 29 Mar 2017 16:10:14 +0000 (18:10 +0200)]
Put more levels between each runningman level, add notes
Mirio [Wed, 29 Mar 2017 12:50:37 +0000 (14:50 +0200)]
Add a lot of clips
Mirio [Wed, 29 Mar 2017 12:30:45 +0000 (12:30 +0000)]
Merge branch 't0uYK8Ne/geoplanetary-warpzone' into 'master'
geoplanetary: increase warpzone fade distance
See merge request !99
Mirio [Wed, 29 Mar 2017 11:31:29 +0000 (13:31 +0200)]
Add terencehills HQ waypoints v1.1
t0uYK8Ne [Tue, 28 Mar 2017 23:44:15 +0000 (16:44 -0700)]
geoplanetary: fix warpzone z-fighting
t0uYK8Ne [Tue, 28 Mar 2017 22:46:56 +0000 (15:46 -0700)]
geoplanetary: increase warpzone fade distance
Mirio [Tue, 28 Mar 2017 21:12:11 +0000 (23:12 +0200)]
Fix #132 with a clip
Mirio [Tue, 28 Mar 2017 12:57:44 +0000 (14:57 +0200)]
Warfare: Add clips to avoid to get stuck
Mirio [Tue, 28 Mar 2017 12:29:15 +0000 (14:29 +0200)]
Fuse: Fix odd issue with a hint brush
Mirio [Tue, 28 Mar 2017 11:42:47 +0000 (13:42 +0200)]
Couple of Erbium fixes
Mirio [Mon, 27 Mar 2017 15:36:09 +0000 (15:36 +0000)]
Merge branch 'matthiaskrgr/afterslime' into 'master'
Matthiaskrgr/afterslime
See merge request !98
Matthias Krüger [Sun, 26 Mar 2017 22:13:27 +0000 (00:13 +0200)]
afterslime: fix leak
Matthias Krüger [Sun, 26 Mar 2017 17:43:17 +0000 (19:43 +0200)]
afterslime: texture fixes to the rotating things I added a while ago.
Matthias Krüger [Sun, 26 Mar 2017 09:02:11 +0000 (11:02 +0200)]
afterslime: caulk some more
Matthias Krüger [Sun, 26 Mar 2017 08:52:12 +0000 (10:52 +0200)]
afterslime: improve caulkiness
Mirio [Sat, 25 Mar 2017 16:57:18 +0000 (17:57 +0100)]
Fix more visible caulk
Mirio [Thu, 23 Mar 2017 23:59:14 +0000 (00:59 +0100)]
Use new song
Mirio [Wed, 22 Mar 2017 22:09:24 +0000 (22:09 +0000)]
Merge branch 'packer/vorix' into 'master'
fix lights, fix hint brushes, fix zero angles
See merge request !96
packer [Wed, 22 Mar 2017 22:05:29 +0000 (23:05 +0100)]
fix lights, fix hint brushes, fix zero angles
Mirio [Wed, 22 Mar 2017 12:12:40 +0000 (13:12 +0100)]
Dance picture
Mirio [Wed, 22 Mar 2017 12:12:23 +0000 (13:12 +0100)]
Fuse versioning
Mirio [Wed, 22 Mar 2017 11:56:56 +0000 (11:56 +0000)]
Merge branch 't0uYK8Ne/fuse' into 'master'
fuse: More fixes.
See merge request !95
t0uYK8Ne [Wed, 22 Mar 2017 05:56:02 +0000 (22:56 -0700)]
fuse: More fixes.
Mirio [Tue, 21 Mar 2017 14:24:55 +0000 (14:24 +0000)]
Revert "Remove light entities for real"
This reverts commit
92cfde1634c5f6f50d34f903176e258e1bbaea71
Mirio [Tue, 21 Mar 2017 14:17:12 +0000 (15:17 +0100)]
Remove light entities for real
Mirio [Tue, 21 Mar 2017 14:02:39 +0000 (14:02 +0000)]
Merge branch 'packer/dance' into 'master'
packer/dance
See merge request !94
Mirio [Tue, 21 Mar 2017 14:01:55 +0000 (15:01 +0100)]
Fix conflict
Mirio [Tue, 21 Mar 2017 13:57:52 +0000 (14:57 +0100)]
Cleanup mapinfos and options
packer [Tue, 21 Mar 2017 13:54:54 +0000 (14:54 +0100)]
remove light entities and their targets, because shader emits sufficient light
Mirio [Tue, 21 Mar 2017 13:49:03 +0000 (14:49 +0100)]
Implosion picture
Mirio [Tue, 21 Mar 2017 13:37:32 +0000 (14:37 +0100)]
Sort of fix panels in Courtfun
packer [Mon, 20 Mar 2017 22:44:36 +0000 (23:44 +0100)]
redesign floor attached pillars
Mirio [Mon, 20 Mar 2017 18:11:58 +0000 (19:11 +0100)]
Update map pictures
Mirio [Mon, 20 Mar 2017 17:49:30 +0000 (18:49 +0100)]
More Implosion improvements
Mirio [Sun, 19 Mar 2017 18:30:02 +0000 (18:30 +0000)]
Merge branch 'packer/dance-caulked' into 'master'
packer/dance-caulked
See merge request !93
packer [Sun, 19 Mar 2017 18:27:14 +0000 (19:27 +0100)]
caulk the map, use detailed brushes
Mirio [Sun, 19 Mar 2017 12:57:44 +0000 (12:57 +0000)]
Merge branch 'packer/implosion' into 'master'
Reduce light intensity and other updatings/fixes
See merge request !92
packer [Sun, 19 Mar 2017 08:48:41 +0000 (09:48 +0100)]
Reduce light intensity and other updatings/fixes
Mirio [Sat, 18 Mar 2017 23:02:04 +0000 (00:02 +0100)]
Fix more at atelier
Mirio [Sat, 18 Mar 2017 22:44:34 +0000 (23:44 +0100)]
Fix light and alignments
Mirio [Sat, 18 Mar 2017 21:25:05 +0000 (21:25 +0000)]
Merge branch 'matthiaskrgr/dance_lightgrid' into 'master'
dance: add lightgrid to reduce map compile time.
See merge request !90
Mirio [Sat, 18 Mar 2017 21:23:25 +0000 (22:23 +0100)]
Fix visible caulk
Mirio [Sat, 18 Mar 2017 21:22:52 +0000 (22:22 +0100)]
Version
Mirio [Sat, 18 Mar 2017 15:34:05 +0000 (15:34 +0000)]
Merge branch 'matthiaskrgr/oilrig_lightgrid' into 'master'
oilrig: tighten up lightgrid
See merge request !91
Matthias Krüger [Sat, 18 Mar 2017 13:19:53 +0000 (14:19 +0100)]
oilrig: tighten up lightgrid
Matthias Krüger [Sat, 18 Mar 2017 13:05:37 +0000 (14:05 +0100)]
dance: add lightgrid to reduce map compile time.
Mirio [Sat, 18 Mar 2017 12:34:19 +0000 (12:34 +0000)]
Merge branch 'packer/space-elevator' into 'master'
lightgrid box and clips
See merge request !89
packer [Sat, 18 Mar 2017 12:07:53 +0000 (13:07 +0100)]
lightgrid box and clips
Mirio [Fri, 17 Mar 2017 22:44:48 +0000 (22:44 +0000)]
Merge branch 't0uYK8Ne/catharsis' into 'master'
catharsis: fix various issues
See merge request !88
t0uYK8Ne [Fri, 17 Mar 2017 21:33:29 +0000 (14:33 -0700)]
catharsis: fix various issues
Mirio [Fri, 17 Mar 2017 19:26:38 +0000 (20:26 +0100)]
Fix texture aligment and z-fight
Mirio [Fri, 17 Mar 2017 19:14:38 +0000 (20:14 +0100)]
Use terencehills waypoints, reference is #130
Mirio [Fri, 17 Mar 2017 18:51:38 +0000 (19:51 +0100)]
Fix this item
Mirio [Fri, 17 Mar 2017 18:39:38 +0000 (19:39 +0100)]
Fix visible caulk and a light
Mirio [Fri, 17 Mar 2017 14:33:21 +0000 (15:33 +0100)]
Switch around some cdtracks
Mirio [Fri, 17 Mar 2017 14:07:21 +0000 (14:07 +0000)]
Merge branch 'packer/afterslime' into 'master'
improve #120
See merge request !87
packer [Fri, 17 Mar 2017 13:57:40 +0000 (14:57 +0100)]
improve #120
Mirio [Thu, 16 Mar 2017 17:55:59 +0000 (17:55 +0000)]
Merge branch 'packer/atelier-light-at-mg' into 'master'
packer/atelier-light-at-mg
See merge request !86
packer [Wed, 15 Mar 2017 23:18:07 +0000 (00:18 +0100)]
add light at MG
Mirio [Wed, 15 Mar 2017 19:09:42 +0000 (19:09 +0000)]
Merge branch 'packer/geoplanetary-warpzonefix' into 'master'
packer/geoplanetary-warpzonefix
See merge request !85
packer [Wed, 15 Mar 2017 19:08:12 +0000 (20:08 +0100)]
fix warpzone
Mirio [Wed, 15 Mar 2017 19:05:16 +0000 (19:05 +0000)]
Merge branch 'packer/runningman-alignment' into 'master'
packer/runningman-alignment
See merge request !84
Mirio [Wed, 15 Mar 2017 19:03:47 +0000 (19:03 +0000)]
Merge branch 'packer/atelier-nofloodlight' into 'master'
packer/atelier-nofloodlight
See merge request !83
packer [Wed, 15 Mar 2017 18:46:47 +0000 (19:46 +0100)]
improve alignment of lights + some clips
packer [Wed, 15 Mar 2017 18:49:23 +0000 (19:49 +0100)]
remove floodlight
Mirio [Wed, 15 Mar 2017 16:22:33 +0000 (17:22 +0100)]
Fix caulk
Mirio [Wed, 15 Mar 2017 12:52:49 +0000 (13:52 +0100)]
Fix couple of misaligments and clips
Mirio [Wed, 15 Mar 2017 10:10:00 +0000 (10:10 +0000)]
Update oilrig.map.options
Mirio [Wed, 15 Mar 2017 10:06:32 +0000 (10:06 +0000)]
Merge branch 't0uYK8Ne/oilrig' into 'master'
t0uYK8Ne/oilrig
Closes #129
See merge request !82
t0uYK8Ne [Wed, 15 Mar 2017 02:28:46 +0000 (19:28 -0700)]
oilrig: some fixes in shield room
t0uYK8Ne [Wed, 15 Mar 2017 02:02:11 +0000 (19:02 -0700)]
Fix #129
Mirio [Tue, 14 Mar 2017 14:06:35 +0000 (15:06 +0100)]
Fix leak
Mirio [Tue, 14 Mar 2017 01:37:26 +0000 (01:37 +0000)]
Fix NULL texture
Mirio [Tue, 14 Mar 2017 01:18:33 +0000 (02:18 +0100)]
Cant help it, but I keep finding wrong stuff
Mirio [Mon, 13 Mar 2017 21:55:29 +0000 (22:55 +0100)]
few more misalignments
Mirio [Mon, 13 Mar 2017 21:36:48 +0000 (22:36 +0100)]
Fix lots of misalignment textures -.-
Mirio [Mon, 13 Mar 2017 16:23:36 +0000 (16:23 +0000)]
Merge branch 'matthiaskrgr/glowplant' into 'master'
Matthiaskrgr/glowplant misc changes/fix light
See merge request !81
Mirio [Mon, 13 Mar 2017 16:22:04 +0000 (17:22 +0100)]
Version
Mirio [Mon, 13 Mar 2017 16:21:46 +0000 (17:21 +0100)]
Merge branch 'master' into matthiaskrgr/glowplant
Mirio [Mon, 13 Mar 2017 16:21:07 +0000 (17:21 +0100)]
Merge branch 'master' into matthiaskrgr/glowplant
Mirio [Mon, 13 Mar 2017 16:17:56 +0000 (16:17 +0000)]
Merge branch 'matthiaskrgr/erbium' into 'master'
erbium: fix lights alignment on round thing model.
See merge request !78
Mirio [Mon, 13 Mar 2017 16:16:14 +0000 (17:16 +0100)]
Merge branch 'master' into matthiaskrgr/erbium
Mirio [Mon, 13 Mar 2017 16:14:29 +0000 (16:14 +0000)]
Merge branch 'matthiaskrgr/atelier' into 'master'
atelier: fix texture misalignment
See merge request !80
Mirio [Mon, 13 Mar 2017 16:14:16 +0000 (17:14 +0100)]
Versioning
Mirio [Mon, 13 Mar 2017 16:12:05 +0000 (17:12 +0100)]
Versining
Mirio [Mon, 13 Mar 2017 16:11:49 +0000 (17:11 +0100)]
Merge branch 'master' into matthiaskrgr/atelier
Mirio [Mon, 13 Mar 2017 16:10:53 +0000 (17:10 +0100)]
Merge branch 'master' into matthiaskrgr/atelier
Mirio [Mon, 13 Mar 2017 16:09:50 +0000 (16:09 +0000)]
Merge branch 'matthiaskrgr/final_rage' into 'master'
final rage: make 2 lamp models solid (in quad room)
See merge request !77
Mirio [Mon, 13 Mar 2017 16:09:19 +0000 (17:09 +0100)]
Make all light models solid
Mirio [Mon, 13 Mar 2017 16:06:16 +0000 (17:06 +0100)]
Merge branch 'master' into matthiaskrgr/final_rage
Mirio [Mon, 13 Mar 2017 16:05:25 +0000 (16:05 +0000)]
Merge branch 'matthiaskrgr/SE' into 'master'
space-elevator: use default damage instead of 1000
See merge request !79
Mirio [Mon, 13 Mar 2017 16:04:36 +0000 (17:04 +0100)]
Move trigger to bottom
Mirio [Mon, 13 Mar 2017 16:02:58 +0000 (17:02 +0100)]
Merge branch 'master' into matthiaskrgr/SE
Mirio [Mon, 13 Mar 2017 16:01:40 +0000 (16:01 +0000)]
Merge branch 'matthiaskrgr/darkzone' into 'master'
darkzone: fix some black spots near the "outdoor" glass corridor
See merge request !76
Mirio [Mon, 13 Mar 2017 16:01:09 +0000 (17:01 +0100)]
Versioning
Mirio [Mon, 13 Mar 2017 16:00:39 +0000 (17:00 +0100)]
Merge branch 'master' into matthiaskrgr/darkzone
Matthias Krüger [Mon, 13 Mar 2017 14:09:14 +0000 (15:09 +0100)]
glowplant: fix texture misalignment
projects / xonotic / xonotic-maps.pk3dir.git / log