]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
8 months agoMove trigger_counter entities inside the map, fixes a leak Spike29/tutorial_campaign 125/head
Spike29 [Sat, 30 Mar 2024 11:09:33 +0000 (12:09 +0100)]
Move trigger_counter entities inside the map, fixes a leak

8 months agoMove away trigger_counter entities from map origin
Spike29 [Sat, 30 Mar 2024 10:43:29 +0000 (11:43 +0100)]
Move away trigger_counter entities from map origin

8 months agoMerge branch 'master' into Spike29/tutorial_campaign
Spike29 [Sat, 30 Mar 2024 10:36:26 +0000 (11:36 +0100)]
Merge branch 'master' into Spike29/tutorial_campaign

8 months agoMerge branch 'Spike29/trigger_counter_fix'
Spike29 [Sat, 30 Mar 2024 10:15:05 +0000 (11:15 +0100)]
Merge branch 'Spike29/trigger_counter_fix'

9 months agoMerge branch 'Juhu/q3df_misc' into 'master'
Spike29 [Sun, 24 Mar 2024 11:33:08 +0000 (11:33 +0000)]
Merge branch 'Juhu/q3df_misc' into 'master'

Update entities.ent with newly supported q3df entities and flags

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

9 months agoAdd a note about the "speed" key in the target_speed entity when its value is 0
Spike29 [Sun, 24 Mar 2024 11:28:32 +0000 (12:28 +0100)]
Add a note about the "speed" key in the target_speed entity when its value is 0

9 months agoMerge branch 'bones_was_here/item_bboxes_2' into 'master'
bones_was_here [Thu, 14 Mar 2024 22:20:06 +0000 (22:20 +0000)]
Merge branch 'bones_was_here/item_bboxes_2' into 'master'

entities.ent: update small & medium health & armor bboxes

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

9 months agoentities.ent: update small & medium health & armor bboxes
bones_was_here [Thu, 14 Mar 2024 07:59:20 +0000 (17:59 +1000)]
entities.ent: update small & medium health & armor bboxes

See https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1234

10 months agoChange trigger_counter type to point
Spike29 [Wed, 21 Feb 2024 14:31:15 +0000 (15:31 +0100)]
Change trigger_counter type to point

11 months agoShorten a faux shader parameter to prevent truncation warnings
bones_was_here [Sun, 21 Jan 2024 14:30:27 +0000 (00:30 +1000)]
Shorten a faux shader parameter to prevent truncation warnings

11 months agoUpdate the Bromine screenshot (the grass no longer cast shadows)
Spike29 [Sat, 6 Jan 2024 13:56:41 +0000 (14:56 +0100)]
Update the Bromine screenshot (the grass no longer cast shadows)

11 months agoMerge branch 'uis/opt-trident' into 'master'
SpiKe [Mon, 1 Jan 2024 10:40:36 +0000 (10:40 +0000)]
Merge branch 'uis/opt-trident' into 'master'

A lot of changes improving Trident performance

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

11 months agoA lot of changes improving Trident performance
uis [Mon, 1 Jan 2024 10:40:36 +0000 (10:40 +0000)]
A lot of changes improving Trident performance

13 months agoMerge branch 'Spike29/misc_breakablemodel_fix' into 'master'
SpiKe [Wed, 8 Nov 2023 11:35:38 +0000 (11:35 +0000)]
Merge branch 'Spike29/misc_breakablemodel_fix' into 'master'

Change misc_breakablemodel type to point

Closes netradiant#188

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

13 months agoChange misc_breakablemodel type to point
SpiKe [Wed, 8 Nov 2023 11:35:38 +0000 (11:35 +0000)]
Change misc_breakablemodel type to point

16 months agoStormkeep: use new q3map2 default light settings
Spike29 [Thu, 17 Aug 2023 10:28:02 +0000 (12:28 +0200)]
Stormkeep: use new q3map2 default light settings

16 months agoAfterslime: rebuild with q3map2 backsplash disabled
Spike29 [Tue, 15 Aug 2023 12:23:14 +0000 (14:23 +0200)]
Afterslime: rebuild with q3map2 backsplash disabled

16 months agoFinal Rage: rebuild with q3map2 backsplash disabled
Spike29 [Tue, 15 Aug 2023 12:22:26 +0000 (14:22 +0200)]
Final Rage: rebuild with q3map2 backsplash disabled

