branchrust_reboot/main/PlayerRigUpdate2cancel
11 Commits over 61 Days - 0.01cph!
Merge from main
Only conflict is cake.entity, auto resolved
Merge from main
HoldType.Construction override controller conflicted, used the version on this branch as it's more likely to be up to date with newer animations
building_planner.entity conflicted, used the version from main
PlayerAnimation.controller, 1module_cockpit_with_engine, player_model, PlayerModel.cs and PlayerModel.IK.cs all merged with no issues
Merge from main
Stomp cake.entity.prefab due to incompatible changes, will need to be redone on this branch
Merge from main
Automatically resolved conflicts in flare.weapon, planner.prefab, chainsaw.entity, HeldEntity.cs, PlayerModel.cs
Merge from main
Planner.prefab caused a conflict, used the versin from main
Construction_plans.mat had been changed on main and deleted on this branch, preserved the change
