34,473 Commits over 4,201 Days - 0.34cph!
merge from mapper_requests_may22
merge from interaction_sounds
merge from death_screen_improvements
Merge from spraycan_merge2
Merge from spraycan_merge2
Merge from answering_ui_fixes
Moved gizmos script to an Editor folder
Added support for editor gizmo toggle preset groups. Can save/load 4 sets. Window->Tools->Gizmos.
Needs a cleanup and some testing.
merge from hapis_conversion
Fixed speargun not appearing in players hands when equipped (wasn't just an NPC issue)
Added world colliders for the end railings on the wagons
Re-disabled vehicles parenting to other vehicles for now (was recently enabled on train wagons, flatbeds, scrap heli). There are issues around velocity when entering and leaving the triggers that I don't have the time to solve right now. It would be nice to support minicopters being carried on train flatbeds among other things, so I'll enter this as a task for the future.
Merge from spraycan_merge2
Fixed a couple of bugs with vehicle trigger parenting
ScrapTransportHelicopter terrain collision proxy script
Updated the scrap transport heli server-side world collider setup to include the gap at the back, so that other vehicles can plausibly be loaded in.
Removed train wagons from my test map
Revert the wearable LOD4 commit. Not going to be worth it with the fixed LOD ranges we have for all wearables.
Added support for LOD 4 in Wearable and SkeletonSkinLod
- ▋▋█_▇▉▌▉█▉_▇▆██▉▊ ▄.▌▌ (█▉ ▄▅▌▅ ▇.▄▄)
- ▆▉▇_▍▋▋▉▆▅█▄▉ ▌.▋▉ (▆▅█▌ ▌▊▄▆ █.▇)
▇▇█▉ ▌▆▍█▌▇ ▌▆▇▉▊▌▆ ▉▉▌ ▆▉▋█▌ ▊▋▉▅█ ▅▇ ▌▊▇█▄▋▆ ▆▄▄▄▇▋▄▌▍▅▍ ▇▉▊▊ ▄▌▉▄▋▆▉▇▇ █▅▉█▊ ▅▆▋ ▉▆▇▋▅██▋ ▌▋▋ █▆▄▊▊
merge from hapis_conversion
Possible fix for missing text on pickup notices
Adjusted flatbed parenting triggers
Lowered modular car flatbed world colliders
Enabled vehicle parenting on other vehicles as well: Modular car flatbeds, and the scrap transport heli. If you can get a vehicle in there, might as well let you carry it.
- Added support for vehicles to enter the parent triggers of other vehicles (somehow we've never needed this before!).
- Now that we support it, added parenting to trains so that e.g minicopters can land on trains without sliding off.
- Cleaned up BaseMountable a little, removed some very old commented-out code.
Wait one frame in TriggerParent when killing the player. Fixes the player not being able to respawn properly after falling asleep and dying in the same frame
Added blockRectTransformChange bool to TMPro labels, when true the label will no longer react to RectTransform changes (itself or parent)
Enable this on item pickup notices while processing the layout on the vitals UI, as adjusting the position of the parent UI root was triggering a full layout rebuild of all text inside the pickup notices
Merge from spraycan_merge2
Fixed train-to-rigidbody collision sometimes bringing the train to a stop
merge from /pickup_fps_fix2
Fixed the TriggerTrainCollisions invalid object rejection, re-enabled it
Disabled my train collision rejection code until I solve its issues
Updated vehicle collision effect code, fixed the warnings re SubmarineDuo
Merge WorkCartUpdate -> Main
reapplying fps counter option menu
subtracting
70830, will reapply once fixed
▅▊▍▊▋ ▊ █▊▅▉▍▄▄▇▍▍▋▊▉█ ▍▋▆▍ ▊▉ ▇▄▉▉▅▄▍▄▄▆▉▊▉, ▄▋▆▋▋ ▄█▆▋▇▇█▋ ▌█ ▆█▇▍ (▄▅▆ █▄▊ ▇▌▅▄▇▊█▅▄). █▊▊▄▉ ▍▆▇▊▋▆▄█ ▆█▌'▊ ▍▉▊▇ ▌▇▆ ▅▇▅ ▆▆█▊▌▇ ▋█▌▉ █▌▄▌▌ ▊▊▋▉▍▊▊ ▆▊▋, ▍▉▊▉▆ █▍▆ ▋▍▄▅ ▄█▋▊ ▋▊▆ ▆▅▉▌▉▆▊█ ▉▇ ▉▊▄▌▍▍▌ ▄▌▉▄▉▉▆▌ ▋█▊▇▌▇ ▌▍▍█▉ ▇▋▅▇ ▊▍▇▍ ▆▇▄▇▄▉▌▉ ▍▅▅▋ ▉▆▍▋▋▄. ▅▋▍▊▊▅█ ▇▉▅ ▍█▍▅▅▊▄█ ▋▅▉ ▌▍▋▍ ▌▋▊▄▅▋▇▊▊▋▊▍▉▋ ▌▌▋ ▍▋ ▊█▆▄▉, ▌▅█ ▍▉█▇▋▆ ▊▌▇▋▇▇█ ▉▌▇▇█▋ █▋ ▌ ▆▌▌▆▄▉▉ ▋▅▅▄ ▆▇ ▄▅█▍▊▍▍▉▅█ ▊▇▄▉▍ ▊▄▅▊▋▄▆▉▉ █▅▅▆▊▊ ▅▇▅▅▋ ▅▍ ▉▄▉-▌▇▅ █▆ ▍ ▄▍▉▄▄▄▇ ▉▇▋▉▍. █▉ ▌▊ ▌▉▆▆▅▌▋▌ ▋▉▅▄▌ ▋▅▅ ▆▉ ▅▅▊▉▊, ▅▍▊ ▌▄▉▄▄▉▋ ▆█ ▊▆▍▋▆▅.
Forgot Hapis map bundle assignment
merge from hapis_conversion
▇▋▌▍▍▆ ▊▄▉▋▇▍▄ ▊▌▌▇▉▅▇▆ ▉▄█▇▆▆▄▍▄▇▊▋▋▉▋▋▌▇▋▋▊▆ ▆▅▍▌▉▄▉▍ ▍█ ▌▊▌ ▋█▉▊▄▊ ▅█ █▋▆▇▄ ▅▅▉▆█▉▉ ▆▌ ▆█▇▊▍▇ ▅█▆ ▍▄▋▍▇▆ ▊▊ ▅▉▌ ▌█▋██▍█ █▋ ▍▆▄▉▍ ▅▅▆█▋. ▋▇▍█▇ ▇▇▅ ▋▆▉▌█▄█▍▋ ▊▍▅▍▍ ▊ ▋▆▊▄▅▄▅▅▇▆ █▌█▌▍ █▅▅ ▌▊▅▅▅▋ ▄▅▍█ █▇▆ ▋▋▋▅ ▆▊ ▆ ▆▄▊▅▅▉▍▅ ▄▄▋ ▆▌▄▅ ▆█ ▉▅▍▍▄▅▋▊▄▍▋▄ ▋▋▋▌ ▌▍▋ ▄▄▄▉▋▍▄▌ ▊▆▉▆▉▉▆.
Merge from spraycan_merge2 (NRE fix)
▌▉▇▇▉ ▍█▉ ▍▅▅▌ ▅▆▇▋█▊ ▍▍▆▉█ ▊▍ ▆▉▅▉▌▋▋▊ ▉▌ ▋█▅▊▅ ▆▅▉_▅█▇▉▌▊_▊▋▊▋▊▊ ▇▅ ▊▇▇█▇ ▍▅ ██ ▅▉▇▉▆▆ ▄▋▋▅▍▇▆▊ ▋▊█▍ ▄▅▄▍▍ █▊▋▋▇▋▌ ▆▇ ▋▄▅▍█▅ ▇█▊▍▍▉ ▇▌█▋ ▉▋▍ ▄▄▆▇▆▊▍ ▍▉█▊ ▄▌▌▉▉▅█ ▌▅ / ▇▉▊▉
Merge from global_broadcast_fix (HABs and helicopters should no longer broadcast globally when they are idle)
