]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
Mirio [Sat, 10 Feb 2018 16:12:39 +0000 (16:12 +0000)]
Merge branch 'Spike29/techassault_clipfix' into 'master'
Yannick Le Guen [Sat, 10 Feb 2018 10:46:10 +0000 (11:46 +0100)]
Clip the grids below the fans in the spawn rooms
Mirio [Sat, 10 Feb 2018 00:03:11 +0000 (00:03 +0000)]
Merge branch 'Spike29/drain_tinyfix' into 'master'
SpiKe [Sat, 10 Feb 2018 00:02:39 +0000 (00:02 +0000)]
Drain - fix a tiny missing texture in the MH room
terencehill [Wed, 7 Feb 2018 16:31:55 +0000 (16:31 +0000)]
Merge branch 'terencehill/techassault_waypoints' into 'master'
terencehill [Wed, 7 Feb 2018 16:31:24 +0000 (16:31 +0000)]
Techassault waypoints
Mario [Wed, 7 Feb 2018 15:13:16 +0000 (01:13 +1000)]
Merge branch 'master' of https://gitlab.com/xonotic/xonotic-maps.pk3dir
Mario [Wed, 7 Feb 2018 15:12:04 +0000 (01:12 +1000)]
Fix trigger_viewlocation and add target_spawnpoint
Mirio [Sun, 4 Feb 2018 22:28:52 +0000 (22:28 +0000)]
Merge branch 'martin-t/typo' into 'master'
Martin Taibr [Sun, 4 Feb 2018 22:11:41 +0000 (23:11 +0100)]
fix typo in campaign level 3
Mario [Sat, 27 Jan 2018 14:15:11 +0000 (00:15 +1000)]
Add trigger_viewlocation to entity list
Mario [Mon, 22 Jan 2018 11:46:06 +0000 (11:46 +0000)]
Merge branch 'terencehill/bot_waypoints' into 'master'
terencehill [Mon, 22 Jan 2018 11:45:30 +0000 (11:45 +0000)]
bot waypoints
Mario [Thu, 18 Jan 2018 05:05:32 +0000 (15:05 +1000)]
Add monsterclip to common shader
Mario [Thu, 18 Jan 2018 05:04:53 +0000 (15:04 +1000)]
Add the image too...
Mirio [Sun, 10 Dec 2017 20:44:10 +0000 (21:44 +0100)]
Fix loud sparks noise
Mirio [Thu, 30 Nov 2017 22:37:36 +0000 (23:37 +0100)]
options file
Mirio [Thu, 30 Nov 2017 22:37:03 +0000 (23:37 +0100)]
Fix #139 with packer solution
Mirio [Thu, 30 Nov 2017 18:41:26 +0000 (18:41 +0000)]
Merge branch 'Mirio/boil' into 'master'
Mirio [Thu, 30 Nov 2017 15:41:41 +0000 (16:41 +0100)]
Fix z-fight
Mirio [Thu, 30 Nov 2017 15:07:38 +0000 (16:07 +0100)]
Fix #137
Mirio [Thu, 30 Nov 2017 14:10:17 +0000 (15:10 +0100)]
more glass
Mario [Sat, 25 Nov 2017 02:25:05 +0000 (02:25 +0000)]
Merge branch 'DefaultUser/func_button_dont_accumulate_dmg' into 'master'
Mirio [Tue, 3 Oct 2017 18:59:18 +0000 (20:59 +0200)]
Fix skybox
Mirio [Mon, 2 Oct 2017 20:40:38 +0000 (22:40 +0200)]
Fix #139
Mirio [Mon, 2 Oct 2017 19:26:41 +0000 (19:26 +0000)]
Merge branch 'Spike29/implosion_fixes' into 'master'
SpiKe [Mon, 2 Oct 2017 19:26:41 +0000 (19:26 +0000)]
Small tweaks on Implosion
Freddy [Wed, 30 Aug 2017 21:44:13 +0000 (23:44 +0200)]
Update func_button flags for radiant
Mirio [Wed, 23 Aug 2017 16:33:23 +0000 (16:33 +0000)]
Merge branch 'DefaultUser/entity_description_update' into 'master'
Mirio [Wed, 23 Aug 2017 16:29:19 +0000 (18:29 +0200)]
Grammar Nazi
Freddy [Wed, 23 Aug 2017 11:40:45 +0000 (13:40 +0200)]
moveing -> moving
Freddy [Tue, 22 Aug 2017 23:53:12 +0000 (01:53 +0200)]
Improve entity descriptions for radiant
Mirio [Sat, 5 Aug 2017 16:03:42 +0000 (16:03 +0000)]
Update boil.map.options
Mirio [Sat, 5 Aug 2017 16:02:40 +0000 (16:02 +0000)]
Merge branch 'terencehill/boil_trigger_hurt' into 'master'
terencehill [Fri, 4 Aug 2017 12:12:24 +0000 (12:12 +0000)]
Move trigger_hurt down as the trigger_hurt box generated by the game extends in the middle of the map (teleport area), which is bad for 2 reasons: 1. bots inside or above it try to evade it by rocketjumping with the devastator (and other minor issues) 2. when a player is touching this trigger_hurt box, game does a quite expensive check in game (EXACTTRIGGER_TOUCH) every frame per player to see if they touch the trigger_hurt brush
Mirio [Fri, 21 Jul 2017 10:47:23 +0000 (10:47 +0000)]
Merge branch 'patch-1' into 'master'
munyul [Thu, 20 Jul 2017 18:24:46 +0000 (18:24 +0000)]
Update entities.ent, added more help information to the func_group group.
Mirio [Wed, 19 Jul 2017 16:45:02 +0000 (18:45 +0200)]
Fix #140 for real
Mirio [Mon, 17 Jul 2017 15:26:17 +0000 (17:26 +0200)]
Fix #140
Mirio [Wed, 21 Jun 2017 12:21:37 +0000 (12:21 +0000)]
Update shaderlist.txt
Mirio [Tue, 20 Jun 2017 13:06:05 +0000 (15:06 +0200)]
Fix Geoplanetary warnings: target_Light -> target_light
Mirio [Sat, 29 Apr 2017 13:11:23 +0000 (15:11 +0200)]
Move a spawnpoint
Mirio [Mon, 3 Apr 2017 14:27:21 +0000 (16:27 +0200)]
Solarium waypoints, see #130
Mirio [Sun, 2 Apr 2017 20:02:40 +0000 (22:02 +0200)]
Geoplanetary: Improve jumppads for bots
Mirio [Fri, 31 Mar 2017 20:12:05 +0000 (20:12 +0000)]
Merge branch 't0uYK8Ne/finalrage-lights' into 'master'
t0uYK8Ne [Fri, 31 Mar 2017 19:14:19 +0000 (12:14 -0700)]
finalrage: add back the ground lights along the lava
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'
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'
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'
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'
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'
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'
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 [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'
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'
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'
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'
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'
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
projects / xonotic / xonotic-maps.pk3dir.git / log