Commit graph

333 commits

Author SHA1 Message Date
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
Seth Alves
50ad0d881d Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-13 10:15:00 -08:00
Seth Alves
bbff372097 Merge pull request #9377 from fayeli/tablet-menu-qml
Rework Context Menu QML to Be Suitable for Tablet
2017-01-13 09:59:57 -08:00
Seth Alves
481cc47f79 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-13 09:28:18 -08:00
Faye Li Si Fi
834e3af879 checkbox margin and nav hover color 2017-01-12 18:12:13 -08:00
Faye Li Si Fi
10a82ac11f update breadcrumb text as you navigate menus 2017-01-12 17:38:13 -08:00
Faye Li Si Fi
54eef26eaa click breadcrumb text to go back to parent menu 2017-01-12 16:33:33 -08:00
Faye Li Si Fi
ef699db5be nav bar menu now bring you back to menu root 2017-01-12 16:14:37 -08:00
Faye Li Si Fi
99b6c6f1fd menu icon and breadcrumb text 2017-01-12 15:47:02 -08:00
Faye Li Si Fi
41356f8b1d make space for menu navigation bar 2017-01-12 14:36:33 -08:00
Seth Alves
b4870a14fa Merge pull request #9372 from druiz17/removeHud
Completely removed HUD
2017-01-12 14:24:40 -08:00
Zach Fox
b7e95a3486 Updates from Alan 2017-01-12 14:14:28 -08:00
Dante Ruiz
784548bb25 removed hud 2017-01-12 22:07:20 +00:00
Anthony J. Thibault
b251dc9ed6 Tablet springboard can now be scrolled 2017-01-12 13:11:27 -08:00
Faye Li Si Fi
f316505a05 context menu fill to fit tablet screen 2017-01-12 13:11:08 -08:00
Zach Fox
8e1a70891d Checkpoint after cherry-picking from existing PR 2017-01-12 10:59:28 -08:00
Anthony Thibault
e7a88b5a3c Merge pull request #9343 from druiz17/menuApp
Moved the context menu to the tablet
2017-01-10 13:34:44 -08:00
Faye Li
07039897c6 New color scheme for audio bar 2017-01-10 11:41:16 -08:00
Dante Ruiz
6c51edec77 added context menu to tablet 2017-01-10 09:13:45 -08:00
Dante Ruiz
3fab901b49 commit chabges 2017-01-10 09:13:45 -08:00
Seth Alves
ad6175857d Merge pull request #9328 from hyperlogic/tablet-ui
Allow Hifi.SoundEffect to be used in all qml
2017-01-06 15:21:08 -08:00
Anthony J. Thibault
0860c50a49 Allow Hifi.SoundEffect to be used in all qml
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
2017-01-06 14:01:13 -08:00
Seth Alves
668bc35227 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge 2017-01-06 13:31:13 -08:00
howard-stearns
2f5f53c8e4 cr 2017-01-06 10:28:09 -08:00
howard-stearns
f5c4535115 Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 16:29:34 -08:00
Howard Stearns
3f54428744 Merge pull request #9313 from howard-stearns/pal
People Action List
2017-01-05 15:49:56 -08:00
Seth Alves
d072b1524a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:27:11 -08:00
howard-stearns
ef02c84759 further simplification of letterbox, and use for selection failures 2017-01-05 14:46:32 -08:00
howard-stearns
0cdeac8736 abstract out letterbox message 2017-01-05 14:32:31 -08:00
howard-stearns
0670a4689f Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal 2017-01-05 13:57:44 -08:00
Anthony J. Thibault
85de0d3bbf Added local only spatialized button click sounds to tablet 2017-01-05 13:54:06 -08:00
Howard Stearns
bbf7d16537 process consistent select message 2017-01-05 13:45:03 -08:00
howard-stearns
47aa1e4f8e add pal to defaultScripts 2017-01-05 12:23:17 -08:00
Zach Fox
b5713656be Minor language changes on Admin help text 2017-01-05 09:27:12 -08:00
Zach Fox
0c77ff2556 Fix silly quotation bug 2017-01-04 16:28:23 -08:00
Zach Fox
083bf95917 Fix PAL scrollbar; add helper popup to ADMIN tab 2017-01-04 16:25:13 -08:00
Zach Fox
675159be45 Last commit to fix final bugs 2017-01-04 14:33:02 -08:00
Zach Fox
ac41e8abc4 Bugfix re: population; remove user image for now 2017-01-04 14:06:51 -08:00
Zach Fox
c695878025 Clear local ignored list upon domain change 2017-01-04 13:31:16 -08:00
Zach Fox
dde5f69ac9 More CR & simplifications 2017-01-04 12:41:30 -08:00
Faye Li Si Fi
32bc73dad3 added activeText and activeIcon properties in QML 2017-01-04 12:20:41 -08:00
Zach Fox
14def61eb8 More CR comments; 1 bug remaining re: sig slot 2017-01-03 17:32:47 -08:00
Anthony J. Thibault
e4a08709c6 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2017-01-03 16:23:57 -08:00
Anthony Thibault
9502a8b0c4 Merge pull request #9294 from fayeli/tablet-mic-level
Audio level calculation in tabletUI.js
2017-01-03 16:12:04 -08:00
Zach Fox
899dd21328 Lots of CR feedback 2017-01-03 15:43:30 -08:00
Anthony J. Thibault
3c2f9acd39 Hooked up EventBridge to TabletScriptingInterface. 2017-01-03 15:43:21 -08:00
Faye Li
68aacfe544 added "updateAudioBar" function signature in header file 2017-01-03 12:38:23 -08:00
Faye Li
7e1b06efdc slot function in QML 2017-01-03 11:15:28 -08:00
Anthony Thibault
c201b6a7f9 Merge pull request #9256 from druiz17/moreButtons
all hub button now on tablet
2017-01-03 10:44:19 -08:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00