amer cerkic
|
dfad1d3f88
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2019-02-25 10:29:46 -08:00 |
|
Shannon Romano
|
dc6bdfae8a
|
Merge pull request #14995 from SamGondelman/parentCrash
Case 21391: Fix parent loop crash
|
2019-02-25 10:01:37 -08:00 |
|
John Conklin II
|
6af2b25767
|
Merge pull request #14980 from AndrewMeadows/dont-clear-space
Case 21309: don't corrupt workload system
|
2019-02-25 09:52:15 -08:00 |
|
Sam Gateau
|
4f0911bd29
|
Merge pull request #15003 from SamGondelman/nametag
Case 21397: Fix nametag rotation
|
2019-02-23 09:00:12 -08:00 |
|
SamGondelman
|
37720e9daa
|
fix nametag rotation
|
2019-02-22 16:53:03 -08:00 |
|
Shannon Romano
|
5f99158c25
|
Merge pull request #14977 from SamGondelman/rot
Case 21354: Add "modelScale" property to fix pal
|
2019-02-22 16:36:17 -08:00 |
|
Sam Gondelman
|
30b6b7f21b
|
let's try that again
|
2019-02-22 16:30:36 -08:00 |
|
Anthony Thibault
|
1213084fc6
|
Merge pull request #14984 from kencooke/master
Case 21384: Avatar mouth blendshapes are not working correctly (master)
|
2019-02-22 16:29:07 -08:00 |
|
SamGondelman
|
081e62a647
|
fix parent loop crash
|
2019-02-22 14:26:15 -08:00 |
|
Shannon Romano
|
a63f3e76c8
|
Merge pull request #14972 from SamGondelman/billboard
Case 21341: Fix billboard mode in secondary camera
|
2019-02-22 13:01:09 -08:00 |
|
SamGondelman
|
6d6cd42adb
|
fix bound scaling
|
2019-02-22 12:00:00 -08:00 |
|
Brad Hefta-Gaub
|
2a1f4bb963
|
Merge pull request #14985 from luiscuenca/fixPickOnNullAvatar
Fix crash on AvatarManager::findRayIntersectionVector when Avatar becomes null
|
2019-02-22 10:14:21 -08:00 |
|
luiscuenca
|
3072ca43de
|
Detailed picking if avatar is not null
|
2019-02-22 09:24:38 -07:00 |
|
Ken Cooke
|
c1786edc24
|
Emulate the old behavior of _lastInputLoudness
|
2019-02-21 18:45:17 -08:00 |
|
Andrew Meadows
|
be2d4272da
|
remove the other unnecessary _space->clear()
|
2019-02-21 18:11:16 -08:00 |
|
Anthony Thibault
|
8785f733db
|
Merge pull request #14817 from amantley/animSplineIK
AnimSplineIK node added to inverse kinematics
|
2019-02-21 17:13:41 -08:00 |
|
Anthony Thibault
|
e54754c4ce
|
Merge pull request #14926 from luiscuenca/flowCpp
Cpp implementation of the Flow script
|
2019-02-21 17:10:05 -08:00 |
|
Andrew Meadows
|
982c4c2bc4
|
do not Space::clear() in clearNonLocalEntities()
|
2019-02-21 16:33:31 -08:00 |
|
amantley
|
3bf5c44f98
|
fixed build warnings
|
2019-02-21 16:24:46 -08:00 |
|
luiscuenca
|
dcbf57ee0b
|
Fix linux warning and HMD breaks flow
|
2019-02-21 16:41:24 -07:00 |
|
amantley
|
5cf8a963cd
|
make spine2 rotation damping only happen in optimized code. the regular code is already damped
|
2019-02-21 15:41:16 -08:00 |
|
amantley
|
c9db426ce4
|
Merge remote-tracking branch 'upstream/master' into animSplineIK
|
2019-02-21 14:36:13 -08:00 |
|
amantley
|
6323f49f26
|
changed the define variable to HIFI_USE_OPTIMIZED_IK
|
2019-02-21 14:36:05 -08:00 |
|
SamGondelman
|
544f54e69a
|
fix model scale
|
2019-02-21 14:10:36 -08:00 |
|
amantley
|
50bc8d3646
|
added protected function to cubic hermite spline
|
2019-02-21 13:32:28 -08:00 |
|
amantley
|
0bdc527ce7
|
turned off pole vector when hand behind back
|
2019-02-21 13:14:51 -08:00 |
|
amantley
|
de10aebbb5
|
removed white space
|
2019-02-21 11:44:18 -08:00 |
|
amer cerkic
|
52849101a2
|
Merge branch 'master' of https://github.com/amerhifi/hifi
|
2019-02-21 11:42:21 -08:00 |
|
amer cerkic
|
77d4060fdb
|
bypassing onStop invoke.Delegate command which prevents the disconnect from Java hooks that are not initiated on restart. On Destroy, the onstop function is called to allow the hooks to finally disconnect and then terminate the app.
|
2019-02-21 11:37:50 -08:00 |
|
amantley
|
64ec28ef44
|
added back missing unity meta files
|
2019-02-21 11:37:14 -08:00 |
|
amantley
|
afed0b5442
|
review changes
|
2019-02-21 11:08:29 -08:00 |
|
luiscuenca
|
ec4d069011
|
Allow threads with only one joint, remove dummy joints and unused constants
|
2019-02-21 12:00:19 -07:00 |
|
Shannon Romano
|
f9e5ee0185
|
Merge pull request #14970 from danteruiz/quest-no-keyboard
Case 21335: Use old tablet keyboard for quest
|
2019-02-21 10:34:53 -08:00 |
|
SamGondelman
|
4fdf556d5d
|
fix billboard mode in secondary camera
|
2019-02-21 10:29:21 -08:00 |
|
Clément Brisset
|
8c642fd98d
|
Merge pull request #14971 from shanzzam/slr_twitter_changes
Changing twitter handle from inc to VR
|
2019-02-21 10:22:08 -08:00 |
|
Anthony Thibault
|
d4a41770d7
|
Merge pull request #14957 from hyperlogic/bug-fix/add-jsdoc-out-dir
Add README.md file to tools/jsdoc/out dir to prevent jsdoc build failures
|
2019-02-21 09:20:13 -08:00 |
|
amantley
|
33fd64c68c
|
direction on compare in positional theta function
|
2019-02-21 09:00:23 -08:00 |
|
Angus Antley
|
b6bc467f4b
|
added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel
|
2019-02-21 06:42:55 -08:00 |
|
shanzzam
|
adb6f559dc
|
Changing twitter handle from inc to VR
|
2019-02-20 18:31:32 -08:00 |
|
amantley
|
f8a74efdc2
|
fixed build errors from jenkins
|
2019-02-20 17:59:45 -08:00 |
|
amantley
|
97da20781e
|
removed whitespace
|
2019-02-20 15:19:36 -08:00 |
|
amantley
|
27bfe2f0fe
|
changed name of pre processor variable
|
2019-02-20 15:14:12 -08:00 |
|
amantley
|
95b3fbdc35
|
removed ulnar coeff, too jumpy
|
2019-02-20 15:02:12 -08:00 |
|
Dante Ruiz
|
bf8c671cd6
|
keyboard setting
|
2019-02-20 13:38:20 -08:00 |
|
John Conklin II
|
87556059d3
|
Merge pull request #13901 from Cristo86/android_handshake
case 20058: Android - Handshake implementation
|
2019-02-20 13:33:52 -08:00 |
|
Sam Gateau
|
4dbae787cb
|
Merge pull request #14803 from highfidelity/feature/quest
Case 20624: Final merge of Quest Interface application into master
|
2019-02-20 11:53:24 -08:00 |
|
Brad Davis
|
79369a0c83
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-20 10:40:49 -08:00 |
|
Shannon Romano
|
0b7bdb185e
|
Merge pull request #14949 from SamGondelman/wearables
Case 21300, Case 21301: Group cull all entity descendants of avatars
|
2019-02-20 10:29:40 -08:00 |
|
John Conklin II
|
97c7b01005
|
Merge pull request #14965 from danteruiz/stylus-pick-perf
Case 21255: PickManager performance is slow when keyboard mallets are enabled
|
2019-02-20 10:11:33 -08:00 |
|
luiscuenca
|
bea7680864
|
Fix shared_ptr not part of std error
|
2019-02-20 10:57:11 -07:00 |
|