Commit graph

23325 commits

Author SHA1 Message Date
Anthony J. Thibault
51ea2632c0 Remove Avatar UseAnimPreAndPostRotations option.
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
2018-01-16 17:27:19 -08:00
Melissa Brown
991dad18ba
Merge pull request #12160 from ElderOrb/FB11241
FB11241 Changing options in menu causes the title “Menu” to change to…
2018-01-15 10:46:37 -08:00
Zach Fox
bd3474de68
Merge pull request #12166 from zfox23/fixSnapshotSocialSharing
Fix social media sharing buttons on Snapshot app
2018-01-12 15:52:56 -08:00
Zach Fox
522007af9d Fix social media sharing buttons on Snapshot app 2018-01-12 14:58:14 -08:00
Zach Fox
6920e57613 Fix 'Browse Avatars' button from Avatar Settings 2018-01-12 13:31:58 -08:00
Zach Fox
b7f4fe2ba3
Merge pull request #12149 from howard-stearns/do-not-delete-wallet-file
Do not delete wallet file
2018-01-12 09:44:40 -08:00
Alexander Ivash
11e918681a FB11241 Changing options in menu causes the title “Menu” to change to “root”
note: fix is based on removing duplicated top-level menu entry from stack view
2018-01-12 02:08:10 +03:00
vladest
cff80e86b6 Temporarily disable magnification until further notice 2018-01-11 22:18:22 +01:00
howard-stearns
2987d21f66 remove some more 2018-01-11 13:15:34 -08:00
howard-stearns
c39771d995 do not delete wallet file when things go wrong, and remove obsolete
reset machinery
2018-01-11 11:50:23 -08:00
Anthony Thibault
8d5e7dbeff
Merge pull request #12140 from hyperlogic/bug-fix/master-snapshot-app-settings
Fix for black screen when clicking Settings from Snap app
2018-01-11 09:58:10 -08:00
Seth Alves
363b9bfe11
Merge pull request #12127 from SamGondelman/freeze
Comment out TabletAddressDialog logging of long messages
2018-01-10 18:07:18 -08:00
Seth Alves
457fcd6f40
Merge pull request #12129 from SamGondelman/doubleClick
Move key logic from onClicked to onReleased
2018-01-10 18:03:23 -08:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI
Fix and improve currentAPI.js
2018-01-10 17:55:08 -08:00
Seth Alves
aefd294bf2
Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera
Improve stability for HMD third person avatars
2018-01-10 17:46:47 -08:00
Andrew Meadows
b3fcca8446
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body
Bug fix to prevent wrists entering the avatar's torso.
2018-01-10 17:22:50 -08:00
MiladNazeri
c77d2f4e58
Merge pull request #12121 from cain-kilgore/21667
WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel
2018-01-10 17:11:54 -08:00
MiladNazeri
301731554f
Merge pull request #12102 from cain-kilgore/21664
WL 21664 - Window.innerHeight should not include the menu bar
2018-01-10 17:10:14 -08:00
Anthony J. Thibault
1deb75daf7 Fix for black screen when clicking Settings from Snap app
(cherry picked from commit d5e3b97c93)
2018-01-10 16:31:51 -08:00
Cain Kilgore
104ac0ffae
Indents, man 2018-01-10 20:30:41 +00:00
MiladNazeri
b73106fa7e
Merge pull request #12120 from cain-kilgore/21666
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
2018-01-10 12:30:21 -08:00
Cain Kilgore
b26e31a362
Copy paste? Never! 2018-01-10 20:27:19 +00:00
MiladNazeri
2220b976dc
Merge pull request #12130 from cain-kilgore/21665
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
2018-01-10 12:06:58 -08:00
MiladNazeri
bf61d8c7b3
Merge pull request #12115 from ctrlaltdavid/deprecations
Update JSDoc with some deprecations
2018-01-10 12:04:21 -08:00
Anthony J. Thibault
ae997928c1 Bug fix to prevent wrists entering the avatar's torso.
This was inadvertently disabled in PR #11978.
2018-01-10 11:51:44 -08:00
Cain Kilgore
057c708637
Spaces instead of Tabs
(Damnit VS Re-install!)
2018-01-10 19:24:52 +00:00
Anthony J. Thibault
220b7f5e55 Merge branch 'master' into bug-fix/better-third-person-camera 2018-01-10 10:14:09 -08:00
Howard Stearns
fafc98f51c
Merge pull request #12098 from ElderOrb/FB11123
FB11123 Make the certificate GOLD (and change title to Proof of Prove…
2018-01-10 10:01:15 -08:00
Andrew Meadows
7060cd9a90
Merge pull request #12122 from druiz17/fix-double-set-tablet-root
don't call setQmlTabletRoot twice
2018-01-10 09:53:09 -08:00
Sam Gateau
d4dc1e352f
Merge pull request #12124 from AndrewMeadows/no-misc-stats
more context for update performance stats
2018-01-10 09:10:26 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta
Model meta render item is only withTypeShape if visual geometry request fails
2018-01-10 09:09:19 -08:00
Cain Kilgore
330b266ca8 Merge branch 'master' of https://github.com/highfidelity/hifi into 21665 2018-01-10 11:33:06 +00:00
Cain Kilgore
38afc5a25b WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal 2018-01-10 11:31:46 +00:00
SamGondelman
c46531296f move key logic from onClicked to onReleased 2018-01-09 18:28:54 -08:00
Zach Fox
928e3d2ef7
Merge pull request #12108 from zfox23/commerce_pagination
Commerce: Support pagination at History endpoint; improve Purchases scrolling
2018-01-09 15:57:34 -08:00
SamGondelman
a42b0cf485 comment out logging 2018-01-09 14:58:23 -08:00
Zach Fox
edf25c3e4e Remove code duplication... 2018-01-09 14:14:54 -08:00
Melissa Brown
19802b33eb
Merge pull request #12109 from vladest/tablet_page_indicator
Page indicator visible only when pages more than one
2018-01-09 14:05:32 -08:00
Andrew Meadows
8c6edc749a provide more context for update perf stats 2018-01-09 12:59:32 -08:00
SamGondelman
7c56a9ffb2 model meta is only withTypeShape if visual geometry request fails 2018-01-09 12:43:43 -08:00
Zach Fox
d31dec7acb Fix unix build errors 2018-01-09 12:41:56 -08:00
Zach Fox
360a7cc4c6 CR feedback 2018-01-09 11:08:18 -08:00
Anthony J. Thibault
e28f13c1db Merge branch 'master' into bug-fix/better-third-person-camera 2018-01-09 10:34:04 -08:00
Seth Alves
87dfe0efc3
Merge pull request #12097 from vladest/tablet_pagination_magnify
Tablet pagination magnify
2018-01-09 08:08:02 -08:00
Cain Kilgore
4534419e53 Merge branch 'master' of https://github.com/highfidelity/hifi into 21667 2018-01-09 09:45:28 +00:00
Cain Kilgore
f78ee7c167 WL 21667 - Window.browseDir() dialog doesn't let user use Esc to cancel 2018-01-09 09:44:12 +00:00
Cain Kilgore
0e3913baff Removed Window.menuHeight 2018-01-09 09:07:26 +00:00
Cain Kilgore
773461bd30 Merge branch 'master' of https://github.com/highfidelity/hifi into 21666 2018-01-09 08:33:44 +00:00
Cain Kilgore
46de7ed83b WL 21666 - Window.domainChanged() isn't emitted if domain isn't running 2018-01-09 08:32:59 +00:00
Sam Gondelman
02100a405d
Merge pull request #12100 from samcake/blue
Restore packing of QRC qml and resources to interface.exe in DEV_BUILD
2018-01-08 17:41:34 -08:00