]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
Spike29 [Sat, 1 Jun 2019 11:23:44 +0000 (13:23 +0200)]
weapon_laser -> weapon_blaster
Spike29 [Sun, 3 Feb 2019 10:45:18 +0000 (11:45 +0100)]
Fix turret stuck inside a brush
Spike29 [Sat, 2 Feb 2019 18:50:35 +0000 (19:50 +0100)]
Add visual details on the turret room
Spike29 [Sat, 2 Feb 2019 18:48:58 +0000 (19:48 +0100)]
Merge branch 'master' into Spike29/tutorial_level1
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
Spike29 [Fri, 19 Oct 2018 09:23:59 +0000 (11:23 +0200)]
Tweak mapinfo (remove timelimit and hide the map from the menu)
Spike29 [Wed, 17 Oct 2018 19:39:09 +0000 (21:39 +0200)]
Merge branch 'master' into Spike29/tutorial_level1
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
Spike29 [Mon, 15 Oct 2018 17:25:52 +0000 (19:25 +0200)]
Reset health to 100 after the blaster room too
Spike29 [Mon, 15 Oct 2018 17:19:59 +0000 (19:19 +0200)]
Add visual details in the shotgun room
Spike29 [Sun, 14 Oct 2018 17:44:37 +0000 (19:44 +0200)]
Revert 'Add 'health 100' key to target_remove_all_items', for some reason it only works when health is above 100
Spike29 [Sun, 14 Oct 2018 17:39:58 +0000 (19:39 +0200)]
Add a sound when the shotgun slap button is activated
Spike29 [Sun, 14 Oct 2018 17:31:54 +0000 (19:31 +0200)]
Tweak the turret room
Spike29 [Sun, 14 Oct 2018 17:04:27 +0000 (19:04 +0200)]
Add a 6th zombie in the shooting range
Spike29 [Sat, 13 Oct 2018 08:58:01 +0000 (10:58 +0200)]
Add 'health 100' key to target_remove_all_items
Spike29 [Sun, 7 Oct 2018 10:04:59 +0000 (12:04 +0200)]
Set health to 100 when entering the turret room
Spike29 [Sun, 7 Oct 2018 09:59:38 +0000 (11:59 +0200)]
Replace the func_door with a func_button in the shotgun slap part
Spike29 [Sun, 7 Oct 2018 08:37:06 +0000 (10:37 +0200)]
Simplify the exit room, the door system was broken
Spike29 [Sat, 6 Oct 2018 19:28:47 +0000 (21:28 +0200)]
Remove 2 unused entities
Spike29 [Sat, 6 Oct 2018 19:25:20 +0000 (21:25 +0200)]
Add a shotgun secondary (shotgun slap) practice part
Spike29 [Sat, 6 Oct 2018 18:23:02 +0000 (20:23 +0200)]
New exit room: reach the door before a turret kills you, pick up health & armor pickups on the way
Spike29 [Sat, 6 Oct 2018 08:53:33 +0000 (10:53 +0200)]
Replace the glass with a force field in the shooting range
Spike29 [Sat, 29 Sep 2018 18:00:07 +0000 (20:00 +0200)]
Remove the 'dontaccumulatedmg' spawnflag on buttons
Spike29 [Mon, 24 Sep 2018 08:16:19 +0000 (10:16 +0200)]
Clarify the blaster jump text intructions
Spike29 [Sun, 23 Sep 2018 16:43:19 +0000 (18:43 +0200)]
Shorten the crouch/jump room
Spike29 [Sun, 23 Sep 2018 16:11:52 +0000 (18:11 +0200)]
Add a room for shotgun practice (needs polishing)
Spike29 [Fri, 21 Sep 2018 17:29:07 +0000 (19:29 +0200)]
Merge branch 'master' into Spike29/tutorial_level1
Mirio [Fri, 21 Sep 2018 16:12:44 +0000 (18:12 +0200)]
Push atelier file again, so comments get removed
Spike29 [Wed, 19 Sep 2018 21:54:49 +0000 (23:54 +0200)]
Add more 'well done' triggers
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
Spike29 [Tue, 18 Sep 2018 20:49:22 +0000 (22:49 +0200)]
New import
Spike29 [Tue, 18 Sep 2018 20:41:02 +0000 (22:41 +0200)]
Merge branch 'master' into Spike29/tutorial_level1
Mario [Tue, 18 Sep 2018 00:56:52 +0000 (10:56 +1000)]
Fix a missing closing bracket in erbium's shader
Spike29 [Sun, 16 Sep 2018 11:37:34 +0000 (13:37 +0200)]
Put more weapons on the shooting range
Spike29 [Sat, 15 Sep 2018 18:58:50 +0000 (20:58 +0200)]
Small texture cleanups
Spike29 [Sat, 15 Sep 2018 17:12:37 +0000 (19:12 +0200)]
Add more checkpoints in rooms where you might kill yourself
Spike29 [Sat, 15 Sep 2018 16:33:21 +0000 (18:33 +0200)]
Fix a target2 name
Spike29 [Sat, 15 Sep 2018 13:26:35 +0000 (15:26 +0200)]
Initial import
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
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