Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library
...
(case 19302) Create the HFM library and namespace
2018-11-13 12:03:53 -08:00
Howard Stearns
ad7266062d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 10:33:27 -08:00
John Conklin II
85e5c1d6ef
Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations
...
Send avatar-joint translations at world scale
2018-11-13 10:04:30 -08:00
sabrina-shanman
753557736e
Merge branch 'master' into hfm_library
2018-11-12 15:03:30 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
Simon Walton
f88168bdfb
Send avatar-joint translations at world scale
2018-11-06 17:29:02 -08:00
Roxanne Skelly
cef7000a72
Case 19754 - Remove logging URLs and related file locations.
...
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
luiscuenca
0f1b12475e
Use clamp
2018-11-06 10:15:17 -07:00
luiscuenca
0f183b409b
Fix warnings
2018-11-06 10:08:06 -07:00
luiscuenca
f9b6d3dc6f
Merge addTransitAPI branch
2018-11-05 19:02:35 -07:00
sabrina-shanman
2801f324b7
Switch references to HFM to the HFM lib and remove HFM classes in FBX
2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62
Convert remaining HFMModels called model to hfmModel, and rename some missed local variables
2018-11-05 12:07:17 -08:00
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
...
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Jeff Clinton
67fe43ebb1
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
...
Small avatars now have a minimum jump height of 0.25 meters
2018-10-24 17:08:28 -07:00
luiscuenca
fa67e1b269
Remove logs and magic numbers
2018-10-23 11:51:15 -07:00
luiscuenca
afc76fec72
Added overrideNetworkAnimation and restoreNetworkAnimation methods
2018-10-22 15:20:32 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation
2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f
Hold flickering fixed and refactor
2018-10-20 15:22:25 -07:00
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
luiscuenca
31d099907a
Fix warnings
2018-10-19 14:00:52 -07:00
Anthony Thibault
ef74014075
Small avatars now have a minimum jump height of 0.25 meters
...
This should improve the quality of the jump animation and improve the mobility of small avatars.
2018-10-19 13:55:56 -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
luiscuenca
bb5c042f16
Blend network animation
2018-10-18 17:51:20 -07:00
Anthony Thibault
3e68a1d5a5
Merge branch 'master' into feature/acceleration-limit-filter
2018-10-18 16:51:57 -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
luiscuenca
078baa86e4
Sitting abort post transit animation
2018-10-16 13:16:01 -07:00
luiscuenca
7da5fa9ea7
Transit animations won't play, they just get sent over the network
2018-10-16 11:33:58 -07:00
Anthony Thibault
640ed6a32a
Added "Developer > Avatar > Show Tracked Objects" menu
2018-10-15 12:42:07 -07:00
Anthony Thibault
c0ceb713ec
Spine2 IKTarget now smoothly interpolates when ik target is disabled.
...
Also all smooth ik interpolations use easeInExpo instead of linear curves.
2018-10-09 16:48:28 -07:00
Clement
8983fe2bcf
Fix new Mac warnings
2018-10-09 12:11:55 -07:00
Anthony Thibault
4e75123740
Blend between non-estimated and estimated hips in Rig
2018-10-09 10:51:03 -07:00
Anthony Thibault
0283c9fbdc
Added CriticallyDampedSpringPoseHelper to help smooth out hips.
2018-10-09 10:51:02 -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