xonotic/xonotic-maps.pk3dir.git
21 months agoimprove hints, more detail brushes
packer [Sun, 28 Oct 2018 12:29:25 +0000 (13:29 +0100)]
improve hints, more detail brushes

21 months agoGeoplanetary: Fix jumppads, some patches and tunnel texture
Mirio [Tue, 23 Oct 2018 23:33:43 +0000 (01:33 +0200)]
Geoplanetary: Fix jumppads, some patches and tunnel texture

21 months agoErbium: Change clips into wepclips on stairs
Mirio [Tue, 23 Oct 2018 23:18:49 +0000 (01:18 +0200)]
Erbium: Change clips into wepclips on stairs

21 months agoStormkeep: Fix misaligned texture
Mirio [Tue, 23 Oct 2018 23:15:23 +0000 (01:15 +0200)]
Stormkeep: Fix misaligned texture

21 months agoStormkeep: Fix misaligned texture
Mirio [Tue, 23 Oct 2018 23:15:11 +0000 (01:15 +0200)]
Stormkeep: Fix misaligned texture

21 months agoMerge branch 'Spike29/space-elevator_fix154' into 'master'
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

21 months agoAdd two missing patches below the map, fix #154
SpiKe [Sat, 20 Oct 2018 18:08:59 +0000 (18:08 +0000)]
Add two missing patches below the map, fix #154

21 months agoHide drain from the menu
Mario [Wed, 17 Oct 2018 08:05:39 +0000 (18:05 +1000)]
Hide drain from the menu

21 months agoActually add the missing orange lod texture for jumppad
Mario [Tue, 16 Oct 2018 21:51:16 +0000 (07:51 +1000)]
Actually add the missing orange lod texture for jumppad

21 months agoFix an inconsistency with jumppad LOD skins
Mario [Tue, 16 Oct 2018 19:29:29 +0000 (05:29 +1000)]
Fix an inconsistency with jumppad LOD skins

22 months agoPush atelier file again, so comments get removed
Mirio [Fri, 21 Sep 2018 16:12:44 +0000 (18:12 +0200)]
Push atelier file again, so comments get removed

22 months agoMerge branch 'Spike29/atelier_texture_fix' into 'master'
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

22 months agoMisaligned texture fix on Atelier
SpiKe [Wed, 19 Sep 2018 15:45:47 +0000 (15:45 +0000)]
Misaligned texture fix on Atelier

22 months agoFix a missing closing bracket in erbium's shader
Mario [Tue, 18 Sep 2018 00:56:52 +0000 (10:56 +1000)]
Fix a missing closing bracket in erbium's shader

22 months agoMake work timelimit
terencehill [Tue, 11 Sep 2018 21:20:41 +0000 (21:20 +0000)]
Make work timelimit

22 months agoUse settemp_for_type, for some reason settemp doesn't work
terencehill [Tue, 11 Sep 2018 20:51:55 +0000 (20:51 +0000)]
Use settemp_for_type, for some reason settemp doesn't work

22 months ago_hudsetup map: no bots, infinite timelimit
terencehill [Mon, 10 Sep 2018 13:48:54 +0000 (13:48 +0000)]
_hudsetup map: no bots, infinite timelimit

22 months agoRevert "Add the trans surface parameter to nodrawnonsolid"
Mario [Mon, 10 Sep 2018 13:19:55 +0000 (23:19 +1000)]
Revert "Add the trans surface parameter to nodrawnonsolid"

This reverts commit 49cd4967c67c16e10fc036445cd9a811adbf8937.

22 months agoAdd the trans surface parameter to nodrawnonsolid
Mario [Sun, 9 Sep 2018 14:06:42 +0000 (00:06 +1000)]
Add the trans surface parameter to nodrawnonsolid

23 months agoWaypoints: add timestamps, optimize by reducing number of waypoints without sacrifici...
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)

