Commit graph

76554 commits

Author SHA1 Message Date
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
Sam Gateau
77e3a098e7
Merge pull request #14974 from danteruiz/quest-demo
Quest demo update from master
2019-02-21 11:27:58 -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
David Kelly
2202b69575 Guard against accidentally calling wrong api/v1/places endpoint
spaces
2019-02-20 13:09:29 -07: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
Brad Davis
817c24dd0b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-20 09:51:03 -08:00
luiscuenca
fa44687de6 fix errors and remove debug draw 2019-02-20 09:22:39 -07:00
Angus Antley
7639eac3ad cleaning up theta functions 2019-02-20 07:18:14 -08:00
Angus Antley
1e73422b80 added the wrist and position coeffs back in, 1.0 works 2019-02-20 06:25:44 -08:00
amantley
951380db15 tweaked the constraints, to do: start conditions and possibly using base rotation on shoulder to determine hand offset 2019-02-19 17:53:59 -08:00
SamGondelman
c8ffb130a3 only update sub items on change 2019-02-19 17:38:47 -08:00
Brad Davis
122a246d2d Fix typo 2019-02-19 17:30:47 -08:00
Shannon Romano
07d084d086
Merge pull request #14937 from SamGondelman/pal
Case 21259: Pal textures don't change
2019-02-19 17:14:15 -08:00
Shannon Romano
815375fa76
Merge pull request #14960 from danteruiz/fix-tablet-clicking
Case 21317: Unable to click icons on tablet when in HMD (0.81.0)
2019-02-19 17:11:59 -08:00
Brad Davis
518e480a8b Fix plugin activation 2019-02-19 17:00:50 -08:00
SamGondelman
6765268998 Merge remote-tracking branch 'upstream/master' into wearables 2019-02-19 16:52:00 -08:00
luiscuenca
04e57d0dd1 No Rig pointer on Flow class, solve network animations and fixed bug 2019-02-19 17:45:46 -07:00
danteruiz
6bdf51a460 limit number of include items for mallets 2019-02-19 16:25:38 -08:00
Bradley Austin Davis
c912f2f7d7
Merge pull request #14964 from amerhifi/feature/quest
fixing compile errors
2019-02-19 16:17:18 -08:00
amer cerkic
0d0acd8fb2 fixed typo 2019-02-19 16:09:16 -08:00
amer cerkic
bf69e6d672 fixing compile errors 2019-02-19 16:03:02 -08:00
SamGondelman
44e70db4cd WE DID IT FOLKS 2019-02-19 15:02:36 -08:00
danteruiz
d1c46e1cdc fixing tablet pointer issues 2019-02-19 14:48:17 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf
Case 21271: Remove unnessary picks for quest
2019-02-19 14:20:56 -08:00
Brad Davis
8eca2a2c9d Fix jenkins build failure 2019-02-19 13:09:18 -08:00
Brad Davis
d60dcb99d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-19 12:37:30 -08:00
Brad Davis
44851bbf68 Quest frame player cleanup 2019-02-19 12:37:17 -08:00
Brad Davis
0ddb4ecd7c Allow per-machine customization of which android projects are loaded 2019-02-19 12:10:26 -08:00
SamGondelman
2986ca20c5 Merge remote-tracking branch 'upstream/master' into pal 2019-02-19 11:31:40 -08:00
John Conklin II
051ab61b66
Merge pull request #14951 from SamGondelman/ssao
Case 20993: Fix AO
2019-02-19 11:19:03 -08:00