amer cerkic
67e42148ef
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-06-21 09:43:33 -07:00
Anthony Thibault
64a77d07e0
Merge pull request #15814 from hyperlogic/bug-fix/twitchy-finger-fix
...
Disable handTouch.js to prevent finger twitching
2019-06-20 17:03:39 -07:00
Anthony J. Thibault
3a6d8dc383
Disable handTouch.js to prevent finger twitching
...
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.
Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.
Also, three new items were added to the Developer > Show Animation Stats panel.
* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.
https://highfidelity.atlassian.net/browse/BUGZ-154
2019-06-20 15:52:36 -07:00
amer cerkic
1218f7e014
moved audioclient stop to dtor
2019-06-20 15:10:21 -07:00
Andrew Meadows
cd9b450475
re-expose mic and camera to disable crash
2019-06-20 15:03:15 -07:00
Sam Gateau
8f04eaae1d
Merge branch 'master' of github.com:highfidelity/hifi into wall
2019-06-19 16:53:04 -07:00
Sam Gateau
53094ef70c
One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls
2019-06-19 16:52:33 -07:00
jennaingersoll
150ae31a88
Merge pull request #15748 from ctrlaltdavid/DOC-85
...
DOC-85: Revise new MyAvatar signals' JSDoc
2019-06-19 15:16:46 -07:00
RebeccaStankus
30dd667b17
Changed qml import method
2019-06-19 10:40:32 -07:00
RebeccaStankus
feaea12b24
Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles
2019-06-19 10:14:04 -07:00
Zach Fox
18f703ee43
BUGZ-732: Enable text selection by mouse in Profile/Display Name field
2019-06-18 14:11:14 -07:00
Zach Fox
9b1c7b39bb
Merge pull request #15790 from zfox23/SUI/aboutTab
...
Implement an "About" tab in the Settings app
2019-06-18 13:16:30 -07:00
Zach Fox
f6822f17a9
Add computer description
2019-06-18 12:43:45 -07:00
Zach Fox
bd02a5eafd
Better text formatting
2019-06-18 12:29:52 -07:00
Zach Fox
4670c11397
Tighten up the graphics on level 3
2019-06-18 12:26:03 -07:00
Zach Fox
ec4fc672b6
Better design; Interface version
2019-06-18 12:09:37 -07:00
Zach Fox
34def0fd6b
DEV-145: About screen for platform info
2019-06-18 11:09:15 -07:00
Anthony Thibault
10dae7e4d9
Merge pull request #15783 from hyperlogic/feature/anim-debug-draw-improvement
...
Improvement to Developer > Avatar > Draw Animation
2019-06-18 10:50:46 -07:00
RebeccaStankus
cd508a5475
Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles
2019-06-18 09:10:41 -07:00
RebeccaStankus
5a49ac9a22
moved files
2019-06-17 16:45:54 -07:00
Zach Fox
32aec78ea2
Merge pull request #15782 from zfox23/SUI/resizeSignal
...
BUGZ-699: Make PSFListModel fetch early when making container bigger
2019-06-17 15:27:21 -07:00
Zach Fox
9cb4ad61ee
BUGZ-699: Make PSFListModel fetch early when making container bigger
2019-06-17 15:06:20 -07:00
Anthony J. Thibault
4b5d5062b1
Improvement to Developer > Avatar > Draw Animation
...
This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug.
Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.
2019-06-17 14:50:19 -07:00
Shannon Romano
7c3147fa2c
Merge pull request #15778 from zfox23/SUI/scrollbars
...
DEV-142 & DEV-140: Scrollbars in Your Profile and Settings
2019-06-17 14:38:10 -07:00
Zach Fox
1d2ed1985f
DEV-142 & DEV-140: Scrollbars in Your Profile and Settings
2019-06-17 12:35:45 -07:00
Andrew Meadows
ce96ea5bf8
more correct rebuild OtherAvatar detailed pickable shapes
2019-06-17 11:20:42 -07:00
Shannon Romano
491af66a0e
Merge pull request #15767 from sethalves/fix-drawcalls-stat
...
BUGZ-686: fix drawcalls stat broken in pr-15721
2019-06-13 17:57:01 -07:00
Shannon Romano
e6ea4839e0
Merge pull request #15770 from zfox23/SUI/autoChangeAvatar3
...
BUGZ-658: Actually write some code that doesn't let the user switch avatar models to Woody
2019-06-13 17:55:59 -07:00
Shannon Romano
d6859a42d9
Merge pull request #15762 from annabrewer/quest-login-keybrd
...
BUGZ-531: Quest tablet login missing keyboard
2019-06-13 16:44:49 -07:00
Zach Fox
503fc18d70
Make this slightly more robust
2019-06-13 16:08:29 -07:00
Seth Alves
431ff0d1de
fix drawcalls stat broken in pr-15721
2019-06-13 15:35:08 -07:00
Shannon Romano
b4f708f4ad
Merge pull request #15755 from samcake/nut
...
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
2019-06-13 14:32:36 -07:00
Shannon Romano
a37ce9f89d
Merge pull request #15754 from AndrewMeadows/fix-crash-bugz512
...
BUGZ-512: avoid MacOS crash on shutdown: destroy WebSurfaces before exit
2019-06-13 12:13:04 -07:00
Zach Fox
fcda85a3d1
Merge pull request #15759 from zfox23/SUI/autoSwitchAvatar2
...
BUGZ-658: Don't let the user switch avatar models to Woody
2019-06-13 10:55:55 -07:00
Zach Fox
431ec0bfd0
Merge pull request #15760 from zfox23/SUI/betterHomeBookmark
...
BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome'
2019-06-13 10:49:58 -07:00
Zach Fox
289e948d6b
BUGZ-671: Make 'Your Profile' Home button go to bookmark 'hqhome'
2019-06-13 10:27:18 -07:00
Zach Fox
4ccd7bd808
BUGZ-658: Don't let the user switch avatar models to Woody
2019-06-13 10:17:14 -07:00
luiscuenca
20b17291b4
Reset detailed motion states when the workload zone changes
2019-06-13 09:05:55 -07:00
Sam Gateau
fbab3fcde9
Merge branch 'master' of github.com:highfidelity/hifi into nut
2019-06-12 19:15:25 -07:00
Sam Gateau
b2feb0f920
Add specific caps for the render method deferred from the platform profiler, to prevent bad choice on mac book air
2019-06-12 16:48:36 -07:00
Andrew Meadows
eee52deefe
destroy WebSurfaces on shutdown
2019-06-12 16:07:15 -07:00
Anna
4b30065ad1
fixed keyboard on quest login and cleaned up qml files
2019-06-12 15:17:37 -07:00
Preston Bezos
038747e645
Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering
2019-06-12 14:55:37 -07:00
Preston Bezos
34e9acc0b5
better fix for the toolbar remnant
2019-06-12 14:31:43 -07:00
Zach Fox
6fed581452
DEV-128: Update settings screen with latest design
2019-06-12 14:22:02 -07:00
Zach Fox
fade8f9c04
It works!
2019-06-12 12:47:48 -07:00
Zach Fox
51c2cc793a
Tinkering with toolbar visibility signal - not quite working
2019-06-12 10:26:32 -07:00
Brad Hefta-Gaub
35cdd19456
Merge pull request #15721 from sethalves/quiet-asan-gpu-stats
...
BUGZ-623: Quiet asan gpu stats
2019-06-12 09:02:13 -07:00
David Rowe
29079b9221
Miscellaneous JSDoc improvement
2019-06-12 19:15:29 +12:00
David Rowe
93d42917b0
Revise JSDoc for new MyAvatar signals
2019-06-12 19:15:14 +12:00