135,837 Commits over 4,293 Days - 1.32cph!
reject player boat push from ladder
Fixes for getting the predicted post reload ammo count and paintball gun viewmodel
Merge from boat_optim_test/wip
▆ ▋▉▌▇▆ ▆█▌▌ ▍▋▅▄▌▋▄▄▊▌▄▄▊█▉█▊▋▆▄▅▄
merge from better_steeringwheel_clipping
- compile fix
▅ ▅▅██▉ ▇█▊▅▉▅▌▍█▉▆▌▊ ▄▋ ▉▆▋▇▅▌▉ ▊██▉▄▆ ▋▇▅▌▍ ▊▉▍▋▄▍▉▊▊
merge from better_steeringwheel_clipping
▅ ▉▋▄▉▌███ █▄▉█▍ ▄▆▇▉▉▆█▅▍ ▄▅▌▅▇▅▋▊ ▄▆▆▄▆▉█▉▉ ▄▇▊ ▋▌▌▍▊█▄▍ ▊▅ ▅▉▄▊▋▌▋▊▅ ▇▊▋▄▇ ▅▌▌▋▌▍ ▄▆▅█▅▅▇▌▉▌ ▄▌▍ ▌▅▊▄▉▋▊▌▌▍▄▄▄▌█▋▋▊▆▄▋▅▌█▉█▊▉▌▄ ▆▆ ▋▋▅▆▉ ▌▆▍▆▄▅ ▇▄█▅▆▍▅▌▆▌▋▆▋▆▅█▅▅ ▄▄▌▊▋▆▆▋ ▅▆▌█▇▋▊▄ ▉▇▄▇▇▊▊▆▄█▍▉█▄█▇ ▅▌▆▍▆▋ ▇▆ ▌█▋▌▍ ▌▉▄▊ ▋ ▋▋█ ▋▋█▇▉▊
▊▆▄▌▅▍▍▍ ▆▄▆▌▋█▇▊▍▍▉ ▌▇▌▋▊▄▆▇ ▊▌▍▆▋ ▌▆ ▊ ▅▊▌█▍▆▄▄
More monument blocker blockouts
merge from deepsea_heightmap_clearing_fix
clear deepsea heightmap data properly and centralized deepsea terrain data clearing in the manager
Updating knight armour skinning and burst cloth setup
Merge from main, very spicy merge
Vert.metal.female.prefab directory conflict - deleted on this branch but modified on main, kept the delete
Merged 388 prefabs
Manual conflicts, kept version on this branch:
sunglasses_blocky.prefab
FemaleUnderwear_twitch_legs.prefab
FemaleUnderwear_twitch_torso.prefab
MaleUnderwear_twitch_legs.prefab
Egg.suit.prefab
swimwear_01_legs.prefab
swimwear_01_tors.prefab
swimwear_02_legs.prefab
swimwear_02_torso.prefab
swimwear_02_torso.prefab
swimwear_06_legs.prefab
frankensteins_moster_01_legs.prefab
frankestenis_monster_01_torso.prefab
frankensteins_monster_02_head.prefab
frankensteins_monster_02_legs.prefab
frankensteins_monster_02_torso.prefab
FemaleUnderwear_mummywraps_bottom.prefab
FemaleUnderwear_mummywraps_fullbody_bottom.prefab
FemaleUnderwear_mummywraps_fullbody_top.prefab
MaleUnderwear_mummywraps_bottom.prefab
cake.entity.prefab
MaleUnderwear_coconut_Legs.prefab
MaleUnderwear_coconut_top.prefab
Underwear_female_coconut_bottoms.prefab
Underwear_female_grassskirt_bottoms.prefab
Underwear_female_grassskirt_top.prefab
Merge from artist_pack_dlc
Remove some unnecessary allocations from methods in BaseProjectile
- Paintball gun viewmodel improvements
- Add method in BaseProjectile for the client getting the predicted ammo count at the end of the next reload, can be used to update visual stuff without having to wait for the actual ammo count to update, ala paintball gun
- Remove useless code from HeldEntityHolsterEditor that was throwing null exceptions
Parachute can now be added to the hotbar, we have the technology
catching up with naval_update
Full set of paintball splat decals & related files.
Skip some stuff when removing children for edit mode.
Remove an unused client function and call.
More profiling.
Bulb material consistency
pt_boat_turret_seat_angle_fix -> main
Mounted scientist seat now moves closer and further away from the centre depending on how far tipped up the weapon is to try and keep the hands at a stable level
This makes scientist animations at extreme angles much better
Fixed more crashes and many potential crashes to do with models
Update: add StressTestImmediateCaptureMT test
It smashes the profiler from all 20 threads doing allocations and calling methods, while main tries to record just 1 method in a loop. This triggers heap corruption - think allocation pooling would solve this.
Tests: ran extra unit test - it failed drastically
merge from rug_window_fix
Fixed bear rug not deployable on windows
Stop another prop renderer log
