157,133 Commits over 4,536 Days - 1.44cph!
biofuel_generator -> main
Merrge from main (need to regen test list, not done yet)
merge from automated_testing
Test framework cleanup following livestock merge
Commit the sheep blendshapes instead of everyone having to regenerate and cache them on asset import
Bugfix(editor): StoreBundleTool - update stale blurhashes when using an already uploaded image
Tests: ran Update Image Urls for a prefab where I setup some new fields
merge from JellyfishShader_edit
main -> biofuel_generator
merge from Livestock_animals
Fixed GIBs for fence and fence gate, removed crazy offset in fence prefab
Pie topper entity and viewmodel hook up
Fixed rich mutton pie name
Updated Nailgun World Model and Viewmodel to include magazine follower
Fix demoui2 scenes not saving
throwable_prediction_fixes -> main
- Fix beancan throw looking a little wonky
- Fix molotov not showing gibs on hit
Update: HttpImage now calls OnLoad callback with resulting texture/sprite
Needed for upcoming flashlight effect
Tests: naveigated through store
Updated jellyfish shader to allow sway to run seperately to pulse
- added new optimised jellyfish model
- added new mesh to prefab
- changed settings in jellyfish movement material
▅▊█▇ ▍▇▉▋▊ ▆▆▆▄ ▆▅▉▋ ▇▇▅▍ ▆▍█ ▍▋▊▅▇ ▄▌▆█▄▅ ▆▅▄▅▊▋▍▊█ ▆▄▍▅█ ▄▄ ▍▋▉▄▌▋▍▇ ▅▋██▊ ▇▍▌▍▄▌ ▇▊ ▆▊█▍▊█ ▅▌▌█▊▆▍▍ ▉▍▍▆▉▆ ▊▍▍▆▉▍▄▆ ▆▍▅▊▊▇▋▄▄▅▆▆▋ ▉▇▆▋ ▅▋██ ▍▄▋▆▅▍ ▇▋▆█▊ ▇▌▊▌▇▄ ▉▉▅ █▌▌▄▇█▅▉ ▊█▇▆▊▌ ▇▍▇▇▉ ▇█▇▌▊ ▉▌ ▍▍█ ▍▋▊▆▆ ▍▄▆▋▍▋ ▌▋▄▋▅█▋▄▆▍
Client predict molotov breaking
- would rather see broken fx and then have the fireballs spawn elsewhere than the molotov just not breaking
Fix incorrect rounding on vendor auction hqm ore
fix aiming not being accurate when using turn in place
Merge from new_achievements_oct26
merge from automated_testing
Fix machete worldmodel outline, add error message if theres stale entity type names in the testlist
Mergee from heldentity_persist_anims_subsystems_fix
Instantly release handles if no clear event is coming rather than doing fades, matches previous behaviour
Merge from render_pipeline_testing
Merge from /critter_animals
Converted the minerhat_lightcookie texture to be imported as a Cookie texture and disabled mip map gen to fix texture streaming issues that were causing problems for the light attenuation
▇▆▄▉▉█ ▆▋▊█ ▊▆▄▉▋▉▇██▋▊▇▉▆▌▆▅▇█▆▄▌▉▆▍▍▊▆▊ █▅ ▄▆▌█▌ ▄▊▇▌▇
▌▍▇▇▄▉▌▆▉▄ ▍ ▉▇▄▄ ▍▌▌ █▇▉▅▇▍▋▉ ▆▊▆█▋▉▅▅▊▌▌ ▉█▍▇ ▋▋▋ ▌▄▋▊ ▆▋▆▄ ▋▌█▋ ▊█▉▉▆▅▍ ▅▇▇ ▇▅▇▅ ▅▇██ ▄▋█▊▄▊▌▊██▅▊▌ ▇▋ ▍▆█▄▍▊▆ ▋▉▇▉▊ ▉▆▄ ▊▍▊▆▌ ▋▇▍▇▌ ▊ ▊▊▉▍▋▉▍█ █▍ ▋ ▆█▌▋▍▌ ▆▉▍ ▆▇▇▌▆▍▉▉▍ ▉▆▄▅▆▄▉▆ ▊▉▍▋ ▅▋▅▍▊▅█▄▋█▊▌▌█▇▆▊▋▌▍██▌▊▊▅▆▋▅▊▅▊▉▆▄▉▆▍▉▋▅▉▆▄▉▅▆▌▋▇▊▍▋▄▇▋▌█
Merge from save289 - Staging wipe!
Network++
Save++
persistance++
redo crouch changes after merge
merge from Livestock_animals
bradley flatbed
-collision update
-combined barrel, pallet, box and bed into one mesh
-baked LODs down to one material to reduce material count on lower LOD levels
-wind material setting tweaks
fix hunched over spine issues when aiming down
