1P-Cusack
7319998df9
Move ThumbUp gesture detection into json map file.
2017-07-17 10:58:30 -04:00
1P-Cusack
af751c8b8c
Add filter to map the boolean negation of a flag.
2017-07-17 10:53:37 -04:00
1P-Cusack
2cd10fd459
Move 'index point' logic into json config file.
2017-07-12 11:08:50 -04:00
1P-Cusack
9a2084425d
Stylistic updates.
2017-07-10 14:18:11 -04:00
1P-Cusack
f5ccf508c9
Fixing braces dropped in merge conflict edit.
2017-07-10 14:11:04 -04:00
1st Playable
2cafefaff8
Merge branch 'master' into 21362
2017-07-10 12:05:36 -04:00
1P-Cusack
1d333a24c1
Add point and thumb up gestures to the vive.
...
When the thumb is off the touchpad, trigger the 'thumb up' animation.
When on the thumbpad an 75% forward, trigger the 'index point animation'.
WL 21362
2017-07-10 11:51:42 -04:00
Seth Alves
39db7b0329
Merge pull request #10905 from sethalves/faster-getters-on-avatar-for-scripts
...
Faster getters on avatar for scripts
2017-07-08 15:01:23 -07:00
Brad Davis
8043caa9e9
Merge pull request #10925 from jherico/overlay_performance
...
Fix terrible script performance when rendering load is too high
2017-07-08 14:19:14 -07:00
Brad Davis
cd11f5cfa6
More tweaks for improved script performance
2017-07-07 22:02:56 -07:00
Brad Davis
148eece065
Tweak frame timing to avoid overloading the main thread
2017-07-07 21:00:33 -07:00
Brad Davis
7e9ea596a0
Add more efficient overlay getters, don't use blocking calls
2017-07-07 21:00:31 -07:00
Chris Collins
8a00efde72
Merge pull request #10922 from highfidelity/revert-10835-bug/invisible-avatars
...
Revert "fix for invisible avatars after radius ignore"
2017-07-07 16:51:06 -07:00
Stephen Birarda
420e9233b6
Revert "fix for invisible avatars after radius ignore"
2017-07-07 16:50:28 -07:00
druiz17
6e44c95d53
Merge pull request #10906 from druiz17/audio-qml-fix
...
Made the output audio listview dynamically change height base on content size
2017-07-07 16:48:15 -07:00
Stephen Birarda
f07ce6d294
Merge pull request #10835 from birarda/bug/invisible-avatars
...
fix for invisible avatars after radius ignore
2017-07-07 16:06:44 -07:00
Andrew Meadows
665aa92da2
Merge pull request #10877 from sethalves/atp-client
...
Atp client
2017-07-07 14:04:50 -07:00
Zach Fox
3d14d3755e
Merge pull request #10898 from 1P-Cusack/21425
...
Add View->Enter First Person Mode in HMD checkbox.
2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5
Merge pull request #10878 from mnafees/21355
...
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab
Default 'Enter First Person Mode in HMD' to true.
2017-07-07 15:35:32 -04:00
Ryan Huffman
84345e6db1
Merge pull request #10915 from birarda/bug/bake-with-ext-textures
...
fix for FBX baking with external textures
2017-07-07 10:57:35 -07:00
Seth Alves
01b612fd14
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-07 10:42:12 -07:00
Seth Alves
6782a891d0
rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different
2017-07-07 10:35:45 -07:00
Zach Fox
e222753aac
Merge pull request #10911 from zfox23/PAL_adminFix2
...
Set admin status even if QML can't find user in PAL
2017-07-07 10:24:53 -07:00
Andrew Meadows
2349057306
Merge pull request #10879 from AndrewMeadows/avoid-null-shape
...
fix crash in ObjectMotionState::handleEasyChanges()
2017-07-07 10:22:05 -07:00
Stephen Birarda
bff54d260e
fix for baking FBX with external textures
2017-07-07 10:11:13 -07:00
Seth Alves
88c39f3237
off-by-one
2017-07-07 09:15:42 -07:00
Seth Alves
29baca20e3
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-07 09:10:47 -07:00
Zach Fox
ea77557e38
Correctly close PAL when switching domains
2017-07-07 08:09:19 -07:00
Seth Alves
fc8b7c7cc5
Merge pull request #10904 from druiz17/window-root-spam
...
fixed log spamming from windowRoot.qml in toolbar mode
2017-07-07 07:17:08 -07:00
Seth Alves
81cc46beb4
Merge pull request #10909 from jherico/overlay_crashes
...
Fixing overlay crashes, for real
2017-07-07 07:11:52 -07:00
Zach Fox
ee9cdaff90
Set admin status even if QML can't find user in PAL
2017-07-06 23:26:40 -07:00
Seth Alves
baf63181d2
Merge pull request #10900 from hyperlogic/bug-fix/pucks-in-desktop
...
Can now use chest, hips, shoulder & feet pucks in desktop mode.
2017-07-06 19:53:44 -07:00
Seth Alves
ddabe940d6
dry up some code
2017-07-06 18:42:00 -07:00
Seth Alves
801c45898f
dry up some code
2017-07-06 18:41:11 -07:00
Seth Alves
57ba2c5cd6
add invalidateJointIndicesCache method
2017-07-06 18:16:41 -07:00
Seth Alves
ef4a04b9cf
code style
2017-07-06 18:01:58 -07:00
Brad Davis
f8b76d65ab
Fixing overlay crashes, for real
2017-07-06 18:01:26 -07:00
Seth Alves
ab8d9f4885
check for faux joints before heading into code that needs to lock
2017-07-06 18:00:11 -07:00
Seth Alves
a543b957ef
fix a race
2017-07-06 17:45:57 -07:00
Seth Alves
fc61fcf494
coding style
2017-07-06 17:40:41 -07:00
Seth Alves
15d379cc5a
coding style
2017-07-06 17:36:28 -07:00
Seth Alves
4505b8cedf
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 17:35:11 -07:00
Seth Alves
0d3412bd97
Merge branch 'faster-getters-on-avatar-for-scripts' of github.com:sethalves/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 17:35:07 -07:00
Seth Alves
b8875a8902
Merge branch 'master' of github.com:highfidelity/hifi into atp-client
2017-07-06 17:28:55 -07:00
Stephen Birarda
d22b146370
Merge pull request #10845 from birarda/bug/domain-cookie-restart
...
fix for OAuth OPTIONS firing every XHR 302
2017-07-06 17:22:03 -07:00
Seth Alves
2e88eca2b9
oopsy crazy
2017-07-06 16:33:37 -07:00
Stephen Birarda
6d98d20b12
cleanup bad QEventLoop::exec() OAuth handling code
2017-07-06 16:19:47 -07:00
Seth Alves
62b7ba6446
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 16:01:42 -07:00
Seth Alves
5645870f0a
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 16:00:52 -07:00