23 months agoRemove leading space in a campaign level description
terencehill [Fri, 17 Aug 2018 15:11:32 +0000 (15:11 +0000)]
Remove leading space in a campaign level description

2 years agoMerge branch 'Spike29/finalrage_lightfix' into 'master'
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

2 years agoFinalrage: fix an unlinked light target
SpiKe [Thu, 12 Jul 2018 21:50:47 +0000 (21:50 +0000)]
Finalrage: fix an unlinked light target

2 years agoUpdate vorix.map.options
Mirio [Sat, 16 Jun 2018 10:40:10 +0000 (10:40 +0000)]
Update vorix.map.options

2 years agoMerge branch 'vorix-fix' into 'master'
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

2 years agofix error 121/head
packer- [Sat, 16 Jun 2018 10:15:55 +0000 (10:15 +0000)]
fix error

2 years agoFix some inconsistency with barrels
Mirio [Fri, 15 Jun 2018 21:19:59 +0000 (23:19 +0200)]
Fix some inconsistency with barrels

2 years agoImplement #150
Mirio [Fri, 15 Jun 2018 21:12:38 +0000 (23:12 +0200)]
Implement #150

2 years agoAdd lodmodels to jumppads. Also update to new entity names
Mirio [Mon, 11 Jun 2018 23:42:45 +0000 (01:42 +0200)]
Add lodmodels to jumppads. Also update to new entity names

2 years agoCompile Dance again
Mirio [Mon, 11 Jun 2018 16:56:33 +0000 (18:56 +0200)]
Compile Dance again

2 years agoDance: Fix wrong texture
Mirio [Thu, 7 Jun 2018 15:21:06 +0000 (17:21 +0200)]
Dance: Fix wrong texture

2 years agoDance: Fix wrong texture
Mirio [Thu, 7 Jun 2018 15:20:24 +0000 (17:20 +0200)]
Dance: Fix wrong texture

2 years agoMerge branch 'DefaultUser/document_trigger_reverse' into 'master'
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

2 years agoDocument trigger_reverse field in entity descriptions 120/head
Freddy [Fri, 27 Apr 2018 20:25:35 +0000 (22:25 +0200)]
Document trigger_reverse field in entity descriptions

2 years agoMerge branch 'terencehill/bot_waypoints' into 'master'
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

2 years agoChange old weapon names to new
Mirio [Wed, 25 Apr 2018 14:38:38 +0000 (16:38 +0200)]
Change old weapon names to new

2 years agoFix more conflicts
Mirio [Wed, 25 Apr 2018 14:23:57 +0000 (16:23 +0200)]
Fix more conflicts

2 years agoFix merge conflict DefaultUser/doors 116/head
Mirio [Wed, 25 Apr 2018 14:13:37 +0000 (16:13 +0200)]
Fix merge conflict

2 years agoMerge branch 'martin-t/cvar-warn' into 'master'
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

2 years agowarn devs about adding new cvars to campaign 119/head
Martin Taibr [Sun, 22 Apr 2018 01:19:42 +0000 (03:19 +0200)]
warn devs about adding new cvars to campaign

2 years agoMerge branch 'Lyberta/NewItemNames' into 'master'
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

2 years agoImprove "movedir" description for func_sparks and func_pointparticles
Freddy [Sun, 15 Apr 2018 22:33:00 +0000 (00:33 +0200)]
Improve "movedir" description for func_sparks and func_pointparticles

2 years agoUpdate waypoints to version 1.01 with symmetry information 118/head
terencehill [Wed, 11 Apr 2018 14:10:41 +0000 (16:10 +0200)]
Update waypoints to version 1.01 with symmetry information

2 years agoRemove stuff outside the map to improve performance
Mirio [Thu, 22 Mar 2018 22:15:40 +0000 (23:15 +0100)]
Remove stuff outside the map to improve performance

