Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 08:08:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
72789 commits 69 branches 58 tags 1.2 GiB
Commit graph

615 commits

Author SHA1 Message Date
Alexander Ivash
e201e203b8 8984 Opening tablet with "Enter" key displays the audio menu 2017-11-14 22:18:48 +03:00
Brad Davis
8f85c7650b Make sure loaded components get the right parent context 2017-11-13 14:16:04 -08:00
Brad Davis
5cf9c1bb33 Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-13 10:48:21 -08:00
vladest
4c1bbdacec Fix merge conflicts 2017-11-13 16:45:10 +01:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01: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
Dante Ruiz
a7e4dc1473 clean up code 2017-06-28 23:51:00 +01:00
David Rowe
be0e1a75a4 User-friendly SDL2 controller name 2017-06-29 10:03:58 +12:00
Dante Ruiz
a2df2f8472 added user activity status 2017-06-28 19:52:19 +01:00
David Rowe
72d712ac76 Add "enabled" setting for Sixense; bail in update if note enabled 2017-06-26 16:43:06 +12:00
David Rowe
31714675c3 Remove unused Sixense preference and associated methods 2017-06-26 16:14:57 +12:00
David Rowe
361bc1ce03 Add "enabled" setting for SDL2 joystick; bail in update if not enabled 2017-06-26 16:00:18 +12:00
Vladyslav Stelmakhovskyi
30714d5d25 Make background with default color. Fix few warnings 2017-06-22 16:47:40 +02:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
Dante Ruiz
c4699e00ca added hand offsets 2017-06-21 23:10:08 +01:00
Dante Ruiz
17832b6022 edited some button behavior 2017-06-21 01:38:05 +01:00
Dante Ruiz
b7286db523 fixed merge conflict 2017-06-21 01:10:54 +01:00
Dante Ruiz
2c3db0fb91 finished calibration-ui 2017-06-21 01:07:12 +01:00
Zach Pomerantz
6823e7cae0 Audio -> HifiAudio to avoid collision 2017-06-20 12:20:14 -07:00
Zach Pomerantz
c826858458 revamp tablet MicBar 2017-06-20 11:43:02 -07:00
Dante Ruiz
33b89c9d32 adding glyph and text 2017-06-20 17:26:17 +01:00
Dante Ruiz
13dff29bd5 adding calibration screen 2017-06-20 01:19:10 +01:00
Dante Ruiz
734cde33e7 better calibrate button 2017-06-19 21:40:09 +01:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Dante Ruiz
2015f059c7 fixed hand calibration 2017-06-17 00:37:33 +01:00
Dante Ruiz
07102cc98d improving the ui 2017-06-16 00:25:27 +01:00
David Rowe
febd0eaf98 Add Leap Motion settings 2017-06-16 10:58:11 +12:00
Dante Ruiz
a1782bf7d2 Merge branch 'controller-ui' into hand-pucks 2017-06-15 16:27:55 +01:00
Dante Ruiz
d65c0dfbac Merge branch 'master' of github.com:highfidelity/hifi into controller-ui 2017-06-15 16:24:59 +01:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Dante Ruiz
ef9a211f6e adding hand punck 2017-06-13 21:15:16 +01:00
Zach Pomerantz
20c0dac8e8 update QML with Audio.muted 2017-06-13 16:10:16 -04:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Dante Ruiz
89b0e31edc update calibrate button glyph 2017-06-12 22:21:46 +01:00
Dante Ruiz
bbe675ab72 making final changes 2017-06-12 22:01:41 +01:00
Dante Ruiz
1b13cd6d45 saving work 2017-06-12 17:31:02 +01:00
Dante Ruiz
067fc9bb98 fixed merge conflict 2017-06-12 16:45:34 +01:00
druiz17
f6ef1443c8 some more clean up 2017-06-11 12:08:45 -07:00
Dante Ruiz
ef1be931dc preparing to clean code 2017-06-10 00:50:32 +01:00
Dante Ruiz
73e628461e confiration update status 2017-06-09 00:44:05 +01:00
Dante Ruiz
c97ea84cbf saving work 2017-06-08 17:44:55 +01:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
Dante Ruiz
11409aae9b connect the ui with the input plugins 2017-06-08 00:34:52 +01:00
Dante Ruiz
4ba1fdc323 elimated uncofigurable items from the list 2017-06-07 00:48:12 +01:00
Dante Ruiz
70ba344f1b finished openvr ui 2017-06-07 00:25:08 +01:00
Dante Ruiz
bb7c424d47 get ui working 2017-06-06 21:09:09 +01:00
Dante Ruiz
038ffe920a fixing merge conflicts 2017-06-06 16:42:08 +01:00
Dante Ruiz
19b134b0ac base ui working 2017-06-06 00:32:20 +01:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Zach Pomerantz
7cb38d22c3 fix AudioBuffers to work in tablet 2017-06-05 15:06:47 -04:00
Howard Stearns
556dcd69ac wording change regarding use of exact for floors 2017-06-03 15:48:48 -07:00
Dante Ruiz
f0f10f74c6 inpput configutration stub 2017-06-03 00:30:00 +01:00
Brad Davis
9a80a81321 Merge pull request #10565 from vladest/fix_claraio_download_clones 
Make sure that there is only one connection created for web events, s…
 2017-06-01 20:42:50 -07:00
