38,801 Commits over 4,536 Days - 0.36cph!
Merge from naval_update, revert oilrig scientists
Merge from indirect_instancing (also force-disables it for non developers)
Merge from mac_foliage_tearing_fix
merge from deepsea_portal_weather_fixes
merge from deepsea_portal_weather_fixes
merge from deepsea_demos_fixes
merge from spacestation_storepages
merge from birthday2025 (safe skin viewer position tweaks for the balloon pack)
merge from space_storepages - added hyphen to LR-300 description
merge from space_storepages - contains latest from space_station_weapon_skin and space_station_building_skin
▍▋▄▉▇▋▇▄▌▄▉▊▄ ▌▋▆▍▋█▍▋▊▉▍▄▊▍▊▇▆ ▍▊▉▆ ▍▇▊ ▇▊▄▋▉▌▅▌▄▌ ▅▅▆█▌▇▍▍▇▅▄▉ ▋▋▋▋▉▅▍▄▋▍█▉▉▄▇ ▅ ▆ ▋█▅▄ ▋▋▉▄ ▌▄▆▊▇▊▅▊▌▍ ▇ ▄ ▋▇▍▍ ▍
Merge from item_ownershipsshare_free
Merge from changeset
138978 (mission change and leak fix)
Merge from changeset
138975 (another leak)
merge from triggerparent_pooling_leak
Merge from changeset
138967 (fix leaky lists)
Reverting shadow bias change for this patch to see if it was the cause of the checkerboard shadow bug on AMD GPUs
cherrypicking
131909 rowboat_outboard_collider_issues &
131947 primitive_colliders (was only merged to aux)
merge from space_station_weapon_skin
merge from LadderMove_AndTreeMove
Merge: from invis_phantom
- Bugfix: old ServerOcclusion logic could spawn a phantom player on the client for invis players
Tests: on a fresh server tried to come into range of invis player - phantom no longer spawns. Validated UsePlayerUpdateJobs 0, 1, 2
Fixing Jenkins pipeline flow when pushing a client build with skipped unity build step.
Cherrypick from
138740 (fix player teams error in kill entity mission event)
merge from main/space_station_weapon_skin
merge from Techtree_PrimHard_Nava
Merge: from spectate_3p_fix
- Bugfix for spectating yourself causing a client crash
Tests: tried to spectate via F1 menu - no longer possible
merge from space_station_weapon_skin
Merge: from spectate_3p_fix
- Bugfix: fixes 3rd person spectate camera not following spectated player
Tests: spectated target in 3rd person while original body was in a box - camera orbitted target as expected
merge from space_station_building_skin
Merge from naval_update (including network++)
Merge: from jobs_noclip_mask_fix
- Bugfix for UsePlayerUpdateJobs > 0 NoClip checks incorrectly using vehicle layer mask
- Updated unit test to check for above case
Tests: ran unit test, tried to push against modular vehicles on craggy
Cherrypick from
138603 (mission fixes)
Merge: from jobs_coarsedist_crashfix
- Bugfix: fixes crash when players connect to a fresh server with UsePlayerUpdateJobs > 0
Tests: local C+S with UsePlayerUpdateJobs 2 enabled from the start - no more exceptions by height and shoredist jobs
