Commit graph

4191 commits

Author SHA1 Message Date
Thijs Wenker
afd69d04dd Make ctrl+shift shortcuts work for create app 2018-11-14 01:05:37 +01:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
2018-11-13 15:07:21 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
47cd6b332c
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode
Bug fix for head trackers in desktop mode
2018-11-13 11:49:24 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
Seth Alves
1611525220
Merge pull request #14028 from ElderOrb/FB12459
Improve keyboard raising logic for web views
2018-11-13 09:41:04 -08:00
Seth Alves
e5114c9b43
Merge pull request #14283 from ctrlaltdavid/M14836
Make tablet page indicators clickable to scroll tablet
2018-11-13 09:38:43 -08:00
Seth Alves
4ac719a87f
Merge pull request #14298 from ctrlaltdavid/M17640
Fix Goto app cards staying highlighted if move off dialog while dragging
2018-11-13 09:32:24 -08:00
Howard Stearns
3431bdbb0e new inventory icons, and align message waiting light in items tab 2018-11-12 14:51:32 -08:00
Howard Stearns
66ae01e0c3 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-12 12:55:20 -08:00
Seth Alves
500b2b7adf
Merge pull request #14381 from zfox23/MS19803_retry
Actually fix MS19803: Replace missing imports
2018-11-09 16:38:26 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859
Make material entities to be presented in avatarapp
2018-11-09 15:32:27 -08:00
Zach Fox
8d325d8dd9 Actually fix MS19803: Replace missing imports 2018-11-09 15:02:57 -08:00
Zach Fox
1ce6079c5a Remove extra as 2018-11-09 11:26:18 -08:00
Zach Fox
142dfab9ac CR round 1 2018-11-08 10:05:57 -08:00
Dante Ruiz
358aa547b1 feedback changes 2018-11-08 09:58:53 -08:00
Dante Ruiz
501746b156 3D Keyboard 2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8 Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug
Fix MS19743: Fix case where user couldn't update certain items
2018-11-07 14:57:35 -08:00
Jeff Clinton
e507e91bfd
Merge pull request #14227 from ElderOrb/FB19396
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
2018-11-07 13:36:41 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage" 2018-11-06 16:10:49 -08:00
Zach Fox
f22bbff505 Fix MS19743: Fix case where user couldn't update certain items 2018-11-06 15:47:47 -08:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Zach Fox
58dd690c0a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-06 10:29:05 -08:00
Alexander Ivash
a3dfc873b7 rsolve rebase conflict 2018-11-06 14:21:14 +05:30
Alexander Ivash
4c6700b497 remove deprecations warnings 2018-11-06 14:21:14 +05:30
Alexander Ivash
9623753416 change imports (how could I miss this place?) 2018-11-06 14:21:14 +05:30
Alexander Ivash
fe4e4cfbd4 return controls-uit & styles-uit folders to preserve backward-compatibility 2018-11-06 14:21:14 +05:30
Alexander Ivash
f7d9bafc7d add FilterBar & ScrollBar to qmldir 2018-11-06 14:21:14 +05:30
Alexander Ivash
c6764c6244 cherry-picking 2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7 rename stylues-uit => stylesUit & controls-uit => controlsUit
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Anthony Thibault
ac8869eb61 Bug fix for head trackers in desktop mode
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
2018-11-05 16:21:19 -08:00
Howard Stearns
335947598f Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into tabless 2018-11-05 15:48:52 -08:00
Zach Fox
5b042ec3df My items to my submissions 2018-11-05 15:23:25 -08:00
Zach Fox
3631e304ba Acquisition 2018-11-05 14:58:12 -08:00
Zach Fox
f10b9ae30c Squashed commit of the following:
commit 515ff016a4
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 13:03:34 2018 -0800

    Fix seven bugs

commit a4d36b3845
Merge: 8906b909eb d0181283dd
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 10:25:58 2018 -0800

    Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce

commit d0181283dd
Merge: be17ed0910 643026abd6
Author: Brad Hefta-Gaub <brad@highfidelity.io>
Date:   Fri Nov 2 16:44:31 2018 -0700

    Merge pull request #14308 from sabrina-shanman/fbx2hfm

    (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes

commit 643026abd6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:15:30 2018 -0700

    Change local variable in TestFbx for clarity

commit 0b7ddca5f6
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:03:20 2018 -0700

    Change naming for straggler names in model loading debug dumps

commit becee7f010
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Tue Oct 30 17:28:42 2018 -0700

    Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4 Fix seven bugs 2018-11-05 13:03:34 -08:00
howard-stearns
4f713b038e Merge branch 'oculus-store-commerce' into tabless 2018-11-04 12:17:21 -08:00
howard-stearns
ae51b95ca1 fix bad tab reference 2018-11-04 11:15:46 -08:00
Zach Fox
a87142b8b7 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-11-02 16:49:20 -07:00
Zach Fox
2b50c40224 Minor changes found by Chang 2018-11-02 09:33:06 -07:00
Zach Fox
917fc4ad58 Update language 2018-11-02 09:23:31 -07:00
Zach Fox
20cd1df22c Lotsa changes 2018-11-01 16:48:08 -07:00
Howard Stearns
8256bfbc55 icons 2018-11-01 15:20:50 -07:00
Zach Fox
0a15e94fe4 New colors 2018-11-01 13:27:31 -07:00
Zach Fox
b43ad15fa7 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-01 11:32:38 -07:00
Howard Stearns
8f2f27f468 Merge branch 'oculus-store-commerce' into tabless 2018-11-01 11:22:28 -07:00
Zach Fox
6e470d5c1c Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into oculus-store-commerce 2018-11-01 10:30:01 -07:00
Zach Fox
d481f081bb Fix four bugs; truncate some logs 2018-11-01 10:29:38 -07:00