36,996 Commits over 4,413 Days - 0.35cph!
Fixed crosshair popups regression from my recent generic popup changes
merge from spraycan_reskin_refactor
merge from keyboard_layouts_fix
█ ▄▊▇▊█ ▄▄▄█ ▆▊▅▅▆▇█▊▉█▊▍▊▆▆▊▇▌
player_loot_mark_dirty_fix -> main
merge from PlayerRigUpdate2 (just texture metas)
merge from resourcedispenser_allocs
Merge: from buildcommand_allocs
- Bugfix for enable_marker_teleport teleporting to wrong Z
Tests: unit tests + enable_marker_teleport
merge from playerboat_beached_flipping_fix
merge from keyboard_layouts_fix
Clean: add root-level *.slnx to plastic ignore list
Tests: plastic doesn't show it as a new file
Merge: from player_benchmark_improvements
- New: added PlayerModelBenchmark scene that tracks rendering cost of new player model
Tests: ran benchmark a couple times
▉█ ▌▇▊ ▍█▌▊██▄▇██ ▍▅▉▆▍█▇ █▌▄▊▄▌ ▇▉▍▊▅▋ ▇▇▌ ▌▊▄▆▇▍▅▅▊ ▋▍▊▌█▌▅▊▉▅▍▄▇▄▍▊▉▅▉▋▍▊▅▅ ▄▆▍▅▊▅█▇
merge from save285 - Staging wipe!
fixed BDU protection values switched
commiting a bunch of meta files plastic moaning about
ballistic armor condiction pass
Merge from tutorial_animator_fixups
Merge from PlayerRigUpdate2
merge from fix_guid_null_error
merge from fix_texture_analyzer_atlas
merge from ceiling_gold_stars_rotation
merge from Fix_odd_deployguides
merge from fix_ballistic_vest_description
merge from skinviewer_viewmodel
merge from kick_off_2_wallpapers
merge from skinviewer_viewmodel
mountable_rollback -> main
Subtract
152447 merge from unity_6.3.15/ddraw_text_spacing_fix
merge from skinviewer_viewmodel
▉ █▇█▍▇ ▇▄▌▇ ▇▅▆▌▋█▊▍▌▄▋▄█▊▇▇▆▇▌▊▊▊▆▋▅▊▇
Merge from rain_grace_fixes2
merge from ballistic_pass
Make UI_FullscreenSkinViewer a partial so it doesn't break after code gen.
Code gen.
steam_icons_upload_refactor_2 -> main
merge from rain_grace_fix
Merge from ide_warnings_fix
merge from skinviewer_viewmodel
merge from fix_hemp_collectable_wind -> main
Fix broken meta file for blue noise 64px, 38
merge from /unity_6.3.15/ddraw_text_color_fix
merge from unity_6.3.15/ddraw_text_spacing_fix
▇ ▆▋▄▌▋ ▇▄▄▋ ▉▆▄▇▌▍▋▌▋▄▇▆▆▍▆▇▍▆▋█
Re-run disable Bake on Scene Load for the cave
merge from terrain_lowering_nms_large_cave
Stomp cave scene
merge from heli_crate_train_wagon_fix
