Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
54743 commits 2 branches 0 tags 1.1 GiB
Commit graph

95 commits

Author SHA1 Message Date
volansystech
34edc2345c Bug 4255: When you are in HMD and you go to file menu quit, it crashes and you have no menus when you come back. 
Fixed NPE of buttonProxy while doing addButtonProxyToQmlTablet on quitting the application.
 2017-05-09 22:07:32 +05:30
Andrew Meadows
7cb2bff4c5 Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash 
Fix vr 2d vr tablet crash
 2017-05-04 10:08:55 -07:00
Zach Pomerantz
0353940d9e decouple initialization from storage in Table.getTablet() 2017-05-02 17:49:40 -04: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
druiz17
2bf7b12c7d open webview from tabletwebscreen 2017-04-30 15:27:34 -07:00
Dante Ruiz
cbd2a532a8 remove debug statments 2017-04-20 23:28:41 +01:00
Dante Ruiz
1ec4081a99 crash fix 2017-04-20 21:38:20 +01:00
Dante Ruiz
b2a11aa9ab check for null when we dont 2017-04-19 21:30:43 +01:00
Dante Ruiz
ce8dba21a0 fix tablet proxy choosing wrong root 2017-04-18 22:49:43 +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
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Dante Ruiz
22521526ec removed stray space 2017-04-06 23:41:30 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +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
3cd134d138 fix login-screen for hmd+tablet 2017-03-31 16:41:21 -07:00
Seth Alves
371df35013 remove code related to tablet being a model rather than an overlay. start on landscape mode 2017-03-29 14:16:14 -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
af97c7275e Use loadQMlSource if no stack is aviable 2017-03-23 17:03:24 +01:00
Dante Ruiz
2cd194104f force on to home screen 2017-03-10 20:46:01 +00: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
5156564f04 cant call gotohomescreen when tablet is closed 2017-03-07 00:53:36 +00:00
Dante Ruiz
e2479a78bd Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-01 16:04:12 +00:00
Dante Ruiz
f0f2b8c4da fix comboBox and PushOntoStack 2017-02-28 21:30:25 +00:00
Dante Ruiz
835b23832f some modal clean up 2017-02-25 00:40:38 +00:00
Seth Alves
610c20e01a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-23 17:41:38 -08:00
Dante Ruiz
63a78a73db Merge branch 'master' into menuFix 2017-02-23 15:45:30 +00:00
Chris Collins
b295a146e0 Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight 
More consistent highlights/toggle for toolbar buttons
 2017-02-22 18:07:38 -08:00
Anthony J. Thibault
71b569a697 Bug-fix for crash on tablet when going from web -> home. 2017-02-22 10:22:12 -08:00
Seth Alves
43f47c1106 merge from upstream 2017-02-20 12:45:39 -08:00
Seth Alves
4a650ff2bb Overlays::getOverlayAtPoint was depending on the order in which the overlays were added 2017-02-19 18:37:35 -08:00
Anthony J. Thibault
e4076e6244 warning fixes 2017-02-17 09:45:13 -08: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
67302cbd2b toolbar work to better support tablet buttons 2017-02-15 15:53: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
4503923665 Initial version of TabletProxy.toolbarMode boolean 
Copies all tablet buttons between the tablet and the system toolbar.

To test type this in the console:

    Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;
 2017-02-14 15:36:03 -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
77f0fb1491 Change the "Mute" tablet button to "Audio" 2017-02-11 22:40:19 +13:00
David Rowe
98c1a18326 Fix accumulating signal connections 2017-02-11 21:02:23 +13:00