145,866 Commits over 4,413 Days - 1.38cph!
Merge from shadow_convars_fix
Updated the shadow quality presets to set their parameters on the ConVar properties set method to fix an issue where the preset wasn't been set correctly
T2 bench prevent building setup
renamed mortar materials to match new naming conventions
T1 bench prevent building setup
Ignore the full filler, just use the individuals.
Updated the dev-only debug shadow ConVars to prevent them from being saved and loaded
mortar updates to the guide mesh. Lods no longer display.
update to gibs are now the right size and orientation.
Fixing dracual cape vertex being skinned to eye lids
▉ ▌▋█ ▉▅▅ ▅▌▆▄▅▌▊ ▅▍▄▍ ▆▆ ▆█▇▄▅ ▅▇▆▋▆▉▆▇ ▅▇▅ ▊▅▍█▋█ ▌▌▇▍▅▍▇ ▇▉▌▇▍▍▄█▊ ▆█▌▌
update mortar and basic ammo icons and reconnect in item prefab.
updated manifest
Merge from workbench_upgrades
█ ▊▍▊▋▊ ▇▅▇▋ ▄▄▅▊▇█▇█▅▋▋▉▊▊▋▉▍▋▊▄▄▆
Also cache and apply scale for upgrade visuals .
Applied to all workbenches.
merge from main
auto-resolve VendingMachine.cs and proto
Mortar animation polish and clip updates
updated crypt building skin icon
merge main -> rust_relay_server
Adding low fences LOD0's
Updated playground fences
Merge from heightmap_bake_fix
adjusted surplus upgrde position
Revert TerrainHeightMap from bad merge
merge from main, will rebuild mainifest
Use meshes for hole shapes
Switch to using CommandBufferManager to keep hole and terrain render order
Add cylinder mesh that matches radius of terrain modifiers
Hole editor clean up
▋▌▍▆▆█ ▌▄▊ ▋▍▊▉▄▇ ▊▋▌▇ ▅▋ ▅▊▅▌▆▅▅▇▌▍▇▊▆█▋ █▍ ▅▄▊ ▄▇▄▇▄▉█ ▄▌▉█▊▄ ▅▊▆▋▇ ▄▇▋ ▋▋▋ ▊▍▆▉▊▅▋ ▋▆█▋▋▊ ▋▌▊▋ ▅▉▆█ ▊▊▄▌█▋ ▊▄▋▍ ▆▊ ▆▋▄▇▍▇▊▌ ▋▇▉ █▌▊▍▉▇ ▊▉▅█ ▆▍ ▇▅▊ ▆█▅▊█▉█▅
▆▉▆▍▋▊ █▉█ ▇▆▌▌█▊▄▇▆▇▋ ▊▍█▌▋▉ ▆▉▄▄▉▄ ▆▆▅▊ ▊▆▍▉▌▋ ▌▌▌▅ ▆█ ▍▊█▄ ▌▌▍▇▅█▆▆▇▌▉█▋ ▆▉▉▇▄▇▄▇▋▌ ▌▅▉▍▊▇ ▌▊ ▇▉▉▅ █▆▋ ▉▆▄▋▆▍▆▇▅▊ ▉▊ ▄▍▆█ ▋▅▍▄▆▉ █▊▌█▆▅▌ ▅▄▅▇▉█▅ ▍▉▉▌▊▋█ ▇▄▋▋▊▅▅ ▌▄█▅▉▍ ▋█ ▌▋▋ ▅▉▍▊▇▆
▋▆▉▋ ▇▋▍▄▇ ▍▉▄▅ ▍▍ █▌▊▆ ▇ █▊▆█▊▍█▍ ▌▆▆▋▌▅ ▋▊▌ ▊ ▋▍▄█▆▋▇▆▌█▌▉▇▉▅ ▊▋▄▄ ▄▅▇▆▄ ▆▅▋▋▆▍▅▇▊ ▆▌ ▇▆▄ ██▅█▄▄ ▄▆▍▊▊▆█ ▋▊▋█ ▇▊ ▄▅▅▄▊▄▍ ▆█▍▄
▆▍▌▉▌▌ ▉ ▉▆▊▋ ▆██▆ ▌█▍ ▆▍▇█ ▄▅▉▇▉ ▇▉█▌ ▉█▅█ ▉▍▍▉▇▇▅ ▊▊ ▌ ▇▉▇▋█ ▆▅██▉▋▌ ▋▄▉ ▆▆▄▋ ▋▆ ▌▆ ▄▊▌▉█ ▌▊▅▋ █▇▅▋ ▅▉▅▆▋▄▄▊
▊▊▅▇█▍▄▄ ▅▆▄ ▉▋▍ ▉▅▄▇ ▆▉▆ ▅▍▋█▊▋ ▊▆ ▊█▆▄ ▅▄▉▅▆ █▌ ▉▌▄▉▆ █▆▇ ▊▆▅▊▋ ▆▇ ▉▋▇▌▋▆▇▌█
▅██▅▍▅▊▉▍ ▌▇▋▄█▌▉▊ ▋▆▅▄▍▋█▇▄▌▄▍▌▅▍▊ ▅▋█▇▉▆▆▋▊▉ █▋ ▊▌▇▉▅▄▆ ▍▄▅ ▆▊ ▄▋▍▆▉▊▅▋▇▄▍▊▇▆▄▉▍▇██▇▊▋▅█▉▌▌ ▌▄▊▍▉▌▇ ▋▆▄▆▄▇▊ █▉ ▍▊▅▍▍▋▄▊▊▌▇▇▄▌▋▄▋ ▇▌▆█▍ ▅▉▍▆
▊▅▋▍▉▆▅ ▄▌▉▉ ▍▇ ▌▅▍ ▆▅▅▋ ▍▊▉▄▆▇▍ █▋ ▄▋▋▆▄ ▇█▉ ▌▄▊▄▇▍▇▆ ▋▉▇ █▄▌▋ ▆▌▍ ▍▉▊▊
▄▆▊▆ ▅▊▌ ▉▉█▇▉▇▇ ▄▄▍▆▄▊▉▍▄ ▄▍██▉▌▊▊▍▄▄ ▇▇▄▌▉▍▋ ▉▆▍ ▊▄▉▇▅▊▉█▄▅▇ ▅▅▊▇▋▅▆▊ ▌▋█▉▇▍▋▄ ▅▋▅ ▍▄▋▄ ▇▌▍▅█▆▄▆▌ ▌▊ ▆▅ ▇▉▌▋█▌ ▇▆▆▉▆ ▇▇ ▊█ ▋▍▆▇█▄▆█▌▄▌█▌ ▉▉▋ ▊▋▉▊▉▌ ▇ █▆▇▌ ▅▇▋▋▄▊▊ ▉▍▉▇▌▅▅ ▄ ▄▋▊ ▇▉▊▊▋▉▉
vendingmachine_ui_refresh -> main
main -> vendingmachine_ui_refresh
Add condiiton and slot support to fake inventory
Support skins on collapsed shop view
Check skin ID before allowing a purchase
Fix a couple of bugs with cost skin id not being detected properly
Added independent skin support to cost item (was only supported for selling item before)
Merge from main
Cannon.cs and PlayerModel.cs conflicted, auto merged
▌ ▆▊▅▊▌▇ ▉▆▋▍▋█▅▄▌▋▄ ▌▋▆█▇▉▍▄▌▇▅ ▉▍ ▇▄▋▌▌▋▄▌▇▄▋▉▌▇▆▅▅▅▇
▌▋▆▋▋▅█▉ ▄▍▉▆▄ ▄▊▉▍▌▋▍▍▄▄▌ ▋▋▅▅▉▍▆▋ ▆▋▅▋ ▄▊▉▅