2 years agoGeoplanetary: Remove clips from pillars
Mirio [Sun, 18 Mar 2018 13:34:30 +0000 (14:34 +0100)]
Geoplanetary: Remove clips from pillars

2 years agoCourtfun: Fix some clipping
Mirio [Sun, 18 Mar 2018 13:32:54 +0000 (14:32 +0100)]
Courtfun: Fix some clipping

2 years agoDance: Fix missing texture
Mirio [Sun, 18 Mar 2018 13:30:27 +0000 (14:30 +0100)]
Dance: Fix missing texture

2 years agoupdate description for trigger_music
Freddy [Sat, 17 Mar 2018 15:09:48 +0000 (16:09 +0100)]
update description for trigger_music

2 years agotrigger_push: note about velocity
Freddy [Tue, 13 Mar 2018 18:24:13 +0000 (19:24 +0100)]
trigger_push: note about velocity

2 years agoImprove trigger_impulse description
Freddy [Mon, 12 Mar 2018 19:07:47 +0000 (20:07 +0100)]
Improve trigger_impulse description

2 years agomisc_laser: remove mention of colormod
Freddy [Mon, 12 Mar 2018 15:15:43 +0000 (16:15 +0100)]
misc_laser: remove mention of colormod

2 years agoimprove trigger_heal description, add target_heal
Freddy [Mon, 12 Mar 2018 15:03:20 +0000 (16:03 +0100)]
improve trigger_heal description, add target_heal

2 years agotrigger_gravity: support relays, minor improvements to entity description
Freddy [Mon, 12 Mar 2018 14:34:10 +0000 (15:34 +0100)]
trigger_gravity: support relays, minor improvements to entity description

2 years agotrigger_counter: document hidden feature
Freddy [Sun, 11 Mar 2018 16:46:34 +0000 (17:46 +0100)]
trigger_counter: document hidden feature

2 years agotarget_speaker: GLOBAL is deprecated
Freddy [Sun, 11 Mar 2018 16:19:17 +0000 (17:19 +0100)]
target_speaker: GLOBAL is deprecated

2 years agoAdd target_kill and target_levelwarp to entities.ent
Freddy [Sun, 11 Mar 2018 15:24:07 +0000 (16:24 +0100)]
Add target_kill and target_levelwarp to entities.ent

2 years agoextend trigger_changelevel definitions
Freddy [Sun, 11 Mar 2018 14:42:19 +0000 (15:42 +0100)]
extend trigger_changelevel definitions

2 years agoUpdate entities.ent for misc_laser
Freddy [Sat, 10 Mar 2018 20:30:19 +0000 (21:30 +0100)]
Update entities.ent for misc_laser

2 years agoRemove legacy item_key1 and item_key2, use item_key instead
Freddy [Sat, 10 Mar 2018 16:34:51 +0000 (17:34 +0100)]
Remove legacy item_key1 and item_key2, use item_key instead

2 years agoUpdate entities.ent for func_train and path_corner
Freddy [Fri, 9 Mar 2018 17:39:46 +0000 (18:39 +0100)]
Update entities.ent for func_train and path_corner

2 years agofunc_rain and func_snow: use cnt instead of colormap
Freddy [Fri, 9 Mar 2018 13:26:23 +0000 (14:26 +0100)]
func_rain and func_snow: use cnt instead of colormap

colormap is an engine field and might cause problems

2 years agoRemove entities.ent.orig, was commited by mistake
Freddy [Fri, 9 Mar 2018 02:03:49 +0000 (03:03 +0100)]
Remove entities.ent.orig, was commited by mistake

2 years agoUpdate entities.ent for snow and rain
Freddy [Fri, 9 Mar 2018 01:50:49 +0000 (02:50 +0100)]
Update entities.ent for snow and rain

2 years agoAdd func_sparks to entities.ent
Freddy [Thu, 8 Mar 2018 14:57:04 +0000 (15:57 +0100)]
Add func_sparks to entities.ent

