32,562 Commits over 4,048 Days - 0.34cph!
cherrypick
39740 boat engine and heli rotor fixes
cherrypick
39740 boat engine and heli rotor fixes
Cherry Pick merge to main. Fixes discrepancy between client/server interaction caused by having a rigidbody on the server and not on the client. Now getting entity from the hit collider instead of the hit transform. This change is probably OK, but could potentially break something if anything relies on the base rigidbody object being returned on the server.
Cherry Pick merge to main. Fixes discrepancy between client/server interaction caused by having a rigidbody on the server and not on the client. Now getting entity from the hit collider instead of the hit transform. This change is probably OK, but could potentially break something if anything relies on the base rigidbody object being returned on the server.
Merged from crafting_improvements. Fix a tooltip glitch when icons refresh after favourite toggling. SelectedBlueprint now refreshes favourite status on toggle too.
Merged from crafting_improvements. Fix a tooltip glitch when icons refresh after favourite toggling. SelectedBlueprint now refreshes favourite status on toggle too.
Merge from crafting_improvements
Merge from crafting_improvements
Merge from "Helicopter Update Optimisation"
Merge from "Helicopter Update Optimisation"
Merge from "OcclusionSphere leak fix"
Merge from "OcclusionSphere leak fix"
▊█▆ ▌▅▇▍▋▊▅▆▄▌ ▉▍▄ "▄▊▇▌" ▆▅▆▆ ▍▇▄▍▋▌▌ ▋▉ ▊▅▊ ▍▌█▌ ▉█▍▆ ▋▉ ▆▇▌█▍▍▆▋▊█, ▆▍▌ ▋▆▄▄▌▇██▅ ▇▆ ▅▅▆ ▉▆▋▆▄▉ ▇▅▋▄▆▍
█▌▌ ▆▊▍▉▅▅▌▍▄▇ ▉▆▋ "▉▄▌▋" ▋▇▉▉ ▋██▉▆▍▌ ▅▄ ▍▋▉ ▆▇▉▆ █▆▄█ ▍▉ ▄▍▌█▊▄▍▊▉▅, ▇▆▉ ▆█▍▍▆▄▋▍█ ▌▊ ▉▆▉ ▉▆█▆▅▊ ▅▇█▋▋▆
▍▉▅▄▆ ▄▅▊▄▉▅▆ ▊▄▉▅▅█▌▇.▊▄▇_▆▊▋▉▍▍ ▅█▍▊ ▍▇▉ ▇▊▇▊▊▍█▇
█▋▊▍▋ ▆▉▉▆█▇▍ ▆▍███▅▋▍▄▆▉▋▊▄▋█▄▅▊▊▊.▄▋▍_▄▊▆▊▉▌▋▅▉ █▇█▆ ▍▆▉ ▆▉▆▅▅▍▆▋
▉▄█▅▋ ▋▆▅▅█▇▌ ▍▄▇▅▉█▅▆▋▇▆▅.▌▅▇_▅▋▊▌▅▇▉▅█▇▊▇▌▅▅▆▋ ▉▇▊▅ ▅▅▊ ▋▋▄▍▅▌▇▆
▊▇▅▇▉ ▊▆▉▇▍▍▋ ▍▄▇▄▉▄█▊▉▉▆▄.▊▄▅_█▆▉▍▉▄█▋▉▍ ▋▋▅▇ ▌▆▅ ▅▇▊▊█▄█▅
▅▅▉▊▊ █▉▆▉▌█▆ ▅▄▆█▉▄▇█.▄▍▄_▍▌▋▅▇█ ▄▉█▅ ▊▌▉ ▅▆▆▆▌▅▇▄
▆▊▌▇▋ ▇▌█▉▉█▆ ▄▊▋▍▆▆▌█▇▄▄▉▆▊▇▇▋▄▊▍▉.▍▋▅_▌▌▉▅▆▄▍▊▅ ▊███ ▇▄▊ ▇▌▋▆▊▇▅▅
▍█▋█▌ ▉▊▄▍▉▄█ ▊▊▆▆▅█▇▉▅▌▌█.▄▄▉_▊▅▉▉▉▋█▅▋▇█▌▊▍▇▉▌ ▆▉▍▊ ▊▉▅ ▆▍▉▍▄▉▆█
▋▍▍▍█ ▄▉▊▆██▍ ▊▉▊▊▋▇▄▆█▄▌▄.▊▇▇_▉▆█▄▅▄▍▄▋▍ █▅▌▊ ▍▋▅ ▅▉█▊▇▌▆▋
Quick/dirty decal shader adjustment for clipping issues in bullet decal vs toptier wall
Quick/dirty decal shader adjustment for clipping issues in bullet decal vs toptier wall
Merge from consumable_item_info_fix
Merge from consumable_item_info_fix
Merge from wounded_item_dragging_fix
Merge from wounded_item_dragging_fix
Merge from rig_stripping(temp)
Merge from rig_stripping(temp)
Merge from messagedelayfix
Merge from messagedelayfix
Renamed small generator to test generator not to be confused with the other small generator
Renamed small generator to test generator not to be confused with the other small generator
Fixed recycler sharing furnace localize token
Fixed recycler sharing furnace localize token
Merge to main: Adding support for connecting multiple clients at once locally. Can be useful for testing. New menu entries under Debug: Select Enable Fake Steam ID, then run the game.
Merge to main: Adding support for connecting multiple clients at once locally. Can be useful for testing. New menu entries under Debug: Select Enable Fake Steam ID, then run the game.
Fixed a bug with item splitter input being able to trigger after the inventory has closed.
Fixed a bug with item splitter input being able to trigger after the inventory has closed.
Ceiling light stackable (10)
Ceiling light no longer uses condition
Ceiling light bounds tweaks to fix repair (antihack) issues
Removed Ceiling light obsolete storage panel
Ceiling light stackable (10)
Ceiling light no longer uses condition
Ceiling light bounds tweaks to fix repair (antihack) issues
Removed Ceiling light obsolete storage panel
Set the FPS UI slider max value.
Set the FPS UI slider max value.
Merge from crafting_improvement
Merge from crafting_improvement
Merge from screen_settings (conflict in MenuUI.Options.prefab, appears to have resolved fine)
Merge from screen_settings (conflict in MenuUI.Options.prefab, appears to have resolved fine)
Merge from player_preview_spin (conflict in GameUI.Inventory.prefab, appears to have resolved fine)
Merge from player_preview_spin (conflict in GameUI.Inventory.prefab, appears to have resolved fine)
Merge from item_splitting
Merge from item_splitting
Merge from error_notifications
Merge from error_notifications
