]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
xonotic/xonotic-maps.pk3dir.git
2 years agoSmall campaign file fixup
terencehill [Thu, 14 Apr 2022 13:09:15 +0000 (13:09 +0000)]
Small campaign file fixup

2 years agoRestore leave-em-behind waypoints for CTS (existing .race waypoints are loaded only... terencehill/leave_em_behind_waypoints
terencehill [Tue, 5 Apr 2022 15:30:12 +0000 (17:30 +0200)]
Restore leave-em-behind waypoints for CTS (existing .race waypoints are loaded only in Race)

2 years agoWarfare: fix a misaligned exx/wall-pipe texture near the Devastator
Spike29 [Fri, 1 Apr 2022 18:14:55 +0000 (20:14 +0200)]
Warfare: fix a misaligned exx/wall-pipe texture near the Devastator

2 years agoGlowplant: replace common/full_clip with common/weapclip
Spike29 [Sun, 27 Mar 2022 18:01:11 +0000 (20:01 +0200)]
Glowplant: replace common/full_clip with common/weapclip

2 years agoFix a visible caulk on the beam above the Vortex (only visible while observing)
Spike29 [Sat, 26 Feb 2022 10:03:29 +0000 (11:03 +0100)]
Fix a visible caulk on the beam above the Vortex (only visible while observing)

2 years agoMerge branch 'bones_was_here/imagederp' into 'master'
SpiKe [Sat, 19 Feb 2022 19:38:41 +0000 (19:38 +0000)]
Merge branch 'bones_was_here/imagederp' into 'master'

Work around imagemagick regression that puts everything upside down

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

2 years agoWork around imagemagick regression that puts everything upside down
bones_was_here [Sat, 19 Feb 2022 11:20:26 +0000 (21:20 +1000)]
Work around imagemagick regression that puts everything upside down

2 years agoMerge branch 'bones_was_here/glossintensity' into 'master'
SpiKe [Wed, 26 Jan 2022 19:35:55 +0000 (19:35 +0000)]
Merge branch 'bones_was_here/glossintensity' into 'master'

Shaders: halve all dpglossintensitymod values

Closes #200

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

2 years agoShaders: halve all dpglossintensitymod values
bones_was_here [Mon, 17 Jan 2022 12:46:26 +0000 (22:46 +1000)]
Shaders: halve all dpglossintensitymod values

This is to compensate for differences between DP engine versions
https://gitlab.com/xonotic/darkplaces/-/issues/205

Signed-off-by: bones_was_here <bones_was_here@xa.org.au>
2 years agoFix #197 and remove useless patch
Mirio [Thu, 9 Dec 2021 12:58:24 +0000 (13:58 +0100)]
Fix #197 and remove useless patch

2 years agoFix #165
Mirio [Wed, 8 Dec 2021 14:25:49 +0000 (15:25 +0100)]
Fix #165

2 years agoMerge branch 'Spike29/fuse' into 'master'
Mirio [Wed, 8 Dec 2021 14:07:31 +0000 (14:07 +0000)]
Merge branch 'Spike29/fuse' into 'master'

Fix a z-fight on the column behind the Big armor, fixes #188

Closes #188

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

2 years agoFix a z-fight on the column behind the Big armor, fixes #188
SpiKe [Wed, 8 Dec 2021 14:07:31 +0000 (14:07 +0000)]
Fix a z-fight on the column behind the Big armor, fixes #188

2 years agoFix #196
Mirio [Wed, 8 Dec 2021 12:41:31 +0000 (13:41 +0100)]
Fix #196

2 years agoPush Stormkeep map version
Mirio [Wed, 8 Dec 2021 12:37:53 +0000 (13:37 +0100)]
Push Stormkeep map version

2 years agoMerge branch 'Spike29/glowplant' into 'master'
Mirio [Wed, 8 Dec 2021 12:18:55 +0000 (12:18 +0000)]
Merge branch 'Spike29/glowplant' into 'master'

Glowplant: clip two fan ducts

Closes #193

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

2 years agoGlowplant: clip two fan ducts
SpiKe [Wed, 8 Dec 2021 12:18:55 +0000 (12:18 +0000)]
Glowplant: clip two fan ducts

2 years agoMerge branch 'Spike29/stormkeep' into 'master'
Mirio [Wed, 8 Dec 2021 12:16:52 +0000 (12:16 +0000)]
Merge branch 'Spike29/stormkeep' into 'master'

Clip a hiding spot in the Hagar room, fixes #194

Closes #194

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

2 years agoClip a hiding spot in the Hagar room, fixes #194
SpiKe [Wed, 8 Dec 2021 12:16:52 +0000 (12:16 +0000)]
Clip a hiding spot in the Hagar room, fixes #194

3 years agoAdd Cushion texture - thanks hotdog
Mirio [Sun, 31 Jan 2021 14:20:32 +0000 (15:20 +0100)]
Add Cushion texture - thanks hotdog

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

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

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

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

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

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

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

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

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

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

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

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

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

4 years 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')

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

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

4 years 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>
4 years agoUpdate some waypoint files
terencehill [Sun, 15 Mar 2020 14:55:52 +0000 (15:55 +0100)]
Update some waypoint files

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

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

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

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

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

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

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

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

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

4 years 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.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

5 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

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

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

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

5 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

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

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

5 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

5 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

5 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

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

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

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

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

5 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

5 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

5 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

5 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

5 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

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

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

5 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

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

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

5 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

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

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

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

6 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

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

6 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

6 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

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

6 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