]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
Mirio [Wed, 31 Oct 2018 00:20:46 +0000 (00:20 +0000)]
Merge branch 'packer/vorix' into 'master'
Mirio [Wed, 31 Oct 2018 00:20:30 +0000 (00:20 +0000)]
Merge branch 'Spike29/solarium_fix' into 'master'
SpiKe [Wed, 31 Oct 2018 00:20:29 +0000 (00:20 +0000)]
Minor fixes on Solarium
Mirio [Sun, 28 Oct 2018 22:16:51 +0000 (22:16 +0000)]
Merge branch 'Spike29/solarium' into 'master'
SpiKe [Sun, 28 Oct 2018 22:16:51 +0000 (22:16 +0000)]
Solarium: fix a visible caulk (part of #155)
packer [Sun, 28 Oct 2018 13:43:09 +0000 (14:43 +0100)]
push version number
packer [Sun, 28 Oct 2018 12:29:25 +0000 (13:29 +0100)]
improve hints, more detail brushes
Mirio [Tue, 23 Oct 2018 23:33:43 +0000 (01:33 +0200)]
Geoplanetary: Fix jumppads, some patches and tunnel texture
Mirio [Tue, 23 Oct 2018 23:18:49 +0000 (01:18 +0200)]
Erbium: Change clips into wepclips on stairs
Mirio [Tue, 23 Oct 2018 23:15:23 +0000 (01:15 +0200)]
Stormkeep: Fix misaligned texture
Mirio [Tue, 23 Oct 2018 23:15:11 +0000 (01:15 +0200)]
Stormkeep: Fix misaligned texture
Martin Taibr [Sat, 20 Oct 2018 18:08:59 +0000 (18:08 +0000)]
Merge branch 'Spike29/space-elevator_fix154' into 'master'
SpiKe [Sat, 20 Oct 2018 18:08:59 +0000 (18:08 +0000)]
Add two missing patches below the map, fix #154
Mario [Wed, 17 Oct 2018 08:05:39 +0000 (18:05 +1000)]
Hide drain from the menu
Mario [Tue, 16 Oct 2018 21:51:16 +0000 (07:51 +1000)]
Actually add the missing orange lod texture for jumppad
Mario [Tue, 16 Oct 2018 19:29:29 +0000 (05:29 +1000)]
Fix an inconsistency with jumppad LOD skins
Mirio [Fri, 21 Sep 2018 16:12:44 +0000 (18:12 +0200)]
Push atelier file again, so comments get removed
Mirio [Wed, 19 Sep 2018 15:45:47 +0000 (15:45 +0000)]
Merge branch 'Spike29/atelier_texture_fix' into 'master'
SpiKe [Wed, 19 Sep 2018 15:45:47 +0000 (15:45 +0000)]
Misaligned texture fix on Atelier
Mario [Tue, 18 Sep 2018 00:56:52 +0000 (10:56 +1000)]
Fix a missing closing bracket in erbium's shader
terencehill [Tue, 11 Sep 2018 21:20:41 +0000 (21:20 +0000)]
Make work timelimit
terencehill [Tue, 11 Sep 2018 20:51:55 +0000 (20:51 +0000)]
Use settemp_for_type, for some reason settemp doesn't work
terencehill [Mon, 10 Sep 2018 13:48:54 +0000 (13:48 +0000)]
_hudsetup map: no bots, infinite timelimit
Mario [Mon, 10 Sep 2018 13:19:55 +0000 (23:19 +1000)]
Revert "Add the trans surface parameter to nodrawnonsolid"
This reverts commit
49cd4967c67c16e10fc036445cd9a811adbf8937 .
Mario [Sun, 9 Sep 2018 14:06:42 +0000 (00:06 +1000)]
Add the trans surface parameter to nodrawnonsolid
terencehill [Mon, 27 Aug 2018 21:03:43 +0000 (23:03 +0200)]
Waypoints: add timestamps, optimize by reducing number of waypoints without sacrificing quality too much, remove waypoints that were good only to unstuck bots from bad places (no longer needed thanks to the latest AI updates)
terencehill [Fri, 17 Aug 2018 15:11:32 +0000 (15:11 +0000)]
Remove leading space in a campaign level description
Mirio [Thu, 12 Jul 2018 21:50:47 +0000 (21:50 +0000)]
Merge branch 'Spike29/finalrage_lightfix' into 'master'
SpiKe [Thu, 12 Jul 2018 21:50:47 +0000 (21:50 +0000)]
Finalrage: fix an unlinked light target
Mirio [Sat, 16 Jun 2018 10:40:10 +0000 (10:40 +0000)]
Update vorix.map.options
Mirio [Sat, 16 Jun 2018 10:39:53 +0000 (10:39 +0000)]
Merge branch 'vorix-fix' into 'master'
packer- [Sat, 16 Jun 2018 10:15:55 +0000 (10:15 +0000)]
fix error
Mirio [Fri, 15 Jun 2018 21:19:59 +0000 (23:19 +0200)]
Fix some inconsistency with barrels
Mirio [Fri, 15 Jun 2018 21:12:38 +0000 (23:12 +0200)]
Implement #150
Mirio [Mon, 11 Jun 2018 23:42:45 +0000 (01:42 +0200)]
Add lodmodels to jumppads. Also update to new entity names
Mirio [Mon, 11 Jun 2018 16:56:33 +0000 (18:56 +0200)]
Compile Dance again
Mirio [Thu, 7 Jun 2018 15:21:06 +0000 (17:21 +0200)]
Dance: Fix wrong texture
Mirio [Thu, 7 Jun 2018 15:20:24 +0000 (17:20 +0200)]
Dance: Fix wrong texture
Mirio [Fri, 27 Apr 2018 20:32:20 +0000 (20:32 +0000)]
Merge branch 'DefaultUser/document_trigger_reverse' into 'master'
Freddy [Fri, 27 Apr 2018 20:25:35 +0000 (22:25 +0200)]
Document trigger_reverse field in entity descriptions
terencehill [Wed, 25 Apr 2018 19:52:33 +0000 (19:52 +0000)]
Merge branch 'terencehill/bot_waypoints' into 'master'
Mirio [Wed, 25 Apr 2018 14:38:38 +0000 (16:38 +0200)]
Change old weapon names to new
Mirio [Wed, 25 Apr 2018 14:23:57 +0000 (16:23 +0200)]
Fix more conflicts
Mirio [Wed, 25 Apr 2018 14:13:37 +0000 (16:13 +0200)]
Fix merge conflict
Mario [Sun, 22 Apr 2018 08:57:42 +0000 (08:57 +0000)]
Merge branch 'martin-t/cvar-warn' into 'master'
Martin Taibr [Sun, 22 Apr 2018 01:19:42 +0000 (03:19 +0200)]
warn devs about adding new cvars to campaign
Mirio [Mon, 16 Apr 2018 09:33:40 +0000 (09:33 +0000)]
Merge branch 'Lyberta/NewItemNames' into 'master'
Freddy [Sun, 15 Apr 2018 22:33:00 +0000 (00:33 +0200)]
Improve "movedir" description for func_sparks and func_pointparticles
terencehill [Wed, 11 Apr 2018 14:10:41 +0000 (16:10 +0200)]
Update waypoints to version 1.01 with symmetry information
Mirio [Thu, 22 Mar 2018 22:15:40 +0000 (23:15 +0100)]
Remove stuff outside the map to improve performance
Mirio [Sun, 18 Mar 2018 13:34:30 +0000 (14:34 +0100)]
Geoplanetary: Remove clips from pillars
Mirio [Sun, 18 Mar 2018 13:32:54 +0000 (14:32 +0100)]
Courtfun: Fix some clipping
Mirio [Sun, 18 Mar 2018 13:30:27 +0000 (14:30 +0100)]
Dance: Fix missing texture
Freddy [Sat, 17 Mar 2018 15:09:48 +0000 (16:09 +0100)]
update description for trigger_music
Freddy [Tue, 13 Mar 2018 18:24:13 +0000 (19:24 +0100)]
trigger_push: note about velocity
Freddy [Mon, 12 Mar 2018 19:07:47 +0000 (20:07 +0100)]
Improve trigger_impulse description
Freddy [Mon, 12 Mar 2018 15:15:43 +0000 (16:15 +0100)]
misc_laser: remove mention of colormod
Freddy [Mon, 12 Mar 2018 15:03:20 +0000 (16:03 +0100)]
improve trigger_heal description, add target_heal
Freddy [Mon, 12 Mar 2018 14:34:10 +0000 (15:34 +0100)]
trigger_gravity: support relays, minor improvements to entity description
Freddy [Sun, 11 Mar 2018 16:46:34 +0000 (17:46 +0100)]
trigger_counter: document hidden feature
Freddy [Sun, 11 Mar 2018 16:19:17 +0000 (17:19 +0100)]
target_speaker: GLOBAL is deprecated
Freddy [Sun, 11 Mar 2018 15:24:07 +0000 (16:24 +0100)]
Add target_kill and target_levelwarp to entities.ent
Freddy [Sun, 11 Mar 2018 14:42:19 +0000 (15:42 +0100)]
extend trigger_changelevel definitions
Freddy [Sat, 10 Mar 2018 20:30:19 +0000 (21:30 +0100)]
Update entities.ent for misc_laser
Freddy [Sat, 10 Mar 2018 16:34:51 +0000 (17:34 +0100)]
Remove legacy item_key1 and item_key2, use item_key instead
Freddy [Fri, 9 Mar 2018 17:39:46 +0000 (18:39 +0100)]
Update entities.ent for func_train and path_corner
Freddy [Fri, 9 Mar 2018 13:26:23 +0000 (14:26 +0100)]
func_rain and func_snow: use cnt instead of colormap
Freddy [Fri, 9 Mar 2018 02:03:49 +0000 (03:03 +0100)]
Remove entities.ent.orig, was commited by mistake
Freddy [Fri, 9 Mar 2018 01:50:49 +0000 (02:50 +0100)]
Update entities.ent for snow and rain
Freddy [Thu, 8 Mar 2018 14:57:04 +0000 (15:57 +0100)]
Add func_sparks to entities.ent
Freddy [Wed, 7 Mar 2018 20:54:58 +0000 (21:54 +0100)]
func_pointparticles uses relays now
Freddy [Wed, 7 Mar 2018 16:57:04 +0000 (17:57 +0100)]
func_plat: fix inconsistencies
Freddy [Wed, 7 Mar 2018 16:21:38 +0000 (17:21 +0100)]
Conveyors now use relays for (de)activation
Freddy [Tue, 6 Mar 2018 23:02:01 +0000 (00:02 +0100)]
Improve func_button and *_conveyor entity descriptions
terencehill [Tue, 6 Mar 2018 22:20:44 +0000 (22:20 +0000)]
Merge branch 'bot_waypoints' into 'master'
terencehill [Tue, 6 Mar 2018 22:20:44 +0000 (22:20 +0000)]
Bot waypoints
Freddy [Mon, 5 Mar 2018 20:50:22 +0000 (21:50 +0100)]
Improve entity description for doors
Mirio [Sat, 24 Feb 2018 13:32:58 +0000 (14:32 +0100)]
Fix #148
terencehill [Sun, 18 Feb 2018 10:05:14 +0000 (10:05 +0000)]
Merge branch '147-bots-can-get-stuck-on-courtfun' into 'master'
terencehill [Sun, 18 Feb 2018 10:05:14 +0000 (10:05 +0000)]
Resolve "Bots can get stuck on courtfun"
Mirio [Fri, 16 Feb 2018 13:47:45 +0000 (14:47 +0100)]
Fix broken textures
Mirio [Thu, 15 Feb 2018 22:06:17 +0000 (23:06 +0100)]
Fix invisible ledge
Mirio [Sun, 11 Feb 2018 12:35:35 +0000 (12:35 +0000)]
Update techassault.map.options
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...
Lyberta [Sat, 30 Dec 2017 18:21:58 +0000 (21:21 +0300)]
Updated entities.ent.
Mirio [Sun, 10 Dec 2017 20:44:10 +0000 (21:44 +0100)]
Fix loud sparks noise
projects / xonotic / xonotic-maps.pk3dir.git / log