106,698 Commits over 3,836 Days - 1.16cph!
More explosion stuff (subbranched because spam)
Merge Main -> Experimental
▊▋▆▆▇ ▋▆▊▄▌▉ ▍▇▍ ▇▌▋ ▉█▍▍▋▉▍ ▇▊ █▌▄▅ ▊▇▍ ▍▆▅ ▋▆▄▉▇▋▄_▊▋▋▄▉_▅▆█▍▄▍▍▌. ▅▇▌▋▆ █▉▌▆▅ ▄█ ▋▆▅'█ ▉▌▉▆ ▊▍ ▆▊▉▍ ▊▌▋ ▊▆ ▍ ▍▇▍▇ █▆▇ ▍▅▅█▉ ▋▉▋ ▍▅▍█▅▇
Minor edit, fix misplaced bracket
Merge ScreenshotConsoleBlur -> Main
▄▌▅▉▍▄▍▅▊▋▇▊ ▇█▆▍█ ▊▇▋ ▉▄▄▌▄▊▌▍▆ ▋▉▉ ▋▌▆ ▍▆▆█. ▌▄▌▇▇ ▅▄▍ █▌▌▄ ▉▌▇▇▄▋▆ ▉▇▆▍▍▍▆▋▌█ ▆▆▋▆▅▉ ▋▊▊▋▋ ▍▊█▄ ▇▊▍▊▇ █▅▆ ▍▋▅▊▅.
Alternative spike atlas method & related files.
merge from main from
80005
▇▊█▆▄ █▍▊▇▋ ▆▄▋▋▉▄▌▌▄▉▄▇▆ ▄▄▉█▅▅▌█ ▊▆▉▇▉▅ ▋▊ ▊▊▌▄▅▇█▆▆ ▌█▌▊ ▌▄▅▄ ▇█ ▆█▄▌██▆ ▉▋ ▅▇▄▍ ▅ ▆█▌▆▆▅▊ ▉▇▅▇ ▋▄▌▋▆█▇▅▊ ▉▅ ▉ ▋█▊▌▋▊▄ ▍▋█▋ ▇█▅▍ ▋▆▋▊▄▍▉ ▊▇▇▋▉▋▍▍▆▊▄
6 point normals, gradient normals & standard planes with halved UVs
merge from gameplay_metrics
Fix crafting ingredients being marked as produced instead of consumed
Diogo's refraction shader fix.
Explosion test files & scene backup
Fix error when logging server performance
Check if AnalyticsSecret is empty rather than null
Using the staging api for server analytics
Merge from nuclear_missile_silo
Resolved remaining scene errors (hopefully) - namely MissingComponentException resulting in DeferredMeshDecal NRE on nuclear_silo_room_j.prefab
S2P
Assign missile_silo monument bundles
Created additonal control_panels prop variants
Added them to the scene
Scene2prefab
merge from nuclear_missile_silo
Removed deferred decal script from an object that shouldn't have it
Fixed material mismatch on room prefabs
Fixing terrain sampling issues
merge from gameplay_metrics
Remove redundant using statements causing compile errors
Merge from main -> gameplay_metrics
Finished subsurface scattering support for standard shading model; added "Rust/Standard Subsurface" shaders
merge from gameplay_metrics
merge from sav_extra_json
ferry terminal dressing progress
drawbridge model vcol update
material tweaks
ferry ramp flaps LODs/Colliders and prefab
merge from nuclear_missile_silo
merge from nuclear_missile_silo
removed the old saddle from stables vendor and added the two new ones.
Disable rich text in a few places
Fixed server compile error cause by rust editor tools window
Fixed antialiasing settings not reverting when taking normal-res screenshots with transparency. Fixed settings bug with hi-res transparent screenshots.
Merge from more_map_markers
Added support for custom size for hi-res screenshots in builds. New convar is Screenshot.HiResScreenshotCustomWidth. Set to 0 (the default) to use default hi-res screenshot size, which is 4x your native resolution. Set to any other number to use that number (clamped between 128 and 16384).
