branchrust_reboot/main/PlayerRigUpdate2cancel
169 Commits over 243 Days - 0.03cph!
drumkit.deployed.static is now a prefab variant of the original drumkit, ensures all player model changes have been carried over
Right foot instrument IK controller now uses the rotation of the target transform (no animation)
Added a left foot IK target field, won't react to any instrument activity, just a static position
Merge from main (PlayerAnimation.controller conflict, merged automatically)
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 main
Conflicts on w_sks_rig.fbx and associated meta file, used the version from main as that's technically the latest but this will stomp the changes made in
129608 (29/08/2025)
Auto merge PlayerModel.cs conflict
Merge from main (conflict on PlayerModel.cs, auto resolved)
Merge from main
Merged PlayerModel.IK.cs and party_hat.prefab automatically
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