Vladyslav Stelmakhovskyi
bcee25acc7 Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated 2017-05-28 19:54:41 +02:00
Dante Ruiz
a45bea2c90 fixed merge conflicts 2017-05-27 00:57:09 +01:00
Dante Ruiz
4365907462 drop down puck configuration for gernal settings 2017-05-10 22:12:11 +01:00
Seth Alves
6b2caf8081 Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash 2017-05-02 09:41:47 -07:00
Seth Alves
71deac49c6 reset tablet to homescreen when going from 2d to vr 2017-05-01 17:06:15 -07:00
Howard Stearns
73c24a5240 Merge pull request #10344 from howard-stearns/announcement-styling 
goto announcement card styling
 2017-05-01 16:41:39 -07:00
howard-stearns
ca5318f121 remove debugging code 2017-05-01 15:57:22 -07:00
druiz17
67daa4b0a9 Merge pull request #10335 from druiz17/webview-js 
Implemented of a web app to bring up the tablet webView
 2017-05-01 15:03:55 -07:00
Dante Ruiz
763feccbe1 removed tabs 2017-05-01 18:07:42 +01:00
druiz17
2bf7b12c7d open webview from tabletwebscreen 2017-04-30 15:27:34 -07:00
Howard Stearns
b6ae0a5bde add nextTick, and cleanup 2017-04-28 20:06:13 -07:00
howard-stearns
f9debf1388 checkpoint 2017-04-28 16:53:08 -07:00
Dante Ruiz
59f84a60c5 saving work 2017-04-29 00:31:09 +01:00
Howard Stearns
0ad8f4d985 remove debugging 2017-04-28 07:15:22 -07:00
howard-stearns
aed762e986 ux 2017-04-27 17:16:03 -07:00
howard-stearns
e4f259e630 back to non-fake data 2017-04-27 13:01:33 -07:00
howard-stearns
56196c03a3 pr review 2017-04-27 12:56:32 -07:00
howard-stearns
97777a416d Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar 2017-04-27 12:02:02 -07:00
anshuman64
d146431e9b Merge pull request #10268 from druiz17/input-recorder 
Input recorder/ input playback system  for all input actions
 2017-04-26 16:20:20 -07:00
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Andrew Lowry
d3a9114676 Uses spaces instead of tabs for Edit.qml and EditTabView.qml. 2017-04-26 18:29:38 -04:00
anshuman64
5bd9b2e631 Merge pull request #10130 from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
Dante Ruiz
95d6a451c6 fixed work mapping 2017-04-26 22:14:53 +01:00
Zach Pomerantz
532284f779 fix tablet resolve typo 2017-04-26 16:28:42 -04:00
Dante Ruiz
4df953d510 fixed text issue 2017-04-26 19:14:14 +01:00
Dante Ruiz
d8e6e8e7d0 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-26 16:53:02 +01:00
Dante Ruiz
79d827c6be added requested features 2017-04-26 16:52:51 +01:00
Dante Ruiz
b78bae37be added keyboard for tabletWebview 2017-04-25 23:22:27 +01:00
Dante Ruiz
8c020a0ec2 saving work 2017-04-25 18:01:19 +01:00
Dante Ruiz
367a6ac03c first prototype 2017-04-24 22:09:01 +01:00
Dante Ruiz
d057dfebf0 got input recording to work 2017-04-24 19:57:38 +01:00
Andrew Lowry
6a218eaca9 Embeds colpick color picker in dat.GUI for particle explorer. 
Cleans up eslint for particleExplorer.js.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
aea89824c5 Switches tablet edit tab to particle explorer when particle entities are 
selected or created.
 2017-04-24 13:35:37 -04:00
