12,753 Commits over 2,315 Days - 0.23cph!
Fixed the AI boat triggers on the islands as well, S2P everything
Merge from floating_cities
Fixed death screen fade not working correctly in deep sea
Merge from naval_update/floating_cities
Fix boat avoid triggers on floating cities not marked as triggers, causing players to get yeeted out of every floating city at high speed
Added DynamicSafeZoneArea to floating cities, triggers the hostile top right warning indicator when close to the floating city
Show a right click context option to add the selected item to the current tech tree graph
Fixed death screen not showing rocket icons from the RPG skin
Fixed tech tree editor window populate buttons not working
Fixed incorrect elevator power usage
Merge from hackweek_boxsorting
Enabled sorting on all DLC storage items (including all barrels)
Fixed translation not working
Merge from puzzle_reset_changes
Added a toast if the player is in range of a monument resetting to tell them to leave, off by default (server.monumentPuzzleResetWarnings)
Fixed elevators losing power when power is plugged into a non power slot somewhere in the column
Ghost ships now show a map marker
Fixed rotation of deep sea island icons
Merge from floating_cities
Fixed some missing farm access dialogue
Disable the disco ball light emitters entirely with a tight LOD range, saves around 200k triangles, 300 shadow casters and a few hundred batches
HLOD will no longer modify LODComponents at runtime that are controlled by culling volumes
These two systems were fighting for ownership of components which was resulting in some objects that should be culled being displayed, this would occur inconsistently as the HLOD staggers it's work over multiple frames but the culling volume is instant
This commit doesn't actually fix the issue on prefabs, will require S2P and regeneration of HLODs on floating cities (and possibly other monuments)
Merge from hackweek_boxsorting (last UI pass)
Merge from box_sorting_ui
Merge from main
Automatically resolved conflicts in flare.weapon, planner.prefab, chainsaw.entity, HeldEntity.cs, PlayerModel.cs
Merge from main_merge_31_oct_try_again
Delete duplicate DDrawCommand file
CopyPaste updates
Reapply junkpile water changes
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)
Merge from hackweek_boxsorting
Fixed sorting settings missing some localization
Switch fog of war back to the background thread, seems to work locally?
Merge from attackheli_fixcar_changes
Merge from krieg_boulder_outline
Merge from egghunt_invis_fix
Merge from hackweek_boxsorting
