128,955 Commits over 4,232 Days - 1.27cph!
Merge from main (attempt 2, same as last time but kept destination changes on copypaste)
Merge from main (deeply cursed merge)
Manual changes in:
GameManifest-Generate.cs
CopyPaste.cs
BaseNetworkable.cs
BaseEntity.server.cs - could not merge at all, ran text merge
GeneralEditorPrefProvider.cs - could not merge at all, ran text merge
GameUI.Hud.Map.prefab - kept source changes, will need to redo naval map changes
JunkpileWater.cs - complete nightmare, kept source changes and will redo naval changes
Override the lerp, not the position
Add rotateAroundMuzzlePoint slider to ViewmodelSway component
Add a overrideSwayOriginPoint field, can be used to modify the other side of the sway lerp (overrideSwayOriginPoint -> muzzlePoint with rotateAroundMuzzlePoint lerp value)
Removed swimScale and swimSpeed from riflebullet and snowballgunbullet Projectiles as it was contributing to trajectory mismatch projectile invalids
material color tweak to better track the unoptimised original look
First WIP prototype for component displaying box skins
fixed interior props cull group being disabled (was temporary)
added walkway A ambience files
tweaked sec tower LOD3 alpha cutout
enabled LightGroupAtTime on barges
distance tweaks to lift
killed shadows on sec tower spotlights
▍▌▅▌▍▆_▅▉▆▉█▌▇▋▍▊_▇▍▄▇▅▅▋ -> ▆▅▍▋
█▉█▊ █▇▋▄▅▅ ▋▄▊▆▆ ▍▌▇▍ ▄▍▌▉ ▍▄▇▌ ▆▍ █ ▌▌█▍ ▋▌▍▍▇▋▋ '▄▊▊▄▋' ▌▅▊▄
heavy_helmet_overlay_fix -> main
Fix binoculars + the heavy helmet from rendering weird
security tower a lod3 baked now
setup flashlight refresh vm anims
Heavy plate helmet repose
Stray light fix.
Cleanup.
Fixed skin viewer having the pumpkin lighting enabled at all time...
menu_bootstrap_change -> main
Changed finalising to finalizing on bootstrap to better match the other north american spellings in the game
Moved ambient flies to prefab & improved them.
More work on floating walkway optimisation. Flipped normal map of plastics B
Adding v4 snowmobile shooting anims
Fix compile error in SocketMod_Anchor
Merge from floating_cities
First pass of distributing health back to blocks when converting a damaged boat to edit mode.
Adjust floating city mission provider transform on Casino Barge
Run S2P for floating city scenes
Timeshimmer off globally on plight.flares
building_planner_viewmodel -> main
Merge: from hide_getinternalarrayunsafe
- Replaces dangerous API with a safer, updates existing use cases
Tests: unit tests
Update: replace invalid usage of GetInternalArrayUnsafe
Tests: none, trivial change
Update: Hide List.GetInternalArrayUnsafe
- introduce ListAsReadOnlySpanOf to help deal with casting up (since we don't have ReadOnlySpan<T>.CastUp<U>)
- added simple unit tests
Tests: ran unit tests
Merge from naval_missions
Run S2P on a bunch of scenes due to updated NPC prefabs
Aniso angle improvements on the nets.
PFX pass.
Merge from naval_missions