Dante Ruiz
64fcfd33a4 working on loading files 2017-04-21 22:38:53 +01:00
Dante Ruiz
cc34cb96e4 making ui for input recorder 2017-04-21 18:15:47 +01:00
howard-stearns
4ea882cad1 faster initial response 2017-04-20 14:56:34 -07:00
howard-stearns
ce7145a388 Announcement cards, debug data. 2017-04-20 14:40:24 -07:00
howard-stearns
bc77eeeabd scroll, margins 2017-04-20 13:43:55 -07:00
howard-stearns
2512255dd0 reusable feeds 2017-04-19 16:33:02 -07:00
howard-stearns
3ce238b8a0 make feed self contained 2017-04-19 13:45:58 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
howard-stearns
c5f1455872 go horizontal 2017-04-19 12:47:28 -07:00
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
Dante Ruiz
31b61c3225 removed white space 2017-04-18 00:24:34 +01:00
Dante Ruiz
e46d9da98f fixed merge conflict 2017-04-18 00:22:35 +01:00
Zach Fox
7a7cfb84e5 Remove HMD keyboard focus toggle on AddressBar input 2017-04-17 10:08:40 -07:00
Zach Fox
a623ced64e Fix hover states on back/forward buttons 2017-04-14 12:43:07 -07:00
Dante Ruiz
863d64b2fd removed comments and non-needed files 2017-04-14 18:06:44 +01:00
Dante Ruiz
7189d4d7fa daving web work 2017-04-14 17:01:23 +01:00
Zach Fox
0543709081 Focus fix 2017-04-13 16:10:36 -07:00
Zach Fox
520ceebf5b Small HMD tweaks 2017-04-13 15:52:59 -07:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
Dante Ruiz
d823093ddb fixed merge conflict 2017-04-11 16:58:25 +01:00
Seth Alves
eb281389f5 fix includeActions so places show up in All 2017-04-10 14:46:31 -07:00
Dante Ruiz
e0f19944bc Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix 2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
druiz17
92bb7f2329 saving work 2017-04-09 18:55:53 -07:00
Dante Ruiz
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Dante Ruiz
cde9310f3e goto home button fix 2017-04-07 21:35:28 +01:00
Dante Ruiz
909fda98a4 git goto button toggle hightlight 2017-04-07 21:01:53 +01:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
Dante Ruiz
34f3c4abee removed mousearea 2017-04-05 18:08:03 +01:00
Dante Ruiz
de8b7eeb27 removed commented code 2017-04-05 18:02:55 +01:00
Dante Ruiz
24b89275f2 fix new model dialog textInput 2017-04-05 18:00:43 +01:00
Seth Alves
fbf2014f04 Merge pull request #10102 from vladest/tablet-ui-goto 
Put current address to location instead of inputfield
 2017-04-03 16:09:58 -07:00
Vladyslav Stelmakhovskyi
156166ce4a Fixed another warning in TabletAddressDialog.qml 
(cherry picked from commit 73c923bb522ad711380a2fcdaa9babe9f01a639a)
 2017-04-03 19:33:13 +02:00
