]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
3 days agoMerge branch 'Spike29/techassault' into 'master' master
Spike29 [Sun, 22 Dec 2024 11:52:03 +0000 (11:52 +0000)]
Merge branch 'Spike29/techassault' into 'master'

Replace "new toys" weapons in Tech Assault

Closes #213

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

7 days agoSilent Siege: fix misaligned textures on some patches
Spike29 [Wed, 18 Dec 2024 16:58:22 +0000 (17:58 +0100)]
Silent Siege: fix misaligned textures on some patches

4 weeks agoAdd a note about "New Toys" weapons in the entities descriptions Spike29/entities_newtoys 200/head
Spike29 [Sun, 24 Nov 2024 13:06:26 +0000 (14:06 +0100)]
Add a note about "New Toys" weapons in the entities descriptions

4 weeks agoReplace the Mine Layer and the Rifle with Hagar and Vortex respectively 199/head
Spike29 [Sun, 24 Nov 2024 10:50:25 +0000 (11:50 +0100)]
Replace the Mine Layer and the Rifle with Hagar and Vortex respectively

4 weeks agoTurn all crates into detail brushes
Spike29 [Sun, 24 Nov 2024 10:36:33 +0000 (11:36 +0100)]
Turn all crates into detail brushes

3 months agoMerge branch 'uis/opt-stormkeep' into 'master'
Spike29 [Sat, 7 Sep 2024 09:21:24 +0000 (09:21 +0000)]
Merge branch 'uis/opt-stormkeep' into 'master'

stormkeep: slightly improve performance on stormkeep

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

3 months agoMerge branch 'Spike29/more_gametypes' into 'master'
Spike29 [Tue, 27 Aug 2024 10:51:48 +0000 (10:51 +0000)]
Merge branch 'Spike29/more_gametypes' into 'master'

Add "new" gametypes (tka, mayhem, tmayhem, surv) to mapinfos.

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

3 months agoRemove the KH gametype from Darkzone, Final Rage, Fuse, Warfare and Xoylent (small...
Spike29 [Tue, 27 Aug 2024 09:26:23 +0000 (11:26 +0200)]
Remove the KH gametype from Darkzone, Final Rage, Fuse, Warfare and Xoylent (small maps)

3 months agoAdd "new" gametypes (tka, mayhem, tmayhem, surv) to mapinfos.
Spike29 [Tue, 27 Aug 2024 08:36:59 +0000 (10:36 +0200)]
Add "new" gametypes (tka, mayhem, tmayhem, surv) to mapinfos.
Also add the duel gametype to Opium, dom to Final Rage (the map has dom entities), and more missing gametypes to Running Man.

4 months agostormkeep: merge few brushes and minor changes
uis [Sun, 12 May 2024 21:39:15 +0000 (00:39 +0300)]
stormkeep: merge few brushes and minor changes

4 months agostormkeep: improve brushwork in quad room
uis [Sun, 12 May 2024 19:25:42 +0000 (22:25 +0300)]
stormkeep: improve brushwork in quad room

4 months agostormkeep: improve outdoors lamps
uis [Sun, 12 May 2024 19:10:08 +0000 (22:10 +0300)]
stormkeep: improve outdoors lamps

4 months agoCampaign: improve the description of the first CTF level
Spike29 [Sun, 25 Aug 2024 10:05:45 +0000 (12:05 +0200)]
Campaign: improve the description of the first CTF level

4 months agoNexball Arena: Use detail brushes (fixes a q3map2 warning). Also fix a few misaligned...
Spike29 [Tue, 20 Aug 2024 09:17:08 +0000 (11:17 +0200)]
Nexball Arena: Use detail brushes (fixes a q3map2 warning). Also fix a few misaligned textures, merge a few brushes, and use more caulk.

4 months agoChange key types from "model" to "string" for several entities, this allows NetRadian...
Spike29 [Wed, 14 Aug 2024 17:45:31 +0000 (19:45 +0200)]
Change key types from "model" to "string" for several entities, this allows NetRadiant-custom to display the entity's box instead of a null model when this key is left blank (which is the case most of the time)

4 months agoMerge branch 'Mario/entity_fields' into 'master'
Spike29 [Wed, 14 Aug 2024 10:35:56 +0000 (10:35 +0000)]
Merge branch 'Mario/entity_fields' into 'master'

Add some missing fields to entity definitions

Closes #212

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

4 months agoFix accidental duplicate targetname key in some entity definitions
Mario [Wed, 14 Aug 2024 10:29:53 +0000 (20:29 +1000)]
Fix accidental duplicate targetname key in some entity definitions

4 months agoSpace-Elevator: relink the waypoints, for some reason bots refused to use the jump...
Spike29 [Thu, 8 Aug 2024 17:49:41 +0000 (19:49 +0200)]
Space-Elevator: relink the waypoints, for some reason bots refused to use the jump pads

4 months agoSpace-Elevator: remove unneeded clips on windows, replace caulk with nodraw on two...
Spike29 [Thu, 3 Aug 2023 09:23:34 +0000 (11:23 +0200)]
Space-Elevator: remove unneeded clips on windows, replace caulk with nodraw on two decals

4 months agoSpace-Elevator: fix nonsolid glass
Spike29 [Wed, 7 Jun 2023 18:09:17 +0000 (20:09 +0200)]
Space-Elevator: fix nonsolid glass

4 months agospace-elevator: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:14:17 +0000 (17:14 +1000)]
space-elevator: use new q3map2 default light settings