2 years agofunc_pointparticles uses relays now
Freddy [Wed, 7 Mar 2018 20:54:58 +0000 (21:54 +0100)]
func_pointparticles uses relays now

2 years agofunc_plat: fix inconsistencies
Freddy [Wed, 7 Mar 2018 16:57:04 +0000 (17:57 +0100)]
func_plat: fix inconsistencies

2 years agoConveyors now use relays for (de)activation
Freddy [Wed, 7 Mar 2018 16:21:38 +0000 (17:21 +0100)]
Conveyors now use relays for (de)activation

2 years agoImprove func_button and *_conveyor entity descriptions
Freddy [Tue, 6 Mar 2018 23:02:01 +0000 (00:02 +0100)]
Improve func_button and *_conveyor entity descriptions

2 years agoMerge branch 'bot_waypoints' into 'master'
terencehill [Tue, 6 Mar 2018 22:20:44 +0000 (22:20 +0000)]
Merge branch 'bot_waypoints' into 'master'

Bot waypoints

Slightly improve runningman waypoints

See merge request xonotic/xonotic-maps.pk3dir!117

2 years agoBot waypoints
terencehill [Tue, 6 Mar 2018 22:20:44 +0000 (22:20 +0000)]
Bot waypoints

2 years agoImprove entity description for doors
Freddy [Mon, 5 Mar 2018 20:50:22 +0000 (21:50 +0100)]
Improve entity description for doors

2 years agoFix #148
Mirio [Sat, 24 Feb 2018 13:32:58 +0000 (14:32 +0100)]
Fix #148

2 years agoMerge branch '147-bots-can-get-stuck-on-courtfun' into 'master'
terencehill [Sun, 18 Feb 2018 10:05:14 +0000 (10:05 +0000)]
Merge branch '147-bots-can-get-stuck-on-courtfun' into 'master'

Resolve "Bots can get stuck on courtfun"

Closes #147

See merge request xonotic/xonotic-maps.pk3dir!115

2 years agoResolve "Bots can get stuck on courtfun"
terencehill [Sun, 18 Feb 2018 10:05:14 +0000 (10:05 +0000)]
Resolve "Bots can get stuck on courtfun"

2 years agoFix broken textures
Mirio [Fri, 16 Feb 2018 13:47:45 +0000 (14:47 +0100)]
Fix broken textures

2 years agoFix invisible ledge
Mirio [Thu, 15 Feb 2018 22:06:17 +0000 (23:06 +0100)]
Fix invisible ledge

2 years agoUpdate techassault.map.options
Mirio [Sun, 11 Feb 2018 12:35:35 +0000 (12:35 +0000)]
Update techassault.map.options

2 years agoMerge branch 'Spike29/techassault_clipfix' into 'master'
Mirio [Sat, 10 Feb 2018 16:12:39 +0000 (16:12 +0000)]
Merge branch 'Spike29/techassault_clipfix' into 'master'

Techassault - clip the fan grids

See merge request xonotic/xonotic-maps.pk3dir!114

2 years agoClip the grids below the fans in the spawn rooms 114/head
Yannick Le Guen [Sat, 10 Feb 2018 10:46:10 +0000 (11:46 +0100)]
Clip the grids below the fans in the spawn rooms

2 years agoMerge branch 'Spike29/drain_tinyfix' into 'master'
Mirio [Sat, 10 Feb 2018 00:03:11 +0000 (00:03 +0000)]
Merge branch 'Spike29/drain_tinyfix' into 'master'

Drain - fix a tiny missing texture in the MH room

See merge request xonotic/xonotic-maps.pk3dir!113

2 years agoDrain - fix a tiny missing texture in the MH room
SpiKe [Sat, 10 Feb 2018 00:02:39 +0000 (00:02 +0000)]
Drain - fix a tiny missing texture in the MH room

