136,459 Commits over 4,324 Days - 1.31cph!
Merge from /tropicalocean/
Deep Sea ocean iteration, and post tweaks.
Clean: reclaim occludees name
Tests: compiles
Fixed the issue with photo frames having the photo rendering on the frame
merge from vending_cluster_pool_leak_fix
merge from sks_skinviewer
Set up preliminary stone component box prefabs (WIP), added LODs, deleted obsolete blockout mesh, ran manifest
Fix vending machine pool leak
Vending machine map marker clusters were leaking a bunch of data every time you open the map
Added SKS to the skin viewer
Bugfix: OcclusionGroups - make subscribers leave occlusion group once player leaves it
- add similar logic to subscribing to a cell
This fixes the new unit test, but trips up the old (though I feel the asserts there might be wrong, need to double check). Will validate, but likely will rewrite new logic to be simpler.
Tests: unit tests
Removed inactive couch from ghostship, it was getting the way of the locked crate spawn.
merge from "paintball_gun_tests"
ran manifest, ran icon manifest, ran localization
box armour item, prefab, icon, matrix
subtractive merge (sorry about that)
merge from paintball gun test
merge from paintball gun tests
▅█▌▉█▍▇▍ ▄▅█▄ ▅█▍█▄▅ ▉▆▆▌▄▋ ▆▄▄▇▇▄▍ █▉▉▍▍ ▉▆▄▌▌▊▋▍ ▅▄▉▄ ▌▊█▉█▅▋▆█▅ ▇█▍▄▊▍▆▄█▊▉ ▄▌▌▅▋▇▉▅ ▄▉▅█▍█▊▉ █▄▇▌▋▉█▍
Merge from UpdatedVisibleHolsteredItems_gc_fix
Removed Linq usage from UpdatedVisibleHolsteredItems, saves some GC
Replace TravellingVendor's FetchTargets Vis lookup with a quick iteration over subscribed connections, shuold be faster (in theory, couldn't reproduce slow physics in the editor)
Move ConVars to terrain ConVars
Add terrain renderer to WorldSetup
Add terrain mesh culling toggle
Merge from main
Conflicts on w_sks_rig.fbx and associated meta file, used the version from main as that's technically the latest but this will stomp the changes made in
129608 (29/08/2025)
Auto merge PlayerModel.cs conflict
Merge in error spam scene fix.
fix error spam in edit mode on island scenes
fixed SKS skinnable downloadable mesh filepaths
Underrwater breath bubble improvements. No longer fixed above your head no matter how you move.
Deep sea ocean color tweaks.
Fixed ocean fogging radically changing when approaching the ocean surface.
Various more deep sea ocean tweaks.
Reverted missing imposter fix on a couple of palm variants. Both tropical and desert. (It was intentional)
Undeleted their materials.
Merge from discord_sdk_1.8
Update manifest again
- RHIBDriver had import error locally?
Commit paintball gun code progress
Another burst compile error
fixed scrap XXL and XL, lightup XL guide meshes missing, tweaked collision surface types on all frames to be realistic
disabled off repair on frames
Fix NRE in Construction.DoPrepare() when allSockets is null
tweaked deploy on paintable reactive target and fixed offset paintable collision on ornate frame xxl
Start by updating the manifest
merge back buoyancy_improvements.
shared static buffer size changed - pulling this changeset requires an editor restart.
Add readonly container for ocean simulation data to make parallel use a bit more sane, it was previously just disabling all read/write restictions.
Fix native grid not having a non unique add method like the managed version.
