]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
Mirio [Sun, 6 Sep 2015 15:50:14 +0000 (17:50 +0200)]
Merge branch 'master' into Mirio/catharsis
Mirio [Sat, 5 Sep 2015 16:33:30 +0000 (18:33 +0200)]
Add map_warfare to shaderlist
Mirio [Sat, 5 Sep 2015 12:25:35 +0000 (14:25 +0200)]
Fix #101
Mirio [Sat, 5 Sep 2015 12:21:05 +0000 (14:21 +0200)]
Enable DM on Implosion according to poll 322
Mirio [Sat, 5 Sep 2015 12:20:29 +0000 (14:20 +0200)]
Hide G-23 according to poll 321
Mirio [Fri, 4 Sep 2015 16:02:03 +0000 (18:02 +0200)]
Set author, message and _description in map files
Mirio [Fri, 4 Sep 2015 15:15:12 +0000 (15:15 +0000)]
Merge branch 'matthiaskrgr/srgb' into 'master'
switch maps to sRGB
Switches all maps to sRGB lighting
had to change light intensity in most cases, added some _sRGB textures (to not break old maps), added script to change all lights on a map, some maps have bounce lighting now.
Maps:
- [x] _hudsetup
- [x] afterslime
- [x] atelier
- [x] catharsis
- [x] dance
- [x] drain
- [x] finalrage
- [x] glowplant
- [x] implosion
- [x] leave_em_behind
- [x] nexballarena
- [x] oilrig
- [x] runningman
- [x] runningmanctf
- [x] solarium
- [x] space-elevator
- [x] stormkeep
- [x] techassault
- [x] vorix
- [x] warfare
- [x] xoylent
See merge request !32
Mirio [Fri, 4 Sep 2015 14:51:53 +0000 (16:51 +0200)]
Merge branch 'matthiaskrgr/srgb' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir into matthiaskrgr/srgb
Mirio [Fri, 4 Sep 2015 14:48:31 +0000 (16:48 +0200)]
Try to fix some weird 'mound'
Mirio [Fri, 4 Sep 2015 14:45:15 +0000 (16:45 +0200)]
Fix some floating barrels
Matthias Krüger [Mon, 31 Aug 2015 20:02:57 +0000 (22:02 +0200)]
fix broken shader file. oops...
Matthias Krüger [Mon, 31 Aug 2015 18:30:19 +0000 (20:30 +0200)]
Merge remote-tracking branch 'origin/master' into matthiaskrgr/srgb
Mirio [Mon, 31 Aug 2015 17:45:31 +0000 (19:45 +0200)]
Change caulk texture to clip
Matthias Krüger [Mon, 31 Aug 2015 16:18:38 +0000 (18:18 +0200)]
stormkeep: use sRGB surfacelights
Matthias Krüger [Mon, 31 Aug 2015 15:56:09 +0000 (17:56 +0200)]
Merge branch 'master' into matthiaskrgr/srgb
Matthias Krüger [Mon, 31 Aug 2015 15:55:25 +0000 (17:55 +0200)]
runningman{,ctf}: sRGBify
Matthias Krüger [Mon, 31 Aug 2015 15:21:22 +0000 (17:21 +0200)]
ad sRGB surfacelights to shaders (reduced surfacelights)
Matthias Krüger [Mon, 31 Aug 2015 14:37:05 +0000 (16:37 +0200)]
space-elevator: bounce 8
Matthias Krüger [Mon, 31 Aug 2015 12:26:16 +0000 (14:26 +0200)]
space-elevator: cut away some impassible area
Matthias Krüger [Mon, 31 Aug 2015 12:22:15 +0000 (14:22 +0200)]
space-elevator: sRGBify, add custom skybox shader
Mirio [Mon, 31 Aug 2015 12:09:37 +0000 (14:09 +0200)]
Merge branch 'master' into matthiaskrgr/srgb
Mirio [Mon, 31 Aug 2015 11:38:19 +0000 (11:38 +0000)]
Merge branch 'Melanosuchus/entities_func_door_rotating' into 'master'
Add missing spawnflags to func_door_rotating
Added the flags that change the rotation axis. (see [spawnfunc_func_door_rotating() in t_plats.qc](https://gitlab.com/xonotic/xonotic-data.pk3dir/blob/master/qcsrc/server/t_plats.qc#L1628-1634))
See merge request !23
Mirio [Mon, 31 Aug 2015 11:36:36 +0000 (11:36 +0000)]
Merge branch 'matthiaskrgr/implosion' into 'master'
implosion: fix lightmap size (512 -> 2048), add bounce, remove -fast from vis since it's not recommended and barly results in a speedup.
Gets us more detailed shadows and slightly improved lights.
See merge request !28
Matthias Krüger [Mon, 31 Aug 2015 09:13:48 +0000 (11:13 +0200)]
implosion: sRGBify
Matthias Krüger [Mon, 31 Aug 2015 08:21:13 +0000 (10:21 +0200)]
Merge branch 'matthiaskrgr/implosion' into matthiaskrgr/srgb
Matthias Krüger [Sun, 30 Aug 2015 14:50:01 +0000 (16:50 +0200)]
stormkeep: sRGBify
Matthias Krüger [Sun, 30 Aug 2015 13:13:30 +0000 (15:13 +0200)]
techassault: sRGBify, add bounce 8
Matthias Krüger [Sun, 30 Aug 2015 11:49:53 +0000 (13:49 +0200)]
vorix: sRGBify, add bounce 8
Matthias Krüger [Sun, 30 Aug 2015 11:25:48 +0000 (13:25 +0200)]
warfare: sRGBify, add bounce 8
Matthias Krüger [Sun, 30 Aug 2015 09:57:08 +0000 (11:57 +0200)]
solarium: sRGBify, add bounce 8
Matthias Krüger [Sun, 30 Aug 2015 09:01:38 +0000 (11:01 +0200)]
add script to change lights
Matthias Krüger [Sat, 29 Aug 2015 19:59:48 +0000 (21:59 +0200)]
oilrig: sRGBify
Matthias Krüger [Sat, 29 Aug 2015 16:29:57 +0000 (18:29 +0200)]
dance: make it slightly brighter
Matthias Krüger [Sat, 29 Aug 2015 15:42:45 +0000 (17:42 +0200)]
leave_em_behind: make it a little darker
Matthias Krüger [Sat, 29 Aug 2015 06:22:57 +0000 (08:22 +0200)]
_hudsetup: sRGBify
Matthias Krüger [Sat, 29 Aug 2015 06:16:17 +0000 (08:16 +0200)]
glowplant: sRGBify
Matthias Krüger [Sat, 29 Aug 2015 05:10:27 +0000 (07:10 +0200)]
dance: sRGBify
Matthias Krüger [Fri, 28 Aug 2015 23:46:24 +0000 (01:46 +0200)]
drain: make light-models cast shadows
Matthias Krüger [Fri, 28 Aug 2015 23:31:55 +0000 (01:31 +0200)]
drain: make it even a bit more darker to get closer to the post-srgb brightness
Matthias Krüger [Fri, 28 Aug 2015 23:00:33 +0000 (01:00 +0200)]
finalrage: sRGBify
Matthias Krüger [Fri, 28 Aug 2015 21:13:09 +0000 (23:13 +0200)]
catharsis: sRGBify, add bounce 8
Matthias Krüger [Fri, 28 Aug 2015 20:46:55 +0000 (22:46 +0200)]
atelier: sRGBify
Matthias Krüger [Fri, 28 Aug 2015 20:26:46 +0000 (22:26 +0200)]
afterslime: sRGBify
Matthias Krüger [Fri, 28 Aug 2015 19:37:06 +0000 (21:37 +0200)]
drain: fix floating barrel.
Matthias Krüger [Fri, 28 Aug 2015 19:32:16 +0000 (21:32 +0200)]
xoylent: sRGBify, add bounce 8
Matthias Krüger [Fri, 28 Aug 2015 18:22:21 +0000 (20:22 +0200)]
nexballarena: sRGBify
Matthias Krüger [Fri, 28 Aug 2015 17:51:33 +0000 (19:51 +0200)]
leave_em_behind: sRGBify
Matthias Krüger [Fri, 28 Aug 2015 16:44:51 +0000 (18:44 +0200)]
Merge branch 'master' into matthiaskrgr/srgb
Mirio [Fri, 28 Aug 2015 14:51:59 +0000 (16:51 +0200)]
Merge branch 'matthiaskrgr/dance_unstuck'
Mirio [Fri, 28 Aug 2015 14:51:23 +0000 (16:51 +0200)]
Add author, message to map file
Matthias Krüger [Fri, 28 Aug 2015 13:51:09 +0000 (15:51 +0200)]
drain: sRGBify
Matthias Krüger [Fri, 28 Aug 2015 07:46:59 +0000 (09:46 +0200)]
implosion: fix lightmap size (512 -> 2048), add bounce, remove -fast from vis since it's not recommended.
Mirio [Thu, 27 Aug 2015 16:06:44 +0000 (18:06 +0200)]
Merge branch 'Mirio/universaltrigger'
Mirio [Thu, 27 Aug 2015 16:00:01 +0000 (18:00 +0200)]
And Space-Elevator
Mirio [Thu, 27 Aug 2015 15:26:18 +0000 (17:26 +0200)]
Implosion done
Matthias Krüger [Thu, 27 Aug 2015 11:31:19 +0000 (13:31 +0200)]
dance: make the outer block outside of the map less midair-floaty.
Matthias Krüger [Wed, 26 Aug 2015 17:24:26 +0000 (19:24 +0200)]
dance: also add lights to the stair-area
Matthias Krüger [Thu, 27 Aug 2015 11:30:25 +0000 (13:30 +0200)]
dance: add some clip so players won't get stuck on the walls next to the stairs.
Mirio [Tue, 25 Aug 2015 14:49:25 +0000 (16:49 +0200)]
Space-Elevator
Mirio [Tue, 25 Aug 2015 14:48:13 +0000 (16:48 +0200)]
Atelier
Mirio [Tue, 25 Aug 2015 14:47:21 +0000 (16:47 +0200)]
Drain
Mirio [Tue, 25 Aug 2015 14:46:19 +0000 (16:46 +0200)]
Courtfun
Mirio [Tue, 25 Aug 2015 14:45:06 +0000 (16:45 +0200)]
Oilrig
Mirio [Tue, 25 Aug 2015 14:43:35 +0000 (16:43 +0200)]
Improve triggers, fix zfights
Mirio [Tue, 25 Aug 2015 14:34:13 +0000 (16:34 +0200)]
Add a new DOM point, fix DOM point description
Mirio [Tue, 25 Aug 2015 14:31:46 +0000 (16:31 +0200)]
Improve Space-Elevator triggers
Mirio [Thu, 20 Aug 2015 07:00:02 +0000 (09:00 +0200)]
Fix #99 and make the jumppad triggers universal
Mirio [Wed, 19 Aug 2015 00:05:37 +0000 (02:05 +0200)]
Merge branch 'packer/map-fixes'
packer [Tue, 18 Aug 2015 23:03:31 +0000 (01:03 +0200)]
Merge remote-tracking branch 'origin/master' into packer/map-fixes
packer [Tue, 18 Aug 2015 23:03:02 +0000 (01:03 +0200)]
dance, space-elevator: remove global ambient sounds
Mirio [Tue, 18 Aug 2015 21:39:32 +0000 (23:39 +0200)]
Change title to remove confusion. Add Level 2 again instead of atomforge
packer [Thu, 13 Aug 2015 13:30:17 +0000 (15:30 +0200)]
fix several issues on different maps
- catharsis (spawnpoint)
- dance, oilrig, runningman, runningmanctf, space-elevator, warfare
(sound file paths)
Mattia Basaglia [Mon, 20 Jul 2015 06:32:22 +0000 (08:32 +0200)]
Add missing spawnflags to func_door_rotating
Mirio [Sat, 18 Jul 2015 20:34:43 +0000 (22:34 +0200)]
Fix #97
Mirio [Sat, 18 Jul 2015 19:06:02 +0000 (21:06 +0200)]
Fix #98
Mirio [Sat, 11 Jul 2015 16:19:25 +0000 (18:19 +0200)]
Update campaign for 0.8.1 maps
Mirio [Sat, 11 Jul 2015 16:18:31 +0000 (18:18 +0200)]
A DOM point was missing for whatever reason, added again
Mario [Sat, 11 Jul 2015 14:08:34 +0000 (00:08 +1000)]
Remove another trace of lightspeed
Mario [Sat, 11 Jul 2015 14:03:11 +0000 (00:03 +1000)]
Merge branch 'amade/finalrage'
Mario [Sat, 11 Jul 2015 14:01:39 +0000 (00:01 +1000)]
Merge branch 'master' into amade/finalrage
Mario [Sat, 11 Jul 2015 13:59:00 +0000 (23:59 +1000)]
Add drain back in, oops
Mario [Sat, 11 Jul 2015 13:37:17 +0000 (23:37 +1000)]
Merge branch 'debugger/shadow/atelier'
Mario [Sat, 11 Jul 2015 13:33:53 +0000 (23:33 +1000)]
Replace NULL textures with common/caulk
Mario [Sat, 11 Jul 2015 13:27:59 +0000 (23:27 +1000)]
Merge branch 'master' into debugger/shadow/atelier
Mario [Sat, 11 Jul 2015 13:23:01 +0000 (23:23 +1000)]
Merge branch 'Mario/map_nukes'
Mario [Sat, 11 Jul 2015 13:19:56 +0000 (23:19 +1000)]
Replace missing textures with caulk on leave em behind
Mario [Sat, 11 Jul 2015 13:16:48 +0000 (23:16 +1000)]
Replace NULL textures on nexballarena
Mario [Sat, 11 Jul 2015 12:46:33 +0000 (22:46 +1000)]
Fix missing textures on catharsis
Mario [Sat, 11 Jul 2015 12:42:20 +0000 (22:42 +1000)]
Fix some missing textures on fuse
Mario [Sat, 11 Jul 2015 12:38:33 +0000 (22:38 +1000)]
Replace NULL texture with common/caulk
Mario [Sat, 11 Jul 2015 12:16:55 +0000 (22:16 +1000)]
Remove all known files related to drain, newtonian-nightmare, abyss & lightspeed
Mirio [Thu, 9 Jul 2015 19:17:46 +0000 (21:17 +0200)]
Mapinfo -.-
Mirio [Thu, 9 Jul 2015 19:10:24 +0000 (21:10 +0200)]
Merge branch 'master' into debugger/shadow/atelier
Mirio [Thu, 9 Jul 2015 19:06:40 +0000 (21:06 +0200)]
Merge branch 'master' into amade/finalrage
Mirio [Thu, 9 Jul 2015 19:04:04 +0000 (21:04 +0200)]
Merge branch 'maddin/map-warfare'
Mirio [Thu, 9 Jul 2015 18:58:55 +0000 (20:58 +0200)]
welp, maybe dont forget the map file
Mirio [Thu, 9 Jul 2015 18:56:35 +0000 (20:56 +0200)]
Finalize
Mirio [Tue, 16 Jun 2015 12:04:37 +0000 (14:04 +0200)]
Final fix
Mirio [Sat, 13 Jun 2015 09:40:27 +0000 (11:40 +0200)]
Final zfight fix, please
Mirio [Thu, 11 Jun 2015 11:19:32 +0000 (13:19 +0200)]
Close hole, fix clips/zfights