16 months agofinalrage: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:08:52 +0000 (17:08 +1000)]
finalrage: use new q3map2 default light settings

16 months agoLeave_em_behind: fix nonsolid grates and glass
Spike29 [Wed, 7 Jun 2023 17:49:33 +0000 (19:49 +0200)]
Leave_em_behind: fix nonsolid grates and glass

16 months agoleave_em_behind: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:12:14 +0000 (17:12 +1000)]
leave_em_behind: use new q3map2 default light settings

17 months agoTechassault: fix a nonsolid grate
Spike29 [Wed, 7 Jun 2023 18:12:24 +0000 (20:12 +0200)]
Techassault: fix a nonsolid grate

17 months agotechassault: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:14:34 +0000 (17:14 +1000)]
techassault: use new q3map2 default light settings

17 months agoDarkzone: fix nonsolid grates
Spike29 [Wed, 7 Jun 2023 17:25:14 +0000 (19:25 +0200)]
Darkzone: fix nonsolid grates

17 months agodarkzone: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:08:28 +0000 (17:08 +1000)]
darkzone: use new q3map2 default light settings

17 months agoRemove a leftover file from the Nexuiz tutorial
Spike29 [Sun, 9 Jul 2023 09:19:16 +0000 (11:19 +0200)]
Remove a leftover file from the Nexuiz tutorial

17 months agoboil: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:06:54 +0000 (17:06 +1000)]
boil: use new q3map2 default light settings

17 months agodance: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:08:01 +0000 (17:08 +1000)]
dance: use new q3map2 default light settings

17 months agogeoplanetary: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:10:46 +0000 (17:10 +1000)]
geoplanetary: use new q3map2 default light settings

17 months agoimplosion: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:11:32 +0000 (17:11 +1000)]
implosion: use new q3map2 default light settings

17 months agoRunningman: fix a small z-fight
Spike29 [Sun, 2 Jul 2023 17:25:07 +0000 (19:25 +0200)]
Runningman: fix a small z-fight

17 months agorunningmanctf: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:13:24 +0000 (17:13 +1000)]
runningmanctf: use new q3map2 default light settings

17 months agorunningman: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:13:16 +0000 (17:13 +1000)]
runningman: use new q3map2 default light settings

17 months agovorix: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:14:57 +0000 (17:14 +1000)]
vorix: use new q3map2 default light settings

17 months agowarfare: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:15:06 +0000 (17:15 +1000)]
warfare: use new q3map2 default light settings

18 months agoBump Trident version xonotic-v0.8.6
Spike29 [Fri, 16 Jun 2023 14:03:21 +0000 (16:03 +0200)]
Bump Trident version

18 months agoTrident: fix misaligned textures
Spike29 [Fri, 16 Jun 2023 14:02:11 +0000 (16:02 +0200)]
Trident: fix misaligned textures

18 months agoafterslime: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:06:14 +0000 (17:06 +1000)]
afterslime: use new q3map2 default light settings

18 months agoNexballarena: fix nonsolid grates and glass
Spike29 [Wed, 7 Jun 2023 17:51:59 +0000 (19:51 +0200)]
Nexballarena: fix nonsolid grates and glass

18 months agonexballarena: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:12:41 +0000 (17:12 +1000)]
nexballarena: use new q3map2 default light settings

18 months agoTrident: Extend a clip that was too short + fix a tiny z-fight
Spike29 [Mon, 12 Jun 2023 16:35:12 +0000 (18:35 +0200)]
Trident: Extend a clip that was too short + fix a tiny z-fight

18 months ago_hudsetup: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:00:59 +0000 (17:00 +1000)]
_hudsetup: use new q3map2 default light settings

18 months agobromine: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:07:10 +0000 (17:07 +1000)]
bromine: use new q3map2 default light settings

18 months agotrident: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:14:47 +0000 (17:14 +1000)]
trident: use new q3map2 default light settings

18 months agogo: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:11:16 +0000 (17:11 +1000)]
go: use new q3map2 default light settings

18 months agoGlowplant: fix nonsolid grates
Spike29 [Wed, 7 Jun 2023 17:41:48 +0000 (19:41 +0200)]
Glowplant: fix nonsolid grates

18 months agoglowplant: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:11:01 +0000 (17:11 +1000)]
glowplant: use new q3map2 default light settings

