Zach Pomerantz
0353940d9e
decouple initialization from storage in Table.getTablet()
2017-05-02 17:49:40 -04:00
Dante Ruiz
1ec4081a99
crash fix
2017-04-20 21:38:20 +01:00
Chris Collins
b07ed13023
Merge pull request #10184 from druiz17/snapshot-fix
...
snapshot bug fixes
2017-04-11 13:00:46 -07:00
Seth Alves
077a4fe4ae
change handling of life-time of TabletProxy QObjects
2017-04-11 10:56:47 -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
Dante Ruiz
86c67a3017
tablet pages
2017-04-08 02:01:21 +01:00
Dante Ruiz
90f5d02c99
goto toggle option
2017-04-06 00:13:53 +01:00
Seth Alves
b0b214012c
Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
...
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -07:00
Anthony J. Thibault
8ff457a1b6
Fix broken eventBridge on tablet after Reload All Scripts.
...
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
2017-04-03 16:03:55 -07:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
Seth Alves
c62b07d26f
add setLandscape call to tablet
2017-03-30 11:36:21 -07:00
Zach Fox
1b74576259
Fix tablet-close behavior for PAL; remove users-tablet.js
2017-03-29 14:53:45 -07:00
Dante Ruiz
f4255735a9
make login screen show up on the tablet on startup
2017-03-27 18:03:38 +01:00
Dante Ruiz
4bc050e583
added tablet notification
2017-03-15 19:26:50 +01:00
Seth Alves
2068b93ccc
Merge pull request #9817 from druiz17/goto-home-bug
...
cant call gotohomescreen when tablet is closed
2017-03-10 10:17:23 -08:00
Dante Ruiz
e9086460e3
changed function names
2017-03-08 18:14:32 +00:00
Dante Ruiz
6acf2340a2
better way to determine if we can go to the homescreen
2017-03-08 17:42:24 +00:00
Dante Ruiz
835b23832f
some modal clean up
2017-02-25 00:40:38 +00:00
Dante Ruiz
3ba605bf23
saving work
2017-02-23 00:28:30 +00:00
Dante Ruiz
3f8ea4ac54
fixed merge conflict
2017-02-17 23:33:39 +00:00
Anthony J. Thibault
8ccca86dee
Settings for Tablet Becomes Toolbar
2017-02-16 15:57:36 -08:00
Anthony J. Thibault
5b1f150171
Fix for race condition when switching between Main Menu and Audio Menu
2017-02-16 12:52:46 -08:00
Anthony J. Thibault
03b6280ed0
Fix for empty toolbar issue
2017-02-15 16:50:08 -08:00
Anthony J. Thibault
ed11edad56
EventBridge support
2017-02-15 13:59:04 -08:00
Anthony J. Thibault
912e8aa04a
Tablet buttons now work in toolbar.
...
Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.
2017-02-14 15:37:24 -08:00
Anthony J. Thibault
5e25d073f3
WIP commit
2017-02-14 15:36:01 -08:00
Seth Alves
838d7f6f10
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-14 13:58:18 -08:00
David Rowe
625f5efdf8
Merge branch 'master' into 21164
...
# Conflicts:
# scripts/system/audio.js
2017-02-15 10:00:52 +13:00
Seth Alves
d40402faae
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-14 06:53:34 -08:00
Anthony J. Thibault
1c783031b1
Removed ColorOverlay from TabletButton, added more icon & text states
...
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.
* icon
* hoverIcon
* activeIcon
* activeHoverIcon
* text
* hoverText
* activeText
* activeHoverText
Updated scripts to set new button states, if necessary.
2017-02-13 15:09:46 -08:00
David Rowe
77f0fb1491
Change the "Mute" tablet button to "Audio"
2017-02-11 22:40:19 +13:00
David Rowe
b5b92c1508
Make the tablet's mic icon reflect the current mute state
2017-02-11 09:53:02 +13:00
Seth Alves
3171ce1602
hook up more of new-model dialog
2017-02-10 12:03:26 -08:00
Anthony J. Thibault
a209d0372a
First cut of pal on tablet.
2017-02-08 17:34:03 -08:00
Dante Ruiz
7db86204d1
general function to load QML for javascript for tablet
...
(cherry picked from commit b50e20c545
2017-02-08 10:25:11 -08:00
Anthony J. Thibault
85e01e3922
tablet-ui: Added sortOrder property to buttons
...
By default user created buttons will appear after system buttons.
2017-02-02 17:18:22 -08:00
Anthony J. Thibault
cf855391af
Added jsdocs for all button properties
2017-01-31 16:54:15 -08:00
Anthony J. Thibault
0542945110
Moved SoundEffect into a separate compilation unit.
...
Also, fixed license header in TabletScriptingInterface, to include proper author and date.
2017-01-30 12:46:22 -08:00
Dante Ruiz
41bf65ed5e
home button improvments
2017-01-20 16:35:41 -08:00
Dante Ruiz
baff07b0f9
controller with menus finally work
2017-01-18 07:41:25 -08:00
dante ruiz
865a78a8c8
saving work
2017-01-18 07:40:14 -08:00
Anthony J. Thibault
56fc42a2bd
clara.io marketplace works on tablet
2017-01-17 15:38:44 -08:00
Anthony J. Thibault
cf138eb1fd
Fixes for qt asserts in debug
...
* The TabletScriptingInterface destructor is invoked on app shutdown after the logging system has been destroyed.
To avoid this I removed the destructor. The log was only for debug purposes anyway.
* Removed calls to setProperty() these calls are not thread safe and were causing asserts during debug.
Instead of getting and setting the property we maintain the TabletProxy state using an enum.
2017-01-12 10:49:41 -08:00
Dante Ruiz
c99f897db1
first commit
2017-01-10 09:13:45 -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
Anthony J. Thibault
70078b0e78
Fix for linux build
2017-01-05 15:04:16 -08:00
Anthony J. Thibault
85de0d3bbf
Added local only spatialized button click sounds to tablet
2017-01-05 13:54:06 -08:00
Dante Ruiz
3f34cb863e
removed whitespace
2017-01-04 11:09:26 -08:00
Dante Ruiz
a30ad2709b
Home button fix
2017-01-04 11:09:26 -08:00
