Commit graph

406 commits

Author SHA1 Message Date
MiladNazeri
83d13717fe
Merge pull request #11752 from Menithal/21539
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
2017-11-27 16:02:01 -08:00
Menithal
693da50a68 21539: Fixed None Checkmark being on Desktop mode 2017-11-27 07:59:04 +02:00
Menithal
5d52b9936b 21539: Updated Logic to match request 2017-11-27 07:42:18 +02:00
Menithal
ba1cd74ffe 21539: Moved Desktop HMD to None 2017-11-26 21:58:16 +02:00
Brad Hefta-Gaub
e070033ce4
Merge pull request #11793 from ElderOrb/FB9032
9032 - Current display mode can be deselected in the toolbar/tablet menu
2017-11-19 11:25:35 -08:00
Brad Hefta-Gaub
1de6ecec30
Merge pull request #11830 from ElderOrb/FB8244
8244 Rename captionColorOverride to captionColor
2017-11-18 14:28:32 -08:00
Dante Ruiz
4de0fdf7d1
Merge pull request #11768 from ctrlaltdavid/21596
Add instructions and cursor to GOTO dialog input
2017-11-17 11:45:40 -08:00
Alexander Ivash
c5d2f598d7 8244 Rename captionColorOverride to captionColor 2017-11-16 15:46:49 +03:00
Dante Ruiz
d83f3152dd
Merge pull request #11809 from ElderOrb/FB8984
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-15 11:16:49 -08:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3
4684 Add collapse button on the virtual keyboard
2017-11-14 12:22:42 -08:00
Alexander Ivash
e201e203b8 8984 Opening tablet with "Enter" key displays the audio menu 2017-11-14 22:18:48 +03: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
David Rowe
c5c1ead400 Fix GOTO dialog's connection status and location not always updating 2017-11-09 10:51:21 +13:00
David Rowe
055470296d Move current location in GOTO dialog and add placeholder text to input 2017-11-08 17:13:40 +13:00
Menithal
ac1df7b815 21539: Allow HMD to turned off in Desktop Mode 2017-11-05 01:02:08 +02: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
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
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
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
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