Brad Davis
5cf9c1bb33
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-13 10:48:21 -08:00
vladest
50ea08f3d5
VR stylus and laser need longer timeout than mouse
2017-11-11 16:10:00 +01:00
vladest
9dbcff040d
Tune press delay to be able to swipe tablet pages easier
2017-11-11 09:43:34 +01:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
beholder
fb14e4dc4d
Fixed programmatical lowering of 'TabletAddressDialog'
2017-11-10 21:20:00 +03:00
beholder
87519cd26f
use conditional bindings to avoid intermediate binding states
2017-11-10 19:53:54 +03:00
beholder
908faa1334
refactoring: simplify code & fix the issue with menu-es sometimes losing checked state
2017-11-10 19:53:54 +03:00
LaShonda Hopper
0e90c92cf5
[Case 6569] Minor: Break up line to pass column count guidelines.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:35:12 -05:00
LaShonda Hopper
a057cb914f
[Case 6569] Fixes clipping of cancel button by window edge.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:25 -05:00
LaShonda Hopper
dac2ae19a4
[Case 6569] Add protection for dynamic vs static collision type (details below).
...
When creating a model, it was possible to elect Exact collision with the dynamic
property even though this combination is prohibited. This combination would silently
fail rather than notifying the user of the error.
This commit implements safeguards against the invalid combination:
* If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled.
* If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled.
* If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is
void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error.
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:24 -05:00
Brad Davis
25df649b44
Fix desktop mode script URL injection
2017-11-08 14:55:34 -08:00
David Rowe
c5c1ead400
Fix GOTO dialog's connection status and location not always updating
2017-11-09 10:51:21 +13:00
Brad Davis
1a58aee385
Fix scripting URL injection, I hope
2017-11-08 12:00:29 -08:00
David Rowe
055470296d
Move current location in GOTO dialog and add placeholder text to input
2017-11-08 17:13:40 +13:00
Brad Davis
b7f31eb5b9
Fixing desktop QML loading, tablet clickthrough bugs
2017-11-07 12:42:26 -08:00
Menithal
ac1df7b815
21539: Allow HMD to turned off in Desktop Mode
2017-11-05 01:02:08 +02:00
Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -07:00
vladest
659afcc43b
Make page indicators non clickable. Attempt to enable swipe even over buttons
2017-11-03 14:38:46 +01:00
vladest
215e64d702
Merge branch 'master' into tablet_home_paginate
2017-11-01 18:51:01 +01:00
Ryan Downe Karpf
28a99fe685
Merge pull request #11655 from dback2/tabletcontextualmode
...
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-30 08:56:26 -07:00
vladest
b1601dcd4c
fix typo in tablet avatar browser
2017-10-28 12:07:29 +02:00
vladest
505c281cd3
Merge branch 'master' into tablet_home_paginate
2017-10-25 21:19:16 +02:00
Zach Fox
7998984d8e
Missed tons of spots!
2017-10-24 14:30:47 -07:00
Zach Fox
c64c2e17c8
First pass at consolidation
2017-10-24 12:01:05 -07:00
David Back
b5f1793863
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
2017-10-23 14:21:18 -07:00
vladest
b791dcba7f
Add sound cues to create app
2017-10-22 14:59:53 +02:00
vladest
fa349a694c
Code style fixes
2017-10-20 15:12:09 +02:00
vladest
f2847168a4
Use MouseArea for interacting instead of default one to be able interact in HMD mode
2017-10-13 19:12:42 +02:00
vladest
b965049651
Do not produce sound and highlight on disabled items and menu separators
2017-10-12 18:39:26 +02:00
vladest
145149fedd
Merge branch 'master' into tablet_extended_sounds
2017-10-12 18:01:23 +02:00
vladest
85f2606582
Merge branch 'master' into tablet_home_paginate
2017-10-11 22:16:42 +02:00
vladest
726377db45
Refactor to SwipeView
2017-10-11 22:14:01 +02:00
Dante Ruiz
742cf0debe
Merge pull request #11383 from ElderOrb/case7384
...
7384 On Domains without Edit Access, Create Button Text still Highlights
2017-10-10 14:30:49 -07:00
vladest
999e9aafa9
Merge branch 'master' into tablet_home_paginate
2017-10-08 16:12:07 +02:00
vladest
f2abb369c8
Tablet paginator initial
2017-10-08 16:09:01 +02:00
vladest
e360c1363e
Merge branch 'master' into tablet_extended_sounds
2017-10-02 18:03:49 +02:00
David Rowe
0daa5012ca
Enable toolbar and tablet icons to load from local script directory
2017-09-30 15:00:15 +13:00
vladest
1a2d38e31f
Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds
2017-09-25 17:11:44 +02:00
vladest
4d530ef173
Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close
2017-09-22 21:08:34 +02:00
vladest
e26118254f
Implemented Audio injector in Tablet scripting interface. Added missed sound events
2017-09-18 19:40:06 +02:00
vladest
bb214d7bf3
Merge branch 'master' into tablet_extended_sounds
2017-09-17 16:16:03 +02:00
beholder
353bab5277
7384 On Domains without Edit Access, Create Button Text still Highlights
...
(override color in states if captionColorOverride was specified)
2017-09-16 16:50:45 +03:00
vladest
de4f34aacb
Add resizable flag. Use the flag for Create only
2017-09-15 21:49:38 +02:00
vladest
832e4aa5eb
Introducong tablet audio events
2017-09-08 09:51:10 +02:00
anshuman64
94e1545e58
Merge pull request #11298 from ElderOrb/case7382
...
7382 Create Menu does not Work on Tablet
2017-09-06 14:09:41 -07:00
beholder
b5faa8ac56
7382 Create Menu does not Work on Tablet
2017-09-02 18:20:00 +03:00
vladest
b547b2573e
Added logged in property
2017-08-30 23:15:39 +02:00
vladest
903036a709
Merge branch 'master' into tablet_login_button
2017-08-30 22:12:03 +02:00
druiz17
2a97257698
Merge pull request #11140 from ElderOrb/case6788
...
6788: You can deselect your current view mode
2017-08-29 17:15:51 -07:00
beholder
a0a43ebf26
show checkbox or radiobutton dependently on exclusiveGroup presence
2017-08-29 23:23:16 +03:00
vladest
d8fb7300c3
Merge branch 'master' into tablet_login_button
2017-08-28 16:59:35 +02:00
vladest
26026cb2b5
Added logout. Truncate username to 8 characters
2017-08-25 17:37:10 +02:00
vladest
be56cab8e1
Merge branch 'master' into tablet_login_button
2017-08-25 15:50:10 +02:00
beholder
cbbe03cee7
6788: You can deselect your current view mode
2017-08-25 02:33:11 +03:00
Elisa Lupin-Jimenez
e71823a8b5
forgot to track a file
2017-08-24 15:46:22 -07:00
Elisa Lupin-Jimenez
77f93ae84b
user agent switch allows downloads
2017-08-24 15:44:22 -07:00
beholder
9cd784990c
5830: Go-To menu shows up blank except for address bar
2017-08-23 23:27:02 +03:00
vladest
bad8c39444
Align user/login text right border with tablet buttons
2017-08-19 17:46:52 +02:00
vladest
3783b8a57c
Merge branch 'master' into tablet_login_button
2017-08-19 17:27:46 +02:00
vladest
2e5e0c94f1
Added login button to Tablet
2017-08-18 15:34:15 +02:00
Elisa Lupin-Jimenez
6c2bf63392
Back button works
2017-08-10 17:51:19 -07:00
Elisa Lupin-Jimenez
da5bb03187
Trying to add in a back button
2017-08-10 16:34:37 -07:00
beholder
802b5733c5
6742: Multiple highlighted buttons
2017-08-09 22:26:13 +03:00
Seth Alves
af1e27dc36
Merge pull request #11053 from hyperlogic/feature/secondary-pose-support
...
Improved support for Vive Trackers on biceps
2017-08-07 13:11:48 -07:00
Anthony J. Thibault
98bbe887b9
Merge branch 'master' into feature/secondary-pose-support
2017-08-04 16:11:13 -07:00
vladest
9058a8e2ca
Cleanup top menu on menu reinstantiation
2017-08-04 16:36:00 +02:00
vladest
e30e0b1a5f
Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption
2017-07-31 16:45:21 +02:00
Anthony J. Thibault
6c2b6674bb
load and save shoulderConfig to settings.
2017-07-27 17:33:54 -07:00
Anthony J. Thibault
78c6564174
Merge branch 'master' into feature/secondary-pose-support
2017-07-27 09:09:32 -07:00
Anthony J. Thibault
8dc9714282
Pass armCircumference and shoulderWidth to qml.
2017-07-27 09:08:34 -07:00
utkarshgautamnyu
71ddf1e7c1
Removed Compound Collision type
2017-07-26 10:20:17 -07:00
utkarshgautamnyu
65192aa620
added additional collision types to asset browser and new model dialog
2017-07-25 17:12:13 -07:00
Anthony J. Thibault
572213daaf
Added shoulder config to Controller Settings UI
...
All offset values in Controller Settings UI are now in cm.
2017-07-25 17:05:07 -07:00
Andrew Meadows
9d1fba3a3b
Merge pull request #10821 from ctrlaltdavid/21418
...
Don't execute body of controllers' plugin update methods if not enabled
2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6
Merge pull request #11029 from cain-kilgore/dominant-hands
...
WL 21453 - Add a "Dominant Hand" setting
2017-07-25 08:01:31 -07:00
Cain Kilgore
f9204a7034
Now it should appear..
2017-07-25 09:03:47 +01:00
Stephen Birarda
3936ee93f0
use default scripts path in EditTabView to fix load on OS X
2017-07-19 16:34:04 -07:00
Dante Ruiz
93d1725b3c
make cursor position change based on mouse click position
2017-07-14 19:30:35 +01:00
Cain Kilgore
f91a8c0f53
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler
2017-07-13 21:25:39 +01:00
Cain Kilgore
247e7b8bed
indentation!!!
2017-07-13 19:25:31 +01:00
Cain Kilgore
43782a29c7
Avatar Scaler - WIP
2017-07-12 22:04:58 +01:00
Dante Ruiz
89a072cfee
fixed hmd keyboard for goto
2017-07-10 19:05:07 +01: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
druiz17
b4182fe7ac
Merge pull request #10899 from druiz17/calibration-update-2.0
...
Updates to the Calibration UI
2017-07-06 14:24:45 -07:00
Dante Ruiz
b0130896d1
fixed spamming from windowRoot.qml
2017-07-06 22:01:08 +01:00
Dante Ruiz
1fcb3b32d6
fixed letter cap
2017-07-06 20:55:19 +01:00
Seth Alves
0374d24b15
Merge pull request #10901 from druiz17/goto-keyboard-fix
...
Fixed the keyboard not showing up for goto in HMD mode
2017-07-06 12:46:13 -07:00
Dante Ruiz
2d876377d5
keyboard know disappears when you click of the address line
2017-07-06 20:04:44 +01:00
Dante Ruiz
de5802418f
fixed some keybaord logic
2017-07-06 19:27:48 +01:00
Dante Ruiz
4e3dba1767
goto HMD keyboard fix
2017-07-06 19:12:52 +01:00
Dante Ruiz
9e4b5693c7
fixed merge conflicts
2017-07-06 18:49:46 +01:00
Dante Ruiz
6e1f9d275c
chnaged default head offset
2017-07-06 17:54:06 +01:00
Dante Ruiz
258c21838e
finished calibration-ui updates
2017-07-06 17:32:40 +01:00
David Rowe
cfd155c198
Merge branch 'master' into 21418
2017-07-06 16:56:10 +12:00
Dante Ruiz
6c15dffb9d
added new glyph
2017-07-06 00:45:59 +01:00
Dante Ruiz
063984f573
Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update
2017-07-03 16:44:47 +01:00
Dante Ruiz
6f30cb1825
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
2017-07-01 00:48:49 +01:00
Dante Ruiz
51792769b5
finished vive in desktop mode
2017-07-01 00:48:36 +01:00
David Rowe
07697c5083
Merge branch 'master' into 21418
...
# Conflicts:
# interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
# interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
Removed stray "Vive Controller Picks" configuration item which no longer exists.
2017-07-01 11:19:00 +12:00
Brad Davis
31d2c9980e
Merge pull request #10797 from ctrlaltdavid/21396
...
Make Leap Motion a plugin
2017-06-30 14:37:23 -07:00
