xonotic/xonotic-maps.pk3dir.git
2 months agoAdd Cushion texture - thanks hotdog master 101/merge 135/merge
Mirio [Sun, 31 Jan 2021 14:20:32 +0000 (15:20 +0100)]
Add Cushion texture - thanks hotdog

4 months agoMerge branch 'Spike29/campaign_duel' into 'master'
Mirio [Sat, 12 Dec 2020 22:35:51 +0000 (22:35 +0000)]
Merge branch 'Spike29/campaign_duel' into 'master'

Campaign: set game type to "duel" instead of "dm" for the Fuse level

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

4 months agoSet game type to duel instead of dm for the Fuse level
Spike29 [Sat, 12 Dec 2020 17:14:54 +0000 (18:14 +0100)]
Set game type to duel instead of dm for the Fuse level

4 months agoMerge branch 'nonb' into 'master'
Mario [Fri, 4 Dec 2020 00:18:04 +0000 (00:18 +0000)]
Merge branch 'nonb' into 'master'

Remove nexball level from campaign

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

4 months agoRemove nexball level from campaign
Wuzzy [Thu, 3 Dec 2020 14:47:23 +0000 (15:47 +0100)]
Remove nexball level from campaign

4 months agoFix #172
Mirio [Wed, 2 Dec 2020 16:32:43 +0000 (17:32 +0100)]
Fix #172

4 months agoFix #181
Mirio [Wed, 2 Dec 2020 16:04:15 +0000 (17:04 +0100)]
Fix #181

4 months agoMerge branch 'bones_was_here/alphafunc_grates' into 'master'
Mirio [Wed, 2 Dec 2020 15:39:06 +0000 (15:39 +0000)]
Merge branch 'bones_was_here/alphafunc_grates' into 'master'

Workaround for darkplaces#106 (blendfunc sorting)

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

7 months agoFuse: Fix z-fight
Mirio [Sun, 23 Aug 2020 16:08:13 +0000 (18:08 +0200)]
Fuse: Fix z-fight

10 months agoWorkaround for darkplaces#106 (blendfunc sorting)
bones_was_here [Sat, 30 May 2020 06:12:11 +0000 (16:12 +1000)]
Workaround for darkplaces#106 (blendfunc sorting)

10 months agoAdd keys for the new spawnflags in trigger_viewlocation
Mario [Wed, 27 May 2020 13:53:37 +0000 (23:53 +1000)]
Add keys for the new spawnflags in trigger_viewlocation

12 months agoMerge branch 'Spike29/entities' into 'master'
Mirio [Sun, 19 Apr 2020 12:26:52 +0000 (12:26 +0000)]
Merge branch 'Spike29/entities' into 'master'

trigger_hurt: fix the INVERT_TEAM description

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

12 months agotrigger_hurt: fix the INVERT_TEAM description 145/head
Spike29 [Sun, 19 Apr 2020 11:00:45 +0000 (13:00 +0200)]
trigger_hurt: fix the INVERT_TEAM description

12 months agoMerge branch 'Spike29/trigger_push_entity_description' into 'master'
Mirio [Sat, 11 Apr 2020 11:01:22 +0000 (11:01 +0000)]
Merge branch 'Spike29/trigger_push_entity_description' into 'master'

Rephrase a few trigger_jump keys descriptions ('jump pad' instead of 'teleporter')

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

12 months agoRephrase a few trigger_jump keys descriptions ('jump pad' instead of 'teleporter') 144/head
Spike29 [Sat, 11 Apr 2020 09:44:09 +0000 (11:44 +0200)]
Rephrase a few trigger_jump keys descriptions ('jump pad' instead of 'teleporter')

12 months agoAdd new map pictures, fixes #176
Mirio [Tue, 7 Apr 2020 13:09:43 +0000 (15:09 +0200)]
Add new map pictures, fixes #176

12 months agoMerge branch 'proraide/finalrage_stairs_fix' into 'master'
Mirio [Wed, 1 Apr 2020 16:23:44 +0000 (16:23 +0000)]
Merge branch 'proraide/finalrage_stairs_fix' into 'master'

Fix texture on stairs

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

12 months agoFix texture on stairs 143/head
Amadeusz Sławiński [Sun, 29 Mar 2020 21:55:23 +0000 (23:55 +0200)]
Fix texture on stairs

Side of stairs should be exx/trim-01, like on all other stairs of the
map. Not really visible because it is in dark corridor and if you don't
know that you need to look for it, it can be easily missed, but still
it's better if it is correct.

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
13 months agoUpdate some waypoint files
terencehill [Sun, 15 Mar 2020 14:55:52 +0000 (15:55 +0100)]
Update some waypoint files