2 years agoMerge branch 'terencehill/techassault_waypoints' into 'master'
terencehill [Wed, 7 Feb 2018 16:31:55 +0000 (16:31 +0000)]
Merge branch 'terencehill/techassault_waypoints' into 'master'

Improve and update Techassault waypoints, they were broken
Campaign: re-enable Assault level since bots can play it

See merge request xonotic/xonotic-maps.pk3dir!112

2 years agoTechassault waypoints
terencehill [Wed, 7 Feb 2018 16:31:24 +0000 (16:31 +0000)]
Techassault waypoints

2 years agoMerge branch 'master' of https://gitlab.com/xonotic/xonotic-maps.pk3dir
Mario [Wed, 7 Feb 2018 15:13:16 +0000 (01:13 +1000)]
Merge branch 'master' of https://gitlab.com/xonotic/xonotic-maps.pk3dir

2 years agoFix trigger_viewlocation and add target_spawnpoint
Mario [Wed, 7 Feb 2018 15:12:04 +0000 (01:12 +1000)]
Fix trigger_viewlocation and add target_spawnpoint

2 years agoMerge branch 'martin-t/typo' into 'master'
Mirio [Sun, 4 Feb 2018 22:28:52 +0000 (22:28 +0000)]
Merge branch 'martin-t/typo' into 'master'

Fix typo in campaign level 3

See merge request xonotic/xonotic-maps.pk3dir!111

2 years agofix typo in campaign level 3 111/head
Martin Taibr [Sun, 4 Feb 2018 22:11:41 +0000 (23:11 +0100)]
fix typo in campaign level 3

2 years agoAdd trigger_viewlocation to entity list
Mario [Sat, 27 Jan 2018 14:15:11 +0000 (00:15 +1000)]
Add trigger_viewlocation to entity list

2 years agoMerge branch 'terencehill/bot_waypoints' into 'master'
Mario [Mon, 22 Jan 2018 11:46:06 +0000 (11:46 +0000)]
Merge branch 'terencehill/bot_waypoints' into 'master'

bot waypoints

See merge request xonotic/xonotic-maps.pk3dir!108

2 years agobot waypoints
terencehill [Mon, 22 Jan 2018 11:45:30 +0000 (11:45 +0000)]
bot waypoints

2 years agoAdd monsterclip to common shader
Mario [Thu, 18 Jan 2018 05:05:32 +0000 (15:05 +1000)]
Add monsterclip to common shader

2 years agoAdd the image too...
Mario [Thu, 18 Jan 2018 05:04:53 +0000 (15:04 +1000)]
Add the image too...

2 years agoUpdated entities.ent. 110/head
Lyberta [Sat, 30 Dec 2017 18:21:58 +0000 (21:21 +0300)]
Updated entities.ent.

2 years agoFix loud sparks noise
Mirio [Sun, 10 Dec 2017 20:44:10 +0000 (21:44 +0100)]
Fix loud sparks noise

2 years agooptions file
Mirio [Thu, 30 Nov 2017 22:37:36 +0000 (23:37 +0100)]
options file

2 years agoFix #139 with packer solution
Mirio [Thu, 30 Nov 2017 22:37:03 +0000 (23:37 +0100)]
Fix #139 with packer solution

2 years agoMerge branch 'Mirio/boil' into 'master'
Mirio [Thu, 30 Nov 2017 18:41:26 +0000 (18:41 +0000)]
Merge branch 'Mirio/boil' into 'master'

Mirio/boil

Closes #139

See merge request xonotic/xonotic-maps.pk3dir!109

2 years agoFix z-fight 109/head
Mirio [Thu, 30 Nov 2017 15:41:41 +0000 (16:41 +0100)]
Fix z-fight

2 years agoFix #137
Mirio [Thu, 30 Nov 2017 15:07:38 +0000 (16:07 +0100)]
Fix #137

2 years agomore glass
Mirio [Thu, 30 Nov 2017 14:10:17 +0000 (15:10 +0100)]
more glass