branchrust_reboot/main/PlayerRigUpdate2cancel
893 Commits over 516 Days - 0.07cph!
- Setup leg animator for the new player rig
- FInd and assign new masks
Paddle animation updates for in kayak and using paddle as weapon
3p SAR shoot anim updated so trigger finger animates correctly correct during shooting and sar bolt removed from mask during w model deploy anim as it doesnt need to animate
Gesture animation updates
setup 3p paintabll gun anims/added anims to holdtype override controller. added spine offset ,edited backpack holster position on entity
Merge from main (PlayerAnimation.controller conflict, merged automatically)
3p paintball gun anims - updated clips with correct settings, re-exported anims with correctly positioned prop bone data
updated cabbage patch dance clip length (had been exported as 1 frame)
exported edited 3p north and west jog anims
setup 3p shield anims and applied to player animation.controller
3p jump mid air anim exported after editing and assigned to playeranimation controller
Fixing ak 47 anims not having tanslation baked into prop bones
Fixing more rotational errors
Fixing rotational errors for gesture anims
talking animation polish pass
3p handcuff captive holdtype override controller and anims updated
Adding mixamo to v4 anim transfers
main gesture set and rps anim updates
Updating skinning for horse costume
DPV anim updates to fix root issues
Updating skinning for egg suit
outbreak scientist npc player v4 rig anims exported
snowmobile, zipline and paddling anim updates
Updating snowmobile driving anims
edited boogie board anims and set up correctly
set up rubber ring anims correctly
Updating skinning for chicken costume
Updating skinning for grass underwear
Skin pass for minigun back pack
updates to drumkit.deployed for player & stick positioning
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
Updating last of the gesture anims to v4 rig
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
adding more gesture anims for v4 update
adding v4 rps gesture anims to source
Updating paddle anims to loop
Fixing sit shooting poses with incorrect settings
vineswing anims exported/added to player aniamtion controller for player rig v4
Merge from main (conflict on PlayerModel.cs, auto resolved)
boogieboard ejectorseat and raft idle updates
zipline IK adjustments and finger pose fix
1p arcade idle anim update
stand driving pose update
