]>
git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/log
SpiKe [Tue, 30 May 2023 18:16:46 +0000 (18:16 +0000)]
Bromine: disable the grass shadows + minor fixes
bones_was_here [Sun, 28 May 2023 05:32:20 +0000 (05:32 +0000)]
Merge branch 'pending-release' into 'master'
Merge pending-release into master
Closes #204
See merge request xonotic/xonotic-maps.pk3dir!171
bones_was_here [Sun, 28 May 2023 04:20:56 +0000 (14:20 +1000)]
entities.ent: update small & medium health & armor bbox heights to match 0.8.6
SpiKe [Sat, 27 May 2023 18:55:35 +0000 (18:55 +0000)]
Merge branch 'drjaska/campaign_update' into 'pending-release'
Campaign update
See merge request xonotic/xonotic-maps.pk3dir!178
Dr. Jaska [Sat, 27 May 2023 18:55:35 +0000 (18:55 +0000)]
Campaign update
Spike29 [Wed, 24 May 2023 20:33:16 +0000 (22:33 +0200)]
Trident: relink the waypoints (the link between the MG and the nearest jump pad was broken)
Spike29 [Wed, 24 May 2023 20:05:51 +0000 (22:05 +0200)]
Trident: fix misaligned textures on the wall behind the Electro
Spike29 [Wed, 24 May 2023 15:47:41 +0000 (17:47 +0200)]
Move sound/map_glowplant/spark.ogg to sound/machines/spark.ogg
bones_was_here [Mon, 22 May 2023 02:15:22 +0000 (12:15 +1000)]
entities.ent: Rename item_armor_mega from "Large Armor" to "Mega Armor"
Spike29 [Sun, 21 May 2023 19:25:25 +0000 (21:25 +0200)]
Update go.waypoints.cache
Spike29 [Sun, 21 May 2023 19:06:25 +0000 (21:06 +0200)]
Merge branch 'master' into pending-release
SpiKe [Sun, 21 May 2023 18:54:16 +0000 (18:54 +0000)]
Merge branch 'bones_was_here/item_bboxes' into 'master'
Update entity definition bboxes to match 0.8.5 and/or xonotic-data.pk3dir!1131
See merge request xonotic/xonotic-maps.pk3dir!175
Spike29 [Sun, 21 May 2023 16:56:48 +0000 (18:56 +0200)]
Bump Afterslime map version
Spike29 [Sun, 21 May 2023 16:54:38 +0000 (18:54 +0200)]
Afterslime: Move 2 item_cells entities a bit so the left one doesn't appear to be floating
Spike29 [Sun, 21 May 2023 12:13:05 +0000 (14:13 +0200)]
Merge branch 'master' into pending-release
SpiKe [Sat, 20 May 2023 16:20:15 +0000 (16:20 +0000)]
Merge branch 'debugger/go' into 'pending-release'
Debugger/go
See merge request xonotic/xonotic-maps.pk3dir!43
Mirio [Sat, 20 May 2023 16:20:13 +0000 (16:20 +0000)]
Debugger/go
bones_was_here [Thu, 18 May 2023 15:09:57 +0000 (01:09 +1000)]
entities.ent: update dom_controlpoint bbox to match xonotic-data.pk3dir!1131
Previous values don't match 0.8.5
bones_was_here [Thu, 18 May 2023 15:00:03 +0000 (01:00 +1000)]
entities.ent: update small & medium health & armor bbox heights to match xonotic-data.pk3dir!1131
bones_was_here [Thu, 18 May 2023 14:55:51 +0000 (00:55 +1000)]
entities.ent: update weapon bbox heights to match 0.8.5
bones_was_here [Thu, 18 May 2023 14:56:38 +0000 (00:56 +1000)]
entities.ent: update mega & big health & armor bbox heights to match 0.8.5
item_health_big is correct already.
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, 10 May 2023 17:14:00 +0000 (17:14 +0000)]
Merge branch 'Spike29/maps_removal' into 'pending-release'
Remove Drain and Oil Rig
See merge request xonotic/xonotic-maps.pk3dir!161
SpiKe [Wed, 29 Mar 2023 08:03:49 +0000 (08:03 +0000)]
Merge branch 'proraide/trident' into 'pending-release'
Add trident map
See merge request xonotic/xonotic-maps.pk3dir!169
Amadeusz Sławiński [Wed, 29 Mar 2023 08:03:49 +0000 (08:03 +0000)]
Add trident map
Spike29 [Tue, 7 Mar 2023 14:55:09 +0000 (15:55 +0100)]
Merge branch 'master' into pending-release
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
SpiKe [Fri, 20 Jan 2023 13:16:09 +0000 (13:16 +0000)]
Merge branch 'Spike29/atelier_teleporter_fix' into 'pending-release'
Atelier: place the teleporter exits slightly above the ground + use nodrawnonsolid instead of caulk for the decals
See merge request xonotic/xonotic-maps.pk3dir!166
SpiKe [Fri, 20 Jan 2023 13:16:08 +0000 (13:16 +0000)]
Atelier: place the teleporter exits slightly above the ground + use nodrawnonsolid instead of caulk for the decals
Spike29 [Tue, 17 Jan 2023 18:20:40 +0000 (19:20 +0100)]
Merge branch 'master' into pending-release
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
Spike29 [Thu, 29 Dec 2022 11:01:57 +0000 (12:01 +0100)]
Implosion: update the screenshot to reflect the recent changes
SpiKe [Tue, 27 Dec 2022 09:05:42 +0000 (09:05 +0000)]
Merge branch 'Spike29/implosion' into 'pending-release'
Implosion: Flare lights + clip some walls + brush and texture cleanups
See merge request xonotic/xonotic-maps.pk3dir!163
SpiKe [Tue, 27 Dec 2022 09:05:41 +0000 (09:05 +0000)]
Implosion: Flare lights + clip some walls + brush and texture cleanups
Spike29 [Tue, 27 Dec 2022 08:59:30 +0000 (09:59 +0100)]
Merge branch 'master' into pending-release
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 [Sat, 22 Oct 2022 09:35:04 +0000 (11:35 +0200)]
Merge branch 'master' into pending-release
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 20:34:18 +0000 (22:34 +0200)]
Merge branch 'master' into pending-release
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)
SpiKe [Sat, 27 Aug 2022 09:15:36 +0000 (09:15 +0000)]
Merge branch 'Spike29/stormkeep' into 'pending-release'
Stormkeep: Fix a wallwalk to the MH
See merge request xonotic/xonotic-maps.pk3dir!162
Spike29 [Wed, 3 Aug 2022 09:55:26 +0000 (11:55 +0200)]
Implosion: Fix misaligned solar panel textures on the blue side
Spike29 [Sun, 10 Jul 2022 08:57:32 +0000 (10:57 +0200)]
Fix a wallwalk to the MH by moving some brushes 0.125qu + minor brush cleanups in the MH area
Spike29 [Mon, 4 Jul 2022 18:55:04 +0000 (20:55 +0200)]
Glowplant: sound/map_drain/spark.ogg no longer exists, move it to sound/map_glowplant/ instead
Spike29 [Mon, 4 Jul 2022 17:30:33 +0000 (19:30 +0200)]
Remove Oil Rig
Spike29 [Mon, 4 Jul 2022 17:24:58 +0000 (19:24 +0200)]
Remove Drain
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
projects / xonotic / xonotic-maps.pk3dir.git / log