Commit graph

29566 commits

Author SHA1 Message Date
Preston Bezos
f0dd28e71a removed extra line 2019-06-26 09:54:43 -07:00
Preston Bezos
bd3fe8a092 fixed conflict and spacing 2019-06-26 09:12:32 -07:00
Preston Bezos
1481c7424f changed ptt muted icon 2019-06-25 11:02:44 -07:00
Preston Bezos
5686f51171 fixed hmd settings buttons spacing 2019-06-25 09:19:30 -07:00
Preston Bezos
538b15dd57 caught a couple of edge cases for mic states 2019-06-17 13:20:25 -07:00
Preston Bezos
7879dbf687 changed width of ptt muted icon 2019-06-17 13:13:43 -07:00
Preston Bezos
bd78dd96a0 replaced icons with icons that are on the whole pixel so as not to cause blur 2019-06-17 11:05:47 -07:00
Preston Bezos
a954ef6068 Merge branch 'master' of github.com:highfidelity/hifi into iconChanges 2019-06-17 10:43:43 -07:00
Preston Bezos
d9f1aa73ba switched top bar icons and changes input device meter to be in icon instead of in bar 2019-06-17 09:12:32 -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
Shannon Romano
b9e2443451
Merge pull request #15700 from ctrlaltdavid/DOC-63
DOC-63: Tablet JSDoc
2019-06-11 16:51:08 -07:00
Shannon Romano
453085f992
Merge pull request #15741 from huffman/feat/set-and-get-bookmarks
BUGZ-484: Add --setBookmark and getAddress API
2019-06-11 15:31:41 -07:00
jennaingersoll
1935b49538
Merge pull request #15676 from ctrlaltdavid/DOC-33
DOC-33: MyAvatar API JSDoc catch-up
2019-06-11 15:05:06 -07:00
Ryan Huffman
a1b7392854 Add --setBookmark and getAddress API 2019-06-11 14:10:09 -07:00
Zach Fox
a88023469b
Merge pull request #15737 from zfox23/SUI/developerMenu
DEV-122: Add a developer menu in Settings
2019-06-11 13:32:14 -07:00
Zach Fox
7bdd3084e9 DEV-122: Add a developer menu in Settings 2019-06-11 12:56:14 -07:00
Seth Alves
cd1c782aa8 fix warning 2019-06-11 12:54:40 -07:00
Zach Fox
97c4726e1e
Merge pull request #15736 from zfox23/SUI/autoSelectAvatar
BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory
2019-06-11 11:50:55 -07:00
Zach Fox
9932b1da57
Merge pull request #15734 from zfox23/SUI/recommendedGraphics
Implement BUGZ-633: Change 'Graphics Preset'
2019-06-11 11:24:52 -07:00
Zach Fox
db2ce822b7 BUGZ-610: Auto-select the first avatar from your inventory if you have avatars in your inventory 2019-06-11 10:52:45 -07:00
Zach Fox
2d4ba92eeb Implement BUGZ-633: Change 'Graphics Preset' 2019-06-11 09:58:01 -07:00
dante ruiz
01fab12942 fixing interface and laucnher script argument 2019-06-11 09:18:20 -07:00
Zach Fox
b62ab2ea82
Merge pull request #15731 from zfox23/SUI/forwardKeyEvents
Implement BUGZ-226: Forward keypresses made while Top Bar is in focus
2019-06-11 07:52:11 -07:00
Zach Fox
9a926abd76 Implement BUGZ-226: Forward keypresses made while Top Bar is in focus 2019-06-10 20:27:03 -07:00
Andrew Meadows
250a4490d2
Merge pull request #15728 from hyperlogic/bug-fix/adjust-run-fwd-animations
Adjust run and jog anims to better align head with 1p camera
2019-06-10 17:37:33 -07:00
Anthony J. Thibault
7ce5f7ac0b Adjust run and jog anims to better align head with 1p camera
Added adjust forward run and jog animations to better align with first person camera.
In some instances, such as looking down, you could sometimes see your body lead your camera.

https://highfidelity.atlassian.net/browse/BUGZ-240
2019-06-10 16:27:03 -07:00
Andrew Meadows
dbce976887 fix another crash in MyAvatar::getAvatarEntitiesVariant() 2019-06-10 15:34:18 -07:00
Sabrina Shanman
2b90d841b7
Merge pull request #15722 from sabrina-shanman/crash_no-display-plugin
(BUGZ-563) Fix crash using null DisplayPlugin in GraphicsEngine
2019-06-10 14:54:11 -07:00
sabrina-shanman
a400cea040 Fix crash when using null DisplayPlugin in GraphicsEngine during shutdown 2019-06-10 14:00:05 -07:00