18 months agoOpium: fix nonsolid grates
Spike29 [Wed, 7 Jun 2023 17:54:39 +0000 (19:54 +0200)]
Opium: fix nonsolid grates

18 months agoopium: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:13:05 +0000 (17:13 +1000)]
opium: use new q3map2 default light settings

18 months agoErbium: fix nonsolid grates
Spike29 [Wed, 7 Jun 2023 17:33:14 +0000 (19:33 +0200)]
Erbium: fix nonsolid grates

18 months agoErbium: Disable the grass shadows + use new q3map2 default light settings
Spike29 [Sat, 3 Jun 2023 09:10:14 +0000 (11:10 +0200)]
Erbium: Disable the grass shadows + use new q3map2 default light settings

18 months agoTrident: Minor texture aligments
Mirio [Fri, 2 Jun 2023 15:23:29 +0000 (17:23 +0200)]
Trident: Minor texture aligments

18 months agoMerge branch 'Spike29/bromine' into 'master'
SpiKe [Tue, 30 May 2023 18:16:46 +0000 (18:16 +0000)]
Merge branch 'Spike29/bromine' into 'master'

Bromine: disable the grass shadows + minor fixes

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

18 months agoBromine: disable the grass shadows + minor fixes
SpiKe [Tue, 30 May 2023 18:16:46 +0000 (18:16 +0000)]
Bromine: disable the grass shadows + minor fixes

18 months agoBump map version
Spike29 [Tue, 30 May 2023 16:58:17 +0000 (18:58 +0200)]
Bump map version

18 months agoTrident: Fix the new light brush not touching the ceiling
Spike29 [Tue, 30 May 2023 16:55:47 +0000 (18:55 +0200)]
Trident: Fix the new light brush not touching the ceiling

18 months agoTrident: Minor cleanup
Mirio [Tue, 30 May 2023 15:58:19 +0000 (17:58 +0200)]
Trident: Minor cleanup

18 months agoUpdate the Go screenshot
Spike29 [Tue, 30 May 2023 13:15:17 +0000 (15:15 +0200)]
Update the Go screenshot

19 months agoMerge branch 'pending-release' into 'master'
bones_was_here [Sun, 28 May 2023 05:32:20 +0000 (05:32 +0000)]
Merge branch 'pending-release' into 'master'

Merge pending-release into master

Closes #204

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

19 months agoentities.ent: update small & medium health & armor bbox heights to match 0.8.6
bones_was_here [Sun, 28 May 2023 04:20:56 +0000 (14:20 +1000)]
entities.ent: update small & medium health & armor bbox heights to match 0.8.6

19 months agoMerge branch 'drjaska/campaign_update' into 'pending-release'
SpiKe [Sat, 27 May 2023 18:55:35 +0000 (18:55 +0000)]
Merge branch 'drjaska/campaign_update' into 'pending-release'

Campaign update

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

19 months agoCampaign update
Dr. Jaska [Sat, 27 May 2023 18:55:35 +0000 (18:55 +0000)]
Campaign update