4 months agoImprove the wording and fill in the blanks of fields in several entity definitions
Mario [Sun, 4 Aug 2024 13:30:11 +0000 (23:30 +1000)]
Improve the wording and fill in the blanks of fields in several entity definitions

4 months agoMerge branch 'Spike29/nomarks' into 'master'
Spike29 [Tue, 30 Jul 2024 16:37:18 +0000 (16:37 +0000)]
Merge branch 'Spike29/nomarks' into 'master'

Enable or disable weapon decals on some grate textures

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

4 months agoForgot to merge master first, rebuild some maps with their latest version
Spike29 [Mon, 29 Jul 2024 15:35:40 +0000 (17:35 +0200)]
Forgot to merge master first, rebuild some maps with their latest version

4 months agoMerge branch 'master' into Spike29/nomarks
Spike29 [Mon, 29 Jul 2024 15:27:38 +0000 (17:27 +0200)]
Merge branch 'master' into Spike29/nomarks

4 months agoRebuild maps whose grate textures had their "surfaceparm nomarks" shader directive...
Spike29 [Sun, 28 Jul 2024 16:33:08 +0000 (18:33 +0200)]
Rebuild maps whose grate textures had their "surfaceparm nomarks" shader directive flipped in the previous commit

4 months agoAdjust the surfaceparm nomarks shader directive for some grate textures
Spike29 [Tue, 7 May 2024 09:03:22 +0000 (11:03 +0200)]
Adjust the surfaceparm nomarks shader directive for some grate textures

4 months agoMerge branch 'Mario/courtfun_screen_shader' into 'master'
Spike29 [Sun, 28 Jul 2024 07:42:47 +0000 (07:42 +0000)]
Merge branch 'Mario/courtfun_screen_shader' into 'master'

Add some missing screen textures to the courtfun shader

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

4 months agoAdd some missing screen textures to the courtfun shader
Mario [Sun, 28 Jul 2024 04:53:04 +0000 (14:53 +1000)]
Add some missing screen textures to the courtfun shader

5 months agoBromine: on the roof area, fix some grass too close from the edge of rocks + fix...
Spike29 [Sat, 6 Jul 2024 15:16:31 +0000 (17:16 +0200)]
Bromine: on the roof area, fix some grass too close from the edge of rocks + fix a visible caulk

7 months agostormkeep: revert stupid skybox edit, better brushes
uis [Sun, 12 May 2024 18:52:52 +0000 (21:52 +0300)]
stormkeep: revert stupid skybox edit, better brushes