15 months agoMerge branch 'mirceakitsune/campaign_leadlimit' into 'master'
Mirio [Sat, 18 Jan 2020 03:06:13 +0000 (03:06 +0000)]
Merge branch 'mirceakitsune/campaign_leadlimit' into 'master'

Document new campaign functionalities in campaignxonoticbeta.txt

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

15 months agoDocument new campaign functionalities in campaignxonoticbeta.txt
Mircea Kitsune [Sat, 18 Jan 2020 03:06:13 +0000 (03:06 +0000)]
Document new campaign functionalities in campaignxonoticbeta.txt

15 months agoMerge branch 'bones_was_here/mapinfoupdate' into 'master'
Mirio [Fri, 17 Jan 2020 23:58:50 +0000 (23:58 +0000)]
Merge branch 'bones_was_here/mapinfoupdate' into 'master'

Remove blacklisted r_water clientsettemps and add gametype duel to appropriate maps

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

15 months agoSolarium: Add duel 142/head
Mirio [Fri, 17 Jan 2020 23:57:47 +0000 (23:57 +0000)]
Solarium: Add duel

15 months agoDrain: Add duel
Mirio [Fri, 17 Jan 2020 23:57:08 +0000 (23:57 +0000)]
Drain: Add duel

15 months agoDarkzone: Add duel
Mirio [Fri, 17 Jan 2020 23:56:47 +0000 (23:56 +0000)]
Darkzone: Add duel

15 months agoAdd gametype duel to appropriate maps
bones_was_here [Fri, 17 Jan 2020 19:58:20 +0000 (05:58 +1000)]
Add gametype duel to appropriate maps

15 months agoRemove r_water* client settemps (these are blacklisted, fixes warning)
bones_was_here [Fri, 17 Jan 2020 19:54:50 +0000 (05:54 +1000)]
Remove r_water* client settemps (these are blacklisted, fixes warning)

15 months agoMerge branch 'illwieckz/ge128' into 'master'
Mario [Thu, 9 Jan 2020 09:50:53 +0000 (09:50 +0000)]
Merge branch 'illwieckz/ge128' into 'master'

DarkPlaces does not support alphaFunc GT0 and uses GE128 instead

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

15 months agoDarkPlaces does not support alphaFunc GT0 and uses GE128 instead 140/head
Thomas Debesse [Thu, 9 Jan 2020 09:27:03 +0000 (10:27 +0100)]
DarkPlaces does not support alphaFunc GT0 and uses GE128 instead

By making this change, we ensure the materials look the same on DarkPlaces and
other engines, even in the case it's wrong on DarkPlaces because Xonotic mappers
now expect the wrong behavior.

Darkplaces only supports one alphaFunc operation, it only reads the alphaFunc
keyword and does not read the function name:

https://gitlab.com/xonotic/darkplaces/blob/324a5329d33ef90df59e6488abce6433d90ac04c/model_shared.c#L1875-1876

It then uses the GE128 operator unconditionally:

https://gitlab.com/xonotic/darkplaces/blob/0ea8f691e05ea968bb8940942197fa627966ff99/render.h#L95

People may silently introduce regressions in their textures designed for GT0
by compressing them using a lossy picture format like Jpg.

Xonotic texture known to trigger this bug (in xonotic-maps):

    models/desertfactory/textures/shaders/grass01.jpg

Using GE128 hides Jpeg artifacts while it's possible a TGA version worked with GT0.

Xonotic texture that may benefit from GT0 if supported (in xonotic-maps):

    models/desertfactory/textures/shaders/sign_ladder_dirty.jpg

By storing this texture in lossless format and making sure the frame is pure
black and the ladder is a bit less black than pure black, only the frame would
be transparent.

Unfortunately, after years of GE128 usagen displaying the texture with GT0
operation would be a regression.

Note: I also renamed some `alphafunc` to `alphaFunc` even if it was already GE128.

15 months agoAfterslime: Change misc_model to misc_gamemodel to fix jumppads
Mirio [Sun, 5 Jan 2020 18:47:43 +0000 (19:47 +0100)]
Afterslime: Change misc_model to misc_gamemodel to fix jumppads

18 months agoFix #157
Mirio [Fri, 11 Oct 2019 22:49:05 +0000 (00:49 +0200)]
Fix #157

18 months agoFix #166
Mirio [Fri, 11 Oct 2019 22:40:23 +0000 (00:40 +0200)]
Fix #166

18 months agoMerge branch 'Spike29/implosion_patch_fix' into 'master'
Mirio [Sat, 21 Sep 2019 23:14:53 +0000 (23:14 +0000)]
Merge branch 'Spike29/implosion_patch_fix' into 'master'

Small patch fix on Implosion

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

18 months agoSmall patch fix on Implosion
SpiKe [Sat, 21 Sep 2019 23:14:53 +0000 (23:14 +0000)]
Small patch fix on Implosion

19 months agoFix visible caulk on Catharsis and Geoplanetary
Mirio [Thu, 19 Sep 2019 16:26:13 +0000 (18:26 +0200)]
Fix visible caulk on Catharsis and Geoplanetary

19 months agoFix visible caulk on Catharsis and Geoplanetary
Mirio [Thu, 19 Sep 2019 16:25:51 +0000 (18:25 +0200)]
Fix visible caulk on Catharsis and Geoplanetary

19 months agoMerge branch 'terencehill/bot_waypoints' into 'master'
terencehill [Sun, 1 Sep 2019 21:46:34 +0000 (21:46 +0000)]
Merge branch 'terencehill/bot_waypoints' into 'master'

Bot waypoints

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

20 months agoCampaign: Fix Nexball level
Mirio [Tue, 6 Aug 2019 13:34:49 +0000 (15:34 +0200)]
Campaign: Fix Nexball level

20 months agoChange trim texture
Mirio [Mon, 5 Aug 2019 18:10:46 +0000 (20:10 +0200)]
Change trim texture

20 months agoGeoplanetary: Rework warpzones, fix entity names
Mirio [Sat, 3 Aug 2019 16:00:01 +0000 (18:00 +0200)]
Geoplanetary: Rework warpzones, fix entity names

20 months agoGeoplanetary: Fix visible caulk
Mirio [Sat, 3 Aug 2019 15:23:04 +0000 (17:23 +0200)]
Geoplanetary: Fix visible caulk

20 months agoFix #160
Mirio [Sat, 3 Aug 2019 15:19:28 +0000 (17:19 +0200)]
Fix #160

20 months agoUpdate all the waypoints to version 1.04 with crouch and support waypoints
terencehill [Fri, 2 Aug 2019 09:27:34 +0000 (11:27 +0200)]
Update all the waypoints to version 1.04 with crouch and support waypoints

20 months agoFix DOM control point messages
Mirio [Wed, 24 Jul 2019 18:25:13 +0000 (20:25 +0200)]
Fix DOM control point messages

20 months agoFix #156
Mirio [Tue, 23 Jul 2019 14:39:40 +0000 (16:39 +0200)]
Fix #156

21 months agoAdd clip for smoother movement at 50a
Mirio [Mon, 1 Jul 2019 13:02:14 +0000 (15:02 +0200)]
Add clip for smoother movement at 50a

21 months agoUpdate all the waypoints to version 1.03 with jump and custom jumppad waypoints
terencehill [Sun, 30 Jun 2019 15:32:34 +0000 (17:32 +0200)]
Update all the waypoints to version 1.03 with jump and custom jumppad waypoints

2 years agoChange Laser to Blaster and fix few cvar names
Mirio [Mon, 15 Apr 2019 14:19:17 +0000 (14:19 +0000)]
Change Laser to Blaster and fix few cvar names

2 years agoHopefully final jumppad fix
Mirio [Thu, 28 Feb 2019 22:23:51 +0000 (23:23 +0100)]
Hopefully final jumppad fix

2 years agoImplosion: Fix launchpads scale
Mirio [Mon, 25 Feb 2019 21:44:11 +0000 (22:44 +0100)]
Implosion: Fix launchpads scale

2 years agoFix launchpads scale
Mirio [Mon, 25 Feb 2019 21:43:40 +0000 (22:43 +0100)]
Fix launchpads scale

2 years agoRevert lod models, it is causing issues with older clients
Mirio [Sun, 24 Feb 2019 20:32:45 +0000 (21:32 +0100)]
Revert lod models, it is causing issues with older clients

2 years agoUpdate slick shader
Mirio [Mon, 11 Feb 2019 10:06:36 +0000 (11:06 +0100)]
Update slick shader

2 years agoAdd slick texture - thanks hotdog
Mirio [Sun, 10 Feb 2019 19:18:44 +0000 (20:18 +0100)]
Add slick texture - thanks hotdog

2 years agoRevert jumppads on Erbium, Fuse and Glowplant
Mirio [Sat, 9 Feb 2019 16:48:48 +0000 (17:48 +0100)]
Revert jumppads on Erbium, Fuse and Glowplant

2 years agoAdd -sRGB flag to Geoplanetary and Erbium
Mirio [Fri, 8 Feb 2019 14:16:31 +0000 (15:16 +0100)]
Add -sRGB flag to Geoplanetary and Erbium

2 years agoXoylent: Remove empty func_group entity
Mirio [Fri, 8 Feb 2019 11:42:31 +0000 (12:42 +0100)]
Xoylent: Remove empty func_group entity

2 years agoWarfare: Remove info_location entities
Mirio [Fri, 8 Feb 2019 11:41:27 +0000 (12:41 +0100)]
Warfare: Remove info_location entities

2 years agoVorix: Remove info_location entities
Mirio [Fri, 8 Feb 2019 11:26:13 +0000 (12:26 +0100)]
Vorix: Remove info_location entities

2 years agoTeachassault: Remove empty func_ entities
Mirio [Fri, 8 Feb 2019 11:25:17 +0000 (12:25 +0100)]
Teachassault: Remove empty func_ entities

2 years agoStormkeep: Remove empty func_ entity
Mirio [Fri, 8 Feb 2019 11:23:27 +0000 (12:23 +0100)]
Stormkeep: Remove empty func_ entity

2 years agoNexball Arena: Remove empty func_group entities
Mirio [Fri, 8 Feb 2019 11:21:12 +0000 (12:21 +0100)]
Nexball Arena: Remove empty func_group entities

2 years agoFuse: Remove empty func_group entities
Mirio [Fri, 8 Feb 2019 11:19:15 +0000 (12:19 +0100)]
Fuse: Remove empty func_group entities

2 years agoFinal Rage: Remove info_location entities
Mirio [Fri, 8 Feb 2019 11:18:07 +0000 (12:18 +0100)]
Final Rage: Remove info_location entities

2 years agoErbium: Remove empty func_group entity
Mirio [Fri, 8 Feb 2019 11:16:06 +0000 (12:16 +0100)]
Erbium: Remove empty func_group entity

2 years agoDrain: Remove empty func_rain entities
Mirio [Fri, 8 Feb 2019 11:15:22 +0000 (12:15 +0100)]
Drain: Remove empty func_rain entities

2 years agoAtelier: Remove empty func_groups
Mirio [Fri, 8 Feb 2019 11:10:54 +0000 (12:10 +0100)]
Atelier: Remove empty func_groups

2 years agoRemove empty func_groups
Mirio [Fri, 8 Feb 2019 11:06:30 +0000 (12:06 +0100)]
Remove empty func_groups

2 years agoMerge branch 'Spike29/silentsiege' into 'master'
Mirio [Fri, 8 Feb 2019 10:25:40 +0000 (10:25 +0000)]
Merge branch 'Spike29/silentsiege' into 'master'

Minor cleanups on Silentsiege

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

2 years agoMinor cleanups on Silentsiege
SpiKe [Fri, 8 Feb 2019 10:25:40 +0000 (10:25 +0000)]
Minor cleanups on Silentsiege

2 years agoGeoplanetary: Improve bottom
Mirio [Wed, 6 Feb 2019 17:54:51 +0000 (18:54 +0100)]
Geoplanetary: Improve bottom

2 years agoMake all jumppads consistens and be misc_gamemodels
Mirio [Wed, 6 Feb 2019 17:52:41 +0000 (18:52 +0100)]
Make all jumppads consistens and be misc_gamemodels

2 years agoGeoplanetary: Cleanup, hide underneath better
Mirio [Tue, 5 Feb 2019 14:42:08 +0000 (15:42 +0100)]
Geoplanetary: Cleanup, hide underneath better

2 years agoHide Oilrig
Mirio [Tue, 5 Feb 2019 13:11:40 +0000 (14:11 +0100)]
Hide Oilrig

2 years agoUpdate space-elevator.waypoints.hardwired
terencehill [Wed, 19 Dec 2018 12:06:47 +0000 (12:06 +0000)]
Update space-elevator.waypoints.hardwired

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

2 years agoFix a minor typo in entities.ent (bruch -> brush) 131/head
SpiKe [Tue, 6 Nov 2018 19:48:52 +0000 (19:48 +0000)]
Fix a minor typo in entities.ent (bruch -> brush)

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

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

2 years agoMinor fixes on Solarium
SpiKe [Wed, 31 Oct 2018 00:20:29 +0000 (00:20 +0000)]
Minor fixes on Solarium

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

2 years agoSolarium: fix a visible caulk (part of #155)
SpiKe [Sun, 28 Oct 2018 22:16:51 +0000 (22:16 +0000)]
Solarium: fix a visible caulk (part of #155)

2 years agopush version number 128/head
packer [Sun, 28 Oct 2018 13:43:09 +0000 (14:43 +0100)]
push version number

2 years agoimprove hints, more detail brushes
packer [Sun, 28 Oct 2018 12:29:25 +0000 (13:29 +0100)]
improve hints, more detail brushes

2 years 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

2 years 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

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

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

2 years 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

2 years 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

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

2 years 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

2 years 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

2 years 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

2 years 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

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

2 years 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

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

2 years 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

2 years 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