19 months agoTrident: relink the waypoints (the link between the MG and the nearest jump pad was...
Spike29 [Wed, 24 May 2023 20:33:16 +0000 (22:33 +0200)]
Trident: relink the waypoints (the link between the MG and the nearest jump pad was broken)

19 months agoTrident: fix misaligned textures on the wall behind the Electro
Spike29 [Wed, 24 May 2023 20:05:51 +0000 (22:05 +0200)]
Trident: fix misaligned textures on the wall behind the Electro

19 months agoMove sound/map_glowplant/spark.ogg to sound/machines/spark.ogg
Spike29 [Wed, 24 May 2023 15:47:41 +0000 (17:47 +0200)]
Move sound/map_glowplant/spark.ogg to sound/machines/spark.ogg

19 months agoentities.ent: Rename item_armor_mega from "Large Armor" to "Mega Armor"
bones_was_here [Mon, 22 May 2023 02:15:22 +0000 (12:15 +1000)]
entities.ent: Rename item_armor_mega from "Large Armor" to "Mega Armor"

19 months agoUpdate go.waypoints.cache
Spike29 [Sun, 21 May 2023 19:25:25 +0000 (21:25 +0200)]
Update go.waypoints.cache

19 months agoMerge branch 'master' into pending-release
Spike29 [Sun, 21 May 2023 19:06:25 +0000 (21:06 +0200)]
Merge branch 'master' into pending-release

19 months agoMerge branch 'bones_was_here/item_bboxes' into 'master'
SpiKe [Sun, 21 May 2023 18:54:16 +0000 (18:54 +0000)]
Merge branch 'bones_was_here/item_bboxes' into 'master'

Update entity definition bboxes to match 0.8.5 and/or xonotic-data.pk3dir!1131

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

19 months agoBump Afterslime map version
Spike29 [Sun, 21 May 2023 16:56:48 +0000 (18:56 +0200)]
Bump Afterslime map version

19 months agoAfterslime: Move 2 item_cells entities a bit so the left one doesn't appear to be...
Spike29 [Sun, 21 May 2023 16:54:38 +0000 (18:54 +0200)]
Afterslime: Move 2 item_cells entities a bit so the left one doesn't appear to be floating

19 months agoMerge branch 'master' into pending-release
Spike29 [Sun, 21 May 2023 12:13:05 +0000 (14:13 +0200)]
Merge branch 'master' into pending-release

19 months agoMerge branch 'debugger/go' into 'pending-release'
SpiKe [Sat, 20 May 2023 16:20:15 +0000 (16:20 +0000)]
Merge branch 'debugger/go' into 'pending-release'

Debugger/go

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

19 months agoDebugger/go
Mirio [Sat, 20 May 2023 16:20:13 +0000 (16:20 +0000)]
Debugger/go

19 months agoentities.ent: update dom_controlpoint bbox to match xonotic-data.pk3dir!1131
bones_was_here [Thu, 18 May 2023 15:09:57 +0000 (01:09 +1000)]
entities.ent: update dom_controlpoint bbox to match xonotic-data.pk3dir!1131

Previous values don't match 0.8.5

19 months agoentities.ent: update small & medium health & armor bbox heights to match xonotic...
bones_was_here [Thu, 18 May 2023 15:00:03 +0000 (01:00 +1000)]
entities.ent: update small & medium health & armor bbox heights to match xonotic-data.pk3dir!1131

19 months agoentities.ent: update weapon bbox heights to match 0.8.5
bones_was_here [Thu, 18 May 2023 14:55:51 +0000 (00:55 +1000)]
entities.ent: update weapon bbox heights to match 0.8.5

19 months agoentities.ent: update mega & big health & armor bbox heights to match 0.8.5
bones_was_here [Thu, 18 May 2023 14:56:38 +0000 (00:56 +1000)]
entities.ent: update mega & big health & armor bbox heights to match 0.8.5

item_health_big is correct already.

19 months agoentities.ent: Add item_speed and item_invisibility powerups
bones_was_here [Thu, 18 May 2023 14:56:24 +0000 (00:56 +1000)]
entities.ent: Add item_speed and item_invisibility powerups

These currently have no model.

19 months agoentities.ent: Update powerup bbox height to match xonotic-data.pk3dir!1131
bones_was_here [Thu, 18 May 2023 14:48:24 +0000 (00:48 +1000)]
entities.ent: Update powerup bbox height to match xonotic-data.pk3dir!1131

Their height in 0.8.5 is 80 not 48.

19 months agoentities.ent: Update ammo bbox height to match 0.8.5
bones_was_here [Thu, 18 May 2023 14:48:01 +0000 (00:48 +1000)]
entities.ent: Update ammo bbox height to match 0.8.5

19 months agoOpium: Fixed the top of the waves sometimes visible through the ground (above the...
Spike29 [Thu, 11 May 2023 10:00:44 +0000 (12:00 +0200)]
Opium: Fixed the top of the waves sometimes visible through the ground (above the Vortex spawn)

19 months agoMerge branch 'Spike29/maps_removal' into 'pending-release'
SpiKe [Wed, 10 May 2023 17:14:00 +0000 (17:14 +0000)]
Merge branch 'Spike29/maps_removal' into 'pending-release'

Remove Drain and Oil Rig

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

19 months agorename trigger_teleport spawnflag SPECTATOR to OBSERVERS_ONLY
Juhu [Tue, 2 May 2023 22:55:02 +0000 (00:55 +0200)]
rename trigger_teleport spawnflag SPECTATOR to OBSERVERS_ONLY

20 months agoMerge branch 'proraide/trident' into 'pending-release'
SpiKe [Wed, 29 Mar 2023 08:03:49 +0000 (08:03 +0000)]
Merge branch 'proraide/trident' into 'pending-release'

Add trident map

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

20 months agoAdd trident map
Amadeusz Sławiński [Wed, 29 Mar 2023 08:03:49 +0000 (08:03 +0000)]
Add trident map

21 months agoMerge branch 'master' into pending-release
Spike29 [Tue, 7 Mar 2023 14:55:09 +0000 (15:55 +0100)]
Merge branch 'master' into pending-release

21 months agoadjust descriptions of the q3/q3df trigger_teleport spawnflags for xonotic
Juhu [Sat, 4 Mar 2023 16:44:11 +0000 (17:44 +0100)]
adjust descriptions of the q3/q3df trigger_teleport spawnflags for xonotic

21 months agoMerge branch 'Spike29/weapon_arc_entity' into 'master'
SpiKe [Wed, 1 Mar 2023 16:29:28 +0000 (16:29 +0000)]
Merge branch 'Spike29/weapon_arc_entity' into 'master'

Update entities.ent with weapon_arc

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

21 months agoDescribe the Arc as an experimental weapon
Spike29 [Wed, 1 Mar 2023 16:21:27 +0000 (17:21 +0100)]
Describe the Arc as an experimental weapon

22 months agoRemove a duplicated shader directive in extragalactic_nebulae
Spike29 [Sat, 18 Feb 2023 13:33:37 +0000 (14:33 +0100)]
Remove a duplicated shader directive in extragalactic_nebulae

22 months agoAdd the weapon_arc entity definition + remove a reference to g_balance_vortex_respawn...
Spike29 [Sun, 12 Feb 2023 11:22:49 +0000 (12:22 +0100)]
Add the weapon_arc entity definition + remove a reference to g_balance_vortex_respawntime_modifier

22 months agotrigger_push_velocity inherits some properties from trigger_push, also add trigger_pu...
Juhu [Wed, 8 Feb 2023 21:28:20 +0000 (22:28 +0100)]
trigger_push_velocity inherits some properties from trigger_push, also add trigger_push_velocity and target_speed to the relevant lists

22 months agoupdate entities.ent with trigger_teleport q3df flags and static flag for various...
Juhu [Tue, 7 Feb 2023 17:39:12 +0000 (18:39 +0100)]
update entities.ent with trigger_teleport q3df flags and static flag for various push entities, new trigger_push_velocity and target_speed entity from q3df

23 months agoMerge branch 'Spike29/atelier_teleporter_fix' into 'pending-release'
SpiKe [Fri, 20 Jan 2023 13:16:09 +0000 (13:16 +0000)]
Merge branch 'Spike29/atelier_teleporter_fix' into 'pending-release'

Atelier: place the teleporter exits slightly above the ground + use nodrawnonsolid instead of caulk for the decals

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

23 months agoAtelier: place the teleporter exits slightly above the ground + use nodrawnonsolid...
SpiKe [Fri, 20 Jan 2023 13:16:08 +0000 (13:16 +0000)]
Atelier: place the teleporter exits slightly above the ground + use nodrawnonsolid instead of caulk for the decals

23 months agoMerge branch 'master' into pending-release
Spike29 [Tue, 17 Jan 2023 18:20:40 +0000 (19:20 +0100)]
Merge branch 'master' into pending-release

23 months agoSolarium: Fix some floating grass (thx Musicgoat for spotting this)
Spike29 [Tue, 10 Jan 2023 09:39:52 +0000 (10:39 +0100)]
Solarium: Fix some floating grass (thx Musicgoat for spotting this)

23 months agoMerge branch 'Spike29/minimaps_scale_fix' into 'master'
SpiKe [Sun, 8 Jan 2023 10:33:29 +0000 (10:33 +0000)]
Merge branch 'Spike29/minimaps_scale_fix' into 'master'

Fix wrong minimap scales on Dance, Implosion, Space-Elevator and Xoylent

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

23 months agoFix wrong minimap scales on Dance, Implosion, Space-Elevator and Xoylent
SpiKe [Sun, 8 Jan 2023 10:33:29 +0000 (10:33 +0000)]
Fix wrong minimap scales on Dance, Implosion, Space-Elevator and Xoylent