Vladyslav Stelmakhovskyi
9e96888534 Fixed warning: TabletAddressDialog.qml:546: Error: Cannot assign to non-existent property 'shown' 
(cherry picked from commit e70c2cdcc74f9fd43273dca268433cdefd9ecf40)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
6b7f3f7125 Fixed warning: TabletAddressDialog.qml:282:13: QML ListView: Cannot specify top, bottom, and verticalCenter anchors at the same time. 
(cherry picked from commit b11e245cb1b19149ff00f16b718ff4088b856f3e)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
849d65f95f Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null 
(cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
d207dae5b7 Put current address to location instead of inputfield 2017-04-02 20:02:40 +02:00
Dante Ruiz
9658e1b8ac better web view handling 2017-03-31 19:25:03 +01:00
Dante Ruiz
8f402c73b0 saving work 2.0 2017-03-31 01:18:31 +01:00
Dante Ruiz
cb8660c699 saving work 2017-03-30 01:34:14 +01:00
Vladyslav Stelmakhovskyi
9822193644 Set z-order of comboboxes to make sure lowest will no overlap higher ones 2017-03-29 14:41:18 +02:00
Dante Ruiz
a76e5ef8d9 improve the design of the tablet goto 2017-03-28 23:02:23 +01:00
Dante Ruiz
b8eac7abef revoming useless code 2017-03-27 16:17:50 +01:00
Dante Ruiz
2a59139c76 trying to fix focus issue 2017-03-25 01:17:37 +01:00
Dante Ruiz
9e2768cc84 saving work 2017-03-25 01:06:21 +01:00
Dante Ruiz
d9046a1982 goto on the tablet 2017-03-24 23:54:54 +01:00
Dante Ruiz
a078121c46 saving work 2017-03-24 00:23:13 +01:00
Dante Ruiz
ae111ff2e9 Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto 2017-03-23 18:25:31 +01:00
Dante Ruiz
af97c7275e Use loadQMlSource if no stack is aviable 2017-03-23 17:03:24 +01:00
Faye Li
9cab8b6c4a end of day commit 2017-03-20 17:04:29 -07:00
Faye Li
1d095b8158 added back forward and back button on nav bar 2017-03-20 15:57:59 -07:00
Faye Li
b6bf58d5be rearrange layout of main tablet go to screen 2017-03-20 15:28:30 -07:00
Seth Alves
2e29ff3114 Merge pull request #9934 from fayeli/edit-import-entities 
Adding Import Entities button on the Create tab of Edit
 2017-03-20 09:13:08 -08:00
Vladyslav Stelmakhovskyi
5335bf8862 Menu items in Tablet UI now wrapped 2017-03-18 15:58:16 +01:00
Faye Li
33a7ff825e indicate expecting json file on button text 2017-03-17 11:37:38 -07:00
Faye Li
6531efffbc hook up qml button to edit.js 2017-03-17 11:22:07 -07:00
David Rowe
07e4b0ce41 Fix title menu icon getting stuck on white 2017-03-17 11:28:14 +13:00
David Rowe
069e66b875 Fix stack functions 2017-03-17 11:19:50 +13:00
David Rowe
f1947769d6 Fix tablet settings dialogs' titles and make QML consistent 2017-03-17 11:15:56 +13:00
Faye Li
10ebb6efd7 simplify asset server button 2017-03-15 16:55:21 -07:00
Faye Li
42216b6986 create import entities button on create tab 2017-03-15 16:47:31 -07:00
Anthony J. Thibault
3a788d31de Tablet Running Scripts dialog fixes 
* The "Currrently Running" section is now visible by default, this includes the "Reload All" and "Remove All" buttons
* The entire dialog is flickable/scrollable.  We need to do this because the entire dialog is too tall to fit on the tablet.
* The keyboard now appears when the filter edit text has focus.
  The content is scrolled in such away that the focus edit field, and the tree view are above the keyboard.
 2017-03-14 15:38:53 -07:00
Dante Ruiz
4c686eaa67 fix tablet menu stack focus issue 2017-03-14 21:20:41 +01:00