]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
3 months agoRebuild Fuse and Opium (weapon decals were enabled/disabled on some grates shaders)
Spike29 [Tue, 30 Jul 2024 16:50:53 +0000 (18:50 +0200)]
Rebuild Fuse and Opium (weapon decals were enabled/disabled on some grates shaders)

3 months agoMerge branch 'master' into pending-release
Spike29 [Tue, 30 Jul 2024 16:42:20 +0000 (18:42 +0200)]
Merge branch 'master' into pending-release

3 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

3 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

3 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

3 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

3 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

3 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

3 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

4 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

5 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)

6 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

6 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

6 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

6 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

6 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

6 months agoOpium: fix a visible gap between 2 patches + fix a misaligned trim texture
Spike29 [Sat, 20 Apr 2024 12:33:07 +0000 (14:33 +0200)]
Opium: fix a visible gap between 2 patches + fix a misaligned trim texture

6 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

6 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

6 months agoMerge branch 'Spike29/opium_update' into 'pending-release'
Spike29 [Sun, 14 Apr 2024 11:37:53 +0000 (11:37 +0000)]
Merge branch 'Spike29/opium_update' into 'pending-release'

Major Opium update

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

6 months agoMajor Opium update
Spike29 [Sun, 14 Apr 2024 11:37:53 +0000 (11:37 +0000)]
Major Opium update

7 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

7 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

7 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

7 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

7 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

7 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

7 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)

7 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

7 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

7 months agoSolarium: slightly move two item_health_small entities, fixes DropToFloor_QC warnings
Spike29 [Sat, 30 Mar 2024 20:56:43 +0000 (21:56 +0100)]
Solarium: slightly move two item_health_small entities, fixes DropToFloor_QC warnings

7 months agoMerge branch 'master' into pending-release
Spike29 [Sat, 30 Mar 2024 20:22:00 +0000 (21:22 +0100)]
Merge branch 'master' into pending-release

7 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

7 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

7 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

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

7 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

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

7 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

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

7 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

7 months agoMerge branch 'Spike29/solarium' into 'pending-release'
Spike29 [Sat, 30 Mar 2024 15:20:50 +0000 (15:20 +0000)]
Merge branch 'Spike29/solarium' into 'pending-release'

Solarium: fix a few issues with crates collisions

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

7 months agoSolarium: make all the crate models nonsolid and cover them with weapclip brushes
Spike29 [Wed, 13 Mar 2024 17:35:51 +0000 (18:35 +0100)]
Solarium: make all the crate models nonsolid and cover them with weapclip brushes

7 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

7 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'

7 months agoFuse: fix 2 small visible caulks on a beam in the Strength room
Spike29 [Sun, 24 Mar 2024 15:22:37 +0000 (16:22 +0100)]
Fuse: fix 2 small visible caulks on a beam in the Strength room

7 months agoMerge branch 'master' into pending-release
Spike29 [Sun, 24 Mar 2024 15:16:21 +0000 (16:16 +0100)]
Merge branch 'master' into pending-release

7 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

7 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

7 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

7 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

7 months agoSolarium: fix nonsolid grates
Spike29 [Wed, 7 Jun 2023 18:04:47 +0000 (20:04 +0200)]
Solarium: fix nonsolid grates

7 months agosolarium: use new q3map2 default light settings
bones_was_here [Sun, 4 Jun 2023 07:14:04 +0000 (17:14 +1000)]
solarium: use new q3map2 default light settings

8 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

9 months agoMerge branch 'master' into pending-release
Spike29 [Sun, 21 Jan 2024 16:37:48 +0000 (17:37 +0100)]
Merge branch 'master' into pending-release

9 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

10 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)

10 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

10 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 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

12 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

13 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

13 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

13 months agoMerge branch 'master' into pending-release
Spike29 [Thu, 14 Sep 2023 10:36:21 +0000 (12:36 +0200)]
Merge branch 'master' into pending-release

14 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

14 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

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

14 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

14 months agoFuse: rebuild with q3map2 backsplash disabled
Spike29 [Sun, 6 Aug 2023 12:28:20 +0000 (14:28 +0200)]
Fuse: rebuild with q3map2 backsplash disabled

14 months agoFuse: fix nonsolid grates
Spike29 [Wed, 7 Jun 2023 17:38:47 +0000 (19:38 +0200)]
Fuse: fix nonsolid grates

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

14 months agoMerge branch 'master' into pending-release
Spike29 [Tue, 15 Aug 2023 14:03:37 +0000 (16:03 +0200)]
Merge branch 'master' into pending-release

14 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

14 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

14 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

15 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

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

15 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

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

15 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

15 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

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

15 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

15 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

15 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

16 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

16 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

16 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

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

16 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

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

16 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

16 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

16 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

16 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

16 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

16 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

16 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

16 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

16 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