Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings
...
Fix new Mac warnings
2018-10-20 13:40:53 -07:00
Sam Gateau
6005b934ad
Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001
...
minor bug fix and optimization in ModelEntity animation
2018-10-19 17:02:48 -07:00
John Conklin II
4dec304d66
Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth
...
Clean up elbow smoothing code
2018-10-18 19:16:32 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3
2018-10-17 13:10:29 -07:00
Andrew Meadows
148944814b
consolidate two bad string checks into one
2018-10-17 11:45:39 -07:00
Clement
8983fe2bcf
Fix new Mac warnings
2018-10-09 12:11:55 -07:00
unknown
1172e29d95
Clean up elbow smoothing code
2018-10-08 13:21:47 -07:00
SamGondelman
4024f2a180
fix various resourcecache bugs
2018-10-04 11:29:22 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3
2018-10-02 08:58:04 -07:00
Anthony Thibault
b0cde2afcc
Small addition to Anim Stats
...
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
* Position - in world coordinate frame.
* Heading - the facing angle in the world corrdinate frame.
* Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
2018-09-14 15:05:17 -07:00
SamGondelman
c522d1bc93
merge with master
2018-09-14 00:57:13 -07:00
Anthony Thibault
5a059e9318
Fix for build failure on linux and android.
2018-09-07 09:44:19 -07:00
Anthony Thibault
acc7f1f168
Moved AnimStats into its own qml panels.
...
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
Anthony Thibault
3a3ffcc98c
First pass at improving anim stats.
2018-09-05 18:14:06 -07:00
SamGondelman
589e88af4a
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-09-04 17:54:45 -07:00
SamGondelman
9b75c7e07f
trying to separate colors and vectors
2018-09-04 17:20:05 -07:00
Anthony Thibault
e210fadc7c
Fix for glitch when entering inAir state from takeoff.
...
This was due to a frame lag of blend factor used for inAir blending. So the first frame the upward velocity would be 0, followed by 3.5 m/s the next frame.
This is fixed by using the workingVelocity instead of _lastVelocity to drive the blend.
2018-09-04 14:36:56 -07:00
amantley
671bf32d58
removed whitespace
2018-08-23 17:36:35 -07:00
amantley
884be2f99d
removed comment and whitespace
2018-08-23 17:30:03 -07:00
amantley
0cc302f68c
set phase to 0.0
2018-08-23 17:28:38 -07:00
amantley
220dbf586f
set the phase to 0.0 when it is negative
2018-08-23 16:46:58 -07:00
SamGondelman
283c0c0311
s i m p l i f y
2018-08-23 11:47:56 -07:00
Sam Gondelman
f0986a7f5a
Merge branch 'master' into scriptvec3
2018-08-20 10:56:45 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
...
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
Anthony J. Thibault
3fa3cd8cfd
In CCD IK chains, remove the LeftHand and RightHand constraint completely.
...
When used in combination with the elbow pole vector, this was causing the hand to never properly reach its rotation target.
It was also having side effects causing the elbow to never straighten properly to reach its position target.
There is possibly a bug in how this tip constraint is enforced and I've verified that there are no ill effects in removing it.
2018-08-08 13:56:47 -07:00
amantley
1353406254
more whitespace
2018-08-07 12:56:28 -07:00
amantley
4ad73fd821
removed whitespace
2018-08-07 12:51:23 -07:00
amantley
a61909446a
Merge remote-tracking branch 'upstream/master' into animationBlendChanges
2018-08-07 10:40:22 -07:00
amantley
84619e7adc
cleaned up to match coding standards
2018-08-07 10:40:11 -07:00
amantley
1ad6b041cd
updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed
2018-08-06 18:36:32 -07:00
Anthony Thibault
079b276c2b
Merge pull request #13733 from luiscuenca/fixElbowPoleVector3
...
Elbow pole vectors improvements
2018-08-06 17:33:03 -07:00
amantley
f1990378fd
merged the json from the ik 2 bone pr into the new animation json
2018-08-06 14:27:09 -07:00
Angus Antley
a63b213d65
fixed the weight calculation for the hand overlays. to do: check the blends in hmd mode
2018-08-06 15:18:17 +01:00
amantley
bac9d195be
working on the hand blend alphas, something is wrong with the print out
2018-08-03 17:56:49 -07:00
amantley
375d726535
added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file
2018-08-03 16:48:43 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3
2018-08-03 14:57:49 -07:00
amantley
76b182f03b
added the hmd strafe to the rig code
2018-08-03 12:12:01 -07:00
amantley
096cb0db81
working on strafe left and right transitions
2018-08-02 13:32:06 -07:00
amantley
bd88d5f15b
merging with ik leg fix code in master
2018-08-02 09:48:04 -07:00
amantley
6b2c67e5bd
more doug support
2018-08-01 18:22:51 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244
...
Move scriptable caches' APIs into scripting interfaces
2018-08-01 11:50:13 -07:00
luiscuenca
fde77add79
Elbow pole vectors fixes
2018-08-01 11:49:18 -07:00
Anthony J. Thibault
fd780845bb
Code review feedback
2018-07-31 18:25:04 -07:00
SamGondelman
2ca217eb4a
merge with master
2018-07-30 17:43:15 -07:00
amantley
541d2deed5
added the parent alpha into the child animation weight, removed extra hand overlay print outs
2018-07-30 14:45:25 -07:00
Anthony J. Thibault
58f95bd07b
assert fix
2018-07-30 13:14:32 -07:00
Anthony J. Thibault
6a6ece8910
Warning fixes and whitespace cleanup
2018-07-30 11:49:44 -07:00
Anthony J. Thibault
401995fb06
Leg IK fixes
...
Fixes for raising legs and sometimes squatting while in HMD mode.
2018-07-30 10:55:52 -07:00
amantley
637a214165
added the anim stack print out static object for the list of motion and weights
2018-07-27 17:25:00 -07:00
amantley
b28ce40f09
adding the anim stack print out feature half way done
2018-07-27 08:46:40 -07:00