And revert another overcaulk

7 months agoSmall cleanups on Bromine:
Spike29 [Sun, 12 May 2024 14:54:17 +0000 (16:54 +0200)]
Small cleanups on Bromine:
- Delete duplicate brushes
- Fix a small z-fight in the MH room
- Fix a visible caulk (Crylink room) and a few misaligned textures (MH room)

7 months agoMerge branch 'Spike29/fix_badly_placed_entities' into 'master'
Spike29 [Thu, 9 May 2024 17:13:52 +0000 (17:13 +0000)]
Merge branch 'Spike29/fix_badly_placed_entities' into 'master'

Fix badly placed entities in several maps

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

7 months agoRemove duplicate surfaceparm sky directives from map-specific shaders too
Spike29 [Wed, 8 May 2024 09:47:09 +0000 (11:47 +0200)]
Remove duplicate surfaceparm sky directives from map-specific shaders too

7 months agoRemove duplicate surfaceparm sky directives from some sky shaders
Spike29 [Wed, 8 May 2024 09:38:22 +0000 (11:38 +0200)]
Remove duplicate surfaceparm sky directives from some sky shaders

7 months agoGeoplanetary: fix misplaced dom_controlpoint entities
Spike29 [Sun, 5 May 2024 09:55:58 +0000 (11:55 +0200)]
Geoplanetary: fix misplaced dom_controlpoint entities

7 months agostormkeep: improve brushwork more, remove random caulk brush in skybox
uis [Thu, 2 May 2024 18:13:12 +0000 (21:13 +0300)]
stormkeep: improve brushwork more, remove random caulk brush in skybox

7 months agostormkeep: reduce overdraw, improve brushwork
uis [Thu, 2 May 2024 17:57:12 +0000 (20:57 +0300)]
stormkeep: reduce overdraw, improve brushwork

7 months agoTrident: fix misaligned textures on some trim patches
Spike29 [Sun, 28 Apr 2024 10:45:18 +0000 (12:45 +0200)]
Trident: fix misaligned textures on some trim patches

8 months agoDelete the "cubemaps" folder, which was meant to be temporary but has been around...
Spike29 [Wed, 17 Apr 2024 21:01:04 +0000 (23:01 +0200)]
Delete the "cubemaps" folder, which was meant to be temporary but has been around since 2011

8 months agoAdd missing solarpanel to shaderlist.txt
Spike29 [Tue, 16 Apr 2024 07:42:47 +0000 (07:42 +0000)]
Add missing solarpanel to shaderlist.txt

8 months agoTrident: caulk more invisible surfaces and fix misaligned textures on some stairs
Spike29 [Sun, 7 Apr 2024 09:56:20 +0000 (11:56 +0200)]
Trident: caulk more invisible surfaces and fix misaligned textures on some stairs

8 months agoImplosion: raise item_flag_team entities and fix misplaced item_bullets
Spike29 [Mon, 1 Apr 2024 08:53:45 +0000 (10:53 +0200)]
Implosion: raise item_flag_team entities and fix misplaced item_bullets

8 months agoGeoplanetary: raise item_flag_team entities
Spike29 [Mon, 1 Apr 2024 08:37:50 +0000 (10:37 +0200)]
Geoplanetary: raise item_flag_team entities

8 months agoCourtfun: fix a badly placed onslaught_controlpoint entity
Spike29 [Sun, 31 Mar 2024 16:28:31 +0000 (18:28 +0200)]
Courtfun: fix a badly placed onslaught_controlpoint entity

8 months agoVorix: fix 2 badly placed item_health_big entities
Spike29 [Sun, 31 Mar 2024 14:48:09 +0000 (16:48 +0200)]
Vorix: fix 2 badly placed item_health_big entities

8 months agoCourtfun: fix a badly placed item_shield entity
Spike29 [Sun, 31 Mar 2024 12:05:30 +0000 (14:05 +0200)]
Courtfun: fix a badly placed item_shield entity

8 months agoGlowplant: fix badly placed entities (2 item_health_medium, 1 item_health_big and...
Spike29 [Sun, 31 Mar 2024 12:02:15 +0000 (14:02 +0200)]
Glowplant: fix badly placed entities (2 item_health_medium, 1 item_health_big and 1 item_cells)

8 months agoErbium: fix 3 badly placed item_armor_small entities
Spike29 [Sun, 31 Mar 2024 11:49:42 +0000 (13:49 +0200)]
Erbium: fix 3 badly placed item_armor_small entities

8 months agoBromine: fix badly placed entities
Spike29 [Sun, 31 Mar 2024 11:38:39 +0000 (13:38 +0200)]
Bromine: fix badly placed entities
 - delete an item_armor_small entity stuck in a wall
 - delete an item_health_small entity that was placed in pipes and reposition other items around it (on the MG platform)
 - readjust the position of an item_health_medium entity

8 months agoXoylent: Use common/caulk instead of common/nodraw on the invisible faces of the...
Spike29 [Fri, 8 Sep 2023 09:41:27 +0000 (11:41 +0200)]
Xoylent: Use common/caulk instead of common/nodraw on the invisible faces of the wood planks

8 months agoXoylent: Use new q3map2 default light settings
Spike29 [Sun, 6 Aug 2023 12:33:17 +0000 (14:33 +0200)]
Xoylent: Use new q3map2 default light settings

8 months agoSilentSiege: rebuild with q3map2 backsplash disabled
Spike29 [Sun, 6 Aug 2023 12:29:14 +0000 (14:29 +0200)]
SilentSiege: rebuild with q3map2 backsplash disabled

8 months agoSilentsiege: fix nonsolid grates
Spike29 [Wed, 7 Jun 2023 18:01:20 +0000 (20:01 +0200)]
Silentsiege: fix nonsolid grates

8 months agosilentsiege: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:13:49 +0000 (17:13 +1000)]
silentsiege: use new q3map2 default light settings

8 months agoCourtfun: fix nonsolid grates
Spike29 [Wed, 7 Jun 2023 17:18:57 +0000 (19:18 +0200)]
Courtfun: fix nonsolid grates

8 months agocourtfun: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:07:51 +0000 (17:07 +1000)]
courtfun: use new q3map2 default light settings

8 months agoAtelier: fix nonsolid grates
Spike29 [Wed, 7 Jun 2023 17:11:55 +0000 (19:11 +0200)]
Atelier: fix nonsolid grates

8 months agoatelier: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:06:35 +0000 (17:06 +1000)]
atelier: use new q3map2 default light settings

8 months agoMerge branch 'Spike29/darkzone' into 'master'
Spike29 [Sat, 30 Mar 2024 15:17:22 +0000 (15:17 +0000)]
Merge branch 'Spike29/darkzone' into 'master'

Darkzone: fix some warnings

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

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

12 months agoCaulk more
uis [Sat, 23 Dec 2023 22:39:03 +0000 (01:39 +0300)]
Caulk more

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 agoDarkzone: fix tiny visible caulks + rebuild with q3map2 backsplash disabled
Spike29 [Sun, 6 Aug 2023 11:52:16 +0000 (13:52 +0200)]
Darkzone: fix tiny visible caulks + rebuild with q3map2 backsplash disabled

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 agoDarkzone: delete an empty _decal entity
Spike29 [Sun, 9 Jul 2023 11:39:16 +0000 (13:39 +0200)]
Darkzone: delete an empty _decal entity

17 months agoDarkzone: fix lights with missing targets
Spike29 [Sun, 9 Jul 2023 10:50:29 +0000 (12:50 +0200)]
Darkzone: fix lights with missing targets

17 months agoDarkzone: make the xonlight models non solid, fixes a Collision_ValidateBrush warning
Spike29 [Sun, 9 Jul 2023 10:38:57 +0000 (12:38 +0200)]
Darkzone: make the xonlight models non solid, fixes a Collision_ValidateBrush warning

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