]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
Lyberta [Fri, 16 Aug 2019 17:05:10 +0000 (20:05 +0300)]
Merge branch 'Lyberta/Survival' into Lyberta/master
Lyberta [Fri, 16 Aug 2019 17:04:24 +0000 (20:04 +0300)]
Merge branch 'Lyberta/GunGame' into Lyberta/master
Lyberta [Fri, 16 Aug 2019 17:02:38 +0000 (20:02 +0300)]
Merge branch 'master' into Lyberta/Survival
Lyberta [Fri, 16 Aug 2019 17:00:28 +0000 (20:00 +0300)]
Merge branch 'master' into Lyberta/GunGame
Mirio [Tue, 6 Aug 2019 13:34:49 +0000 (15:34 +0200)]
Campaign: Fix Nexball level
Mirio [Mon, 5 Aug 2019 18:10:46 +0000 (20:10 +0200)]
Change trim texture
Mirio [Sat, 3 Aug 2019 16:00:01 +0000 (18:00 +0200)]
Geoplanetary: Rework warpzones, fix entity names
Mirio [Sat, 3 Aug 2019 15:23:04 +0000 (17:23 +0200)]
Geoplanetary: Fix visible caulk
Mirio [Sat, 3 Aug 2019 15:19:28 +0000 (17:19 +0200)]
Fix #160
Mirio [Wed, 24 Jul 2019 18:25:13 +0000 (20:25 +0200)]
Fix DOM control point messages
Mirio [Tue, 23 Jul 2019 14:39:40 +0000 (16:39 +0200)]
Fix #156
Mirio [Mon, 1 Jul 2019 13:02:14 +0000 (15:02 +0200)]
Add clip for smoother movement at 50a
Mirio [Mon, 15 Apr 2019 14:19:17 +0000 (14:19 +0000)]
Change Laser to Blaster and fix few cvar names
Mirio [Thu, 28 Feb 2019 22:23:51 +0000 (23:23 +0100)]
Hopefully final jumppad fix
Mirio [Mon, 25 Feb 2019 21:44:11 +0000 (22:44 +0100)]
Implosion: Fix launchpads scale
Mirio [Mon, 25 Feb 2019 21:43:40 +0000 (22:43 +0100)]
Fix launchpads scale
Mirio [Sun, 24 Feb 2019 20:32:45 +0000 (21:32 +0100)]
Revert lod models, it is causing issues with older clients
Mirio [Mon, 11 Feb 2019 10:06:36 +0000 (11:06 +0100)]
Update slick shader
Mirio [Sun, 10 Feb 2019 19:18:44 +0000 (20:18 +0100)]
Add slick texture - thanks hotdog
Mirio [Sat, 9 Feb 2019 16:48:48 +0000 (17:48 +0100)]
Revert jumppads on Erbium, Fuse and Glowplant
Mirio [Fri, 8 Feb 2019 14:16:31 +0000 (15:16 +0100)]
Add -sRGB flag to Geoplanetary and Erbium
Mirio [Fri, 8 Feb 2019 11:42:31 +0000 (12:42 +0100)]
Xoylent: Remove empty func_group entity
Mirio [Fri, 8 Feb 2019 11:41:27 +0000 (12:41 +0100)]
Warfare: Remove info_location entities
Mirio [Fri, 8 Feb 2019 11:26:13 +0000 (12:26 +0100)]
Vorix: Remove info_location entities
Mirio [Fri, 8 Feb 2019 11:25:17 +0000 (12:25 +0100)]
Teachassault: Remove empty func_ entities
Mirio [Fri, 8 Feb 2019 11:23:27 +0000 (12:23 +0100)]
Stormkeep: Remove empty func_ entity
Mirio [Fri, 8 Feb 2019 11:21:12 +0000 (12:21 +0100)]
Nexball Arena: Remove empty func_group entities
Mirio [Fri, 8 Feb 2019 11:19:15 +0000 (12:19 +0100)]
Fuse: Remove empty func_group entities
Mirio [Fri, 8 Feb 2019 11:18:07 +0000 (12:18 +0100)]
Final Rage: Remove info_location entities
Mirio [Fri, 8 Feb 2019 11:16:06 +0000 (12:16 +0100)]
Erbium: Remove empty func_group entity
Mirio [Fri, 8 Feb 2019 11:15:22 +0000 (12:15 +0100)]
Drain: Remove empty func_rain entities
Mirio [Fri, 8 Feb 2019 11:10:54 +0000 (12:10 +0100)]
Atelier: Remove empty func_groups
Mirio [Fri, 8 Feb 2019 11:06:30 +0000 (12:06 +0100)]
Remove empty func_groups
Mirio [Fri, 8 Feb 2019 10:25:40 +0000 (10:25 +0000)]
Merge branch 'Spike29/silentsiege' into 'master'
Minor cleanups on Silentsiege
See merge request xonotic/xonotic-maps.pk3dir!133
SpiKe [Fri, 8 Feb 2019 10:25:40 +0000 (10:25 +0000)]
Minor cleanups on Silentsiege
Mirio [Wed, 6 Feb 2019 17:54:51 +0000 (18:54 +0100)]
Geoplanetary: Improve bottom
Mirio [Wed, 6 Feb 2019 17:52:41 +0000 (18:52 +0100)]
Make all jumppads consistens and be misc_gamemodels
Mirio [Tue, 5 Feb 2019 14:42:08 +0000 (15:42 +0100)]
Geoplanetary: Cleanup, hide underneath better
Mirio [Tue, 5 Feb 2019 13:11:40 +0000 (14:11 +0100)]
Hide Oilrig
terencehill [Wed, 19 Dec 2018 12:06:47 +0000 (12:06 +0000)]
Update space-elevator.waypoints.hardwired
Mirio [Wed, 7 Nov 2018 00:49:11 +0000 (00:49 +0000)]
Merge branch 'Spike29/entities.ent_typo' into 'master'
Fix a minor typo in entities.ent (bruch -> brush)
See merge request xonotic/xonotic-maps.pk3dir!131
SpiKe [Tue, 6 Nov 2018 19:48:52 +0000 (19:48 +0000)]
Fix a minor typo in entities.ent (bruch -> brush)
Mirio [Wed, 31 Oct 2018 00:20:46 +0000 (00:20 +0000)]
Merge branch 'packer/vorix' into 'master'
Vorix: Updated hints and detail brushes
See merge request xonotic/xonotic-maps.pk3dir!128
Mirio [Wed, 31 Oct 2018 00:20:30 +0000 (00:20 +0000)]
Merge branch 'Spike29/solarium_fix' into 'master'
Minor fixes on Solarium
See merge request xonotic/xonotic-maps.pk3dir!130
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'
Solarium: fix a visible caulk (part of #155)
See merge request xonotic/xonotic-maps.pk3dir!127
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'
Add two missing patches below the map, fix #154
Closes #154
See merge request xonotic/xonotic-maps.pk3dir!126
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'
Misaligned texture fix on Atelier
See merge request xonotic/xonotic-maps.pk3dir!123
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'
Finalrage: fix an unlinked light target
See merge request xonotic/xonotic-maps.pk3dir!122
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'
fix error
See merge request xonotic/xonotic-maps.pk3dir!121
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'
Document trigger_reverse field in entity descriptions
Closes #109
See merge request xonotic/xonotic-maps.pk3dir!120
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'
Update waypoints to version 1.01 with symmetry information
See merge request xonotic/xonotic-maps.pk3dir!118
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'
Warn devs about adding new cvars to campaign
See merge request xonotic/xonotic-maps.pk3dir!119
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'
Updated entities.ent.
See merge request xonotic/xonotic-maps.pk3dir!110
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