]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
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.
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.
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
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)
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
Spike29 [Wed, 1 Mar 2023 16:21:27 +0000 (17:21 +0100)]
Describe the Arc as an experimental weapon
Spike29 [Sat, 18 Feb 2023 13:33:37 +0000 (14:33 +0100)]
Remove a duplicated shader directive in extragalactic_nebulae
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
Spike29 [Tue, 10 Jan 2023 09:39:52 +0000 (10:39 +0100)]
Solarium: Fix some floating grass (thx Musicgoat for spotting this)
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
SpiKe [Sun, 8 Jan 2023 10:33:29 +0000 (10:33 +0000)]
Fix wrong minimap scales on Dance, Implosion, Space-Elevator and Xoylent
LegendaryGuard [Mon, 21 Nov 2022 08:31:17 +0000 (08:31 +0000)]
Merge branch 'LegendaryGuard/replace_map_screenshots' into 'master'
Replace map screenshots removing old Nexuiz assets, no items display
Closes #205
See merge request xonotic/xonotic-maps.pk3dir!168
LegendaryGuard [Mon, 21 Nov 2022 08:31:17 +0000 (08:31 +0000)]
Replace map screenshots removing old Nexuiz assets, no items display
SpiKe [Fri, 18 Nov 2022 09:35:12 +0000 (09:35 +0000)]
Merge branch 'Mario/model_lod' into 'master'
Add copies of LOD models for a crate and jumppad that work with automatic LOD loading
See merge request xonotic/xonotic-maps.pk3dir!165
Spike29 [Tue, 18 Oct 2022 13:54:01 +0000 (15:54 +0200)]
Small fix in the func_group entity description
Mario [Fri, 30 Sep 2022 13:52:13 +0000 (23:52 +1000)]
Add copies of the LOD models for a crate and jumppad that work with automatic LOD loading
Spike29 [Mon, 5 Sep 2022 18:26:16 +0000 (20:26 +0200)]
Solarium: fix a small visible caulk (on the outside roof, below the parabolic antenna)
Spike29 [Wed, 3 Aug 2022 09:55:26 +0000 (11:55 +0200)]
Implosion: Fix misaligned solar panel textures on the blue side
LegendaryGuard [Thu, 30 Jun 2022 18:01:18 +0000 (18:01 +0000)]
Merge branch 'illwieckz/gtkradiant' into 'master'
delete an old leftover gtkradiant build menu
See merge request xonotic/xonotic-maps.pk3dir!160
LegendaryGuard [Thu, 30 Jun 2022 16:45:22 +0000 (16:45 +0000)]
Merge branch 'illwieckz/gitignore' into 'master'
gitignore more map compilation output
See merge request xonotic/xonotic-maps.pk3dir!150
Thomas Debesse [Thu, 30 Jun 2022 02:29:00 +0000 (04:29 +0200)]
delete an old leftover gtkradiant build menu
GtkRadiant installs the build menu in the user directory.
It should not be committed.
Thomas Debesse [Mon, 1 Mar 2021 22:53:02 +0000 (23:53 +0100)]
gitignore more map compilation output and radiant autosave files
Spike29 [Sat, 25 Jun 2022 12:17:13 +0000 (14:17 +0200)]
Space Elevator: fix misaligned textures on the central roof
Spike29 [Sat, 25 Jun 2022 12:03:04 +0000 (14:03 +0200)]
Implosion: fix the red and blue trims symmetry above the Strength
Spike29 [Sat, 25 Jun 2022 11:37:24 +0000 (13:37 +0200)]
Bromine: fix a z-fight in the Crylink room + align a trim texture
SpiKe [Fri, 17 Jun 2022 08:53:36 +0000 (08:53 +0000)]
Merge branch 'Spike29/campaign_update' into 'master'
Campaign: Replace the Drain and Oilrig levels with Opium and Bromine
Closes #203
See merge request xonotic/xonotic-maps.pk3dir!158
SpiKe [Fri, 17 Jun 2022 08:53:36 +0000 (08:53 +0000)]
Campaign: Replace the Drain and Oilrig levels with Opium and Bromine
SpiKe [Fri, 17 Jun 2022 08:50:46 +0000 (08:50 +0000)]
Merge branch 'Mirio/opium' into 'master'
Mirio/opium
See merge request xonotic/xonotic-maps.pk3dir!135
Mirio [Fri, 17 Jun 2022 08:50:46 +0000 (08:50 +0000)]
Mirio/opium
SpiKe [Fri, 17 Jun 2022 08:47:47 +0000 (08:47 +0000)]
Merge branch 'itsme/bromine' into 'master'
Bromine: TDM map with brown/rusty colored style
Closes #191
See merge request xonotic/xonotic-maps.pk3dir!129
packer [Fri, 17 Jun 2022 08:47:46 +0000 (08:47 +0000)]
Bromine: TDM map with brown/rusty colored style
SpiKe [Fri, 17 Jun 2022 08:46:41 +0000 (08:46 +0000)]
Merge branch 'Spike29/solarium' into 'master'
Solarium fixes and tweaks
Closes #162
See merge request xonotic/xonotic-maps.pk3dir!132
SpiKe [Fri, 17 Jun 2022 08:46:40 +0000 (08:46 +0000)]
Solarium fixes and tweaks
SpiKe [Fri, 17 Jun 2022 08:45:38 +0000 (08:45 +0000)]
Merge branch 'Spike29/silentsiege' into 'master'
Silentsiege cleanups
Closes #186 and #185
See merge request xonotic/xonotic-maps.pk3dir!134
SpiKe [Fri, 17 Jun 2022 08:45:38 +0000 (08:45 +0000)]
Silentsiege cleanups
SpiKe [Fri, 17 Jun 2022 08:44:14 +0000 (08:44 +0000)]
Merge branch 't0uYK8Ne/erbium' into 'master'
erbium: fix various issues
Closes #195, #144, and #135
See merge request xonotic/xonotic-maps.pk3dir!101
t0uYK8Ne [Fri, 17 Jun 2022 08:44:13 +0000 (08:44 +0000)]
erbium: fix various issues
SpiKe [Fri, 17 Jun 2022 08:42:47 +0000 (08:42 +0000)]
Merge branch 'Mirio/space-elevator' into 'master'
Mirio/space-elevator
See merge request xonotic/xonotic-maps.pk3dir!137
Mirio [Fri, 17 Jun 2022 08:42:47 +0000 (08:42 +0000)]
Mirio/space-elevator
SpiKe [Fri, 17 Jun 2022 08:41:10 +0000 (08:41 +0000)]
Merge branch 'cortez/finalrage' into 'master'
cortez/finalrage
Closes #179, #178, and #177
See merge request xonotic/xonotic-maps.pk3dir!155
Mirio [Fri, 17 Jun 2022 08:41:08 +0000 (08:41 +0000)]
cortez/finalrage
SpiKe [Fri, 17 Jun 2022 06:31:12 +0000 (06:31 +0000)]
Merge branch 'Spike29/implosion' into 'master'
Implosion: A few tweaks to the catwalks below the map
Closes #198
See merge request xonotic/xonotic-maps.pk3dir!156
SpiKe [Fri, 17 Jun 2022 06:31:12 +0000 (06:31 +0000)]
Implosion: A few tweaks to the catwalks below the map
terencehill [Thu, 14 Apr 2022 13:09:15 +0000 (13:09 +0000)]
Small campaign file fixup
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)
Spike29 [Fri, 1 Apr 2022 18:14:55 +0000 (20:14 +0200)]
Warfare: fix a misaligned exx/wall-pipe texture near the Devastator
Spike29 [Sun, 27 Mar 2022 18:01:11 +0000 (20:01 +0200)]
Glowplant: replace common/full_clip with common/weapclip
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)
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
bones_was_here [Sat, 19 Feb 2022 11:20:26 +0000 (21:20 +1000)]
Work around imagemagick regression that puts everything upside down
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
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>
Mirio [Thu, 9 Dec 2021 12:58:24 +0000 (13:58 +0100)]
Fix #197 and remove useless patch
Mirio [Wed, 8 Dec 2021 14:25:49 +0000 (15:25 +0100)]
Fix #165
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
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
Mirio [Wed, 8 Dec 2021 12:41:31 +0000 (13:41 +0100)]
Fix #196
Mirio [Wed, 8 Dec 2021 12:37:53 +0000 (13:37 +0100)]
Push Stormkeep map version
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
SpiKe [Wed, 8 Dec 2021 12:18:55 +0000 (12:18 +0000)]
Glowplant: clip two fan ducts
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
SpiKe [Wed, 8 Dec 2021 12:16:52 +0000 (12:16 +0000)]
Clip a hiding spot in the Hagar room, fixes #194
Mirio [Sun, 31 Jan 2021 14:20:32 +0000 (15:20 +0100)]
Add Cushion texture - thanks hotdog
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
Spike29 [Sat, 12 Dec 2020 17:14:54 +0000 (18:14 +0100)]
Set game type to duel instead of dm for the Fuse level
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
Wuzzy [Thu, 3 Dec 2020 14:47:23 +0000 (15:47 +0100)]
Remove nexball level from campaign
Mirio [Wed, 2 Dec 2020 16:32:43 +0000 (17:32 +0100)]
Fix #172
Mirio [Wed, 2 Dec 2020 16:04:15 +0000 (17:04 +0100)]
Fix #181
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
Mirio [Sun, 23 Aug 2020 16:08:13 +0000 (18:08 +0200)]
Fuse: Fix z-fight
bones_was_here [Sat, 30 May 2020 06:12:11 +0000 (16:12 +1000)]
Workaround for darkplaces#106 (blendfunc sorting)
Mario [Wed, 27 May 2020 13:53:37 +0000 (23:53 +1000)]
Add keys for the new spawnflags in trigger_viewlocation
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
Spike29 [Sun, 19 Apr 2020 11:00:45 +0000 (13:00 +0200)]
trigger_hurt: fix the INVERT_TEAM description
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
Spike29 [Sat, 11 Apr 2020 09:44:09 +0000 (11:44 +0200)]
Rephrase a few trigger_jump keys descriptions ('jump pad' instead of 'teleporter')
Mirio [Tue, 7 Apr 2020 13:09:43 +0000 (15:09 +0200)]
Add new map pictures, fixes #176
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
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>
terencehill [Sun, 15 Mar 2020 14:55:52 +0000 (15:55 +0100)]
Update some waypoint files
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
Mircea Kitsune [Sat, 18 Jan 2020 03:06:13 +0000 (03:06 +0000)]
Document new campaign functionalities in campaignxonoticbeta.txt
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
Mirio [Fri, 17 Jan 2020 23:57:47 +0000 (23:57 +0000)]
Solarium: Add duel
Mirio [Fri, 17 Jan 2020 23:57:08 +0000 (23:57 +0000)]
Drain: Add duel
Mirio [Fri, 17 Jan 2020 23:56:47 +0000 (23:56 +0000)]
Darkzone: Add duel
bones_was_here [Fri, 17 Jan 2020 19:58:20 +0000 (05:58 +1000)]
Add gametype duel to appropriate maps
bones_was_here [Fri, 17 Jan 2020 19:54:50 +0000 (05:54 +1000)]
Remove r_water* client settemps (these are blacklisted, fixes warning)
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
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.
Mirio [Sun, 5 Jan 2020 18:47:43 +0000 (19:47 +0100)]
Afterslime: Change misc_model to misc_gamemodel to fix jumppads
Mirio [Fri, 11 Oct 2019 22:49:05 +0000 (00:49 +0200)]
Fix #157
Mirio [Fri, 11 Oct 2019 22:40:23 +0000 (00:40 +0200)]
Fix #166
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
SpiKe [Sat, 21 Sep 2019 23:14:53 +0000 (23:14 +0000)]
Small patch fix on Implosion
Mirio [Thu, 19 Sep 2019 16:26:13 +0000 (18:26 +0200)]
Fix 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
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
Mirio [Tue, 6 Aug 2019 13:34:49 +0000 (15:34 +0200)]
Campaign: Fix Nexball level