Commit graph

1985 commits

Author SHA1 Message Date
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
David Rowe
c618e8e001 Open feed in tablet after sharing snapshot from tablet 2017-03-29 16:52:52 +13:00
Seth Alves
4516ddf855 Merge pull request #9847 from highfidelity/tablet-ui
Tablet ui
2017-03-28 14:48:02 -07:00
Andrew Meadows
b9e80d3fa5 Merge pull request #9972 from kunalgosar/marketsBug
Fixed buttons on Marketplace
2017-03-28 12:45:25 -07:00
Seth Alves
6df4dda746 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-28 11:42:14 -07:00
Seth Alves
8e38b41e44 Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui 2017-03-28 11:41:58 -07:00
Seth Alves
851ea7dabc fix initial finger/stylus setting 2017-03-28 11:41:51 -07:00
Clément Brisset
82114ae6ab Merge pull request #9940 from Atlante45/fix/sit
Fix a few sitting bugs noticed at the meetup
2017-03-28 11:14:31 -07:00
Dante Ruiz
e276bb52d2 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help-script 2017-03-28 18:14:28 +01:00
Dante Ruiz
b0e437cc5a remove help button from tablet when reloading scripts 2017-03-28 18:14:05 +01:00
Seth Alves
0cae616ab5 Merge pull request #10031 from hyperlogic/bug-fix/mouse-disconnect-issue
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
2017-03-28 10:07:52 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Anthony J. Thibault
29a159b90d WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
2017-03-28 09:27:13 -07:00
Seth Alves
b50a02ea19 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-28 08:16:59 -07:00
David Rowe
6a3dea030e Settings link 2017-03-28 15:15:33 +13:00
David Rowe
55033df354 Merge branch 'tablet-ui' into 21238-b 2017-03-28 14:47:57 +13:00
David Rowe
a6ef592353 Non-scrolling window with images scaled to fit 2017-03-28 14:43:26 +13:00
Seth Alves
cdac011472 fix home button 2017-03-27 18:21:00 -07:00
Brad Hefta-Gaub
3bdcfd8b78 Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
David Rowe
ead1f00bbf Title 2017-03-28 09:10:20 +13:00
David Rowe
35305b4476 Make dialog single column with images above controls 2017-03-28 08:55:38 +13:00
Anthony J. Thibault
5796cbc898 Bug-fix for touching deleted entities or overlays. 2017-03-27 10:26:33 -07:00
David Rowe
e58e3fbbf7 Disconnect snapshot event handler when tablet "home" button pressed 2017-03-27 17:32:04 +13:00
David Rowe
dc3095bfcd Fix "don't share" button not closing window 2017-03-27 16:24:14 +13:00
David Rowe
d0fc352d3b Address event bridge being shared with other scripts 2017-03-27 16:07:58 +13:00
David Rowe
aa8a1e1dda Open snapshot dialog in tablet or window appropriately 2017-03-27 15:04:33 +13:00
Seth Alves
bb28976d0e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-26 09:32:35 -07:00
Seth Alves
90db9af2f9 Merge pull request #9978 from Triplelexx/fix-tablet-users-typo
fix myVisibility typo
2017-03-26 07:36:11 -08:00
Seth Alves
d45e124529 Merge pull request #9995 from hyperlogic/bug-fix/no-scroll-bar-on-marketplace
Hide the scrollbar on the marketplace
2017-03-25 08:36:31 -08:00
Seth Alves
3abd6b3948 Merge pull request #10006 from druiz17/tablet-help
Ported help into the tablet
2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi
edb66ae704 Merge branch 'tablet-ui' into tablet-ui-audio-screen 2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb Implemented Audio settings screen for Tablet UI 2017-03-25 13:17:38 +01:00
Dante Ruiz
6178a86a46 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-24 23:56:33 +01:00
Seth Alves
f1470e34f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-24 15:17:52 -07:00
Brad Hefta-Gaub
9b26e8ee95 Merge pull request #9871 from Triplelexx/21208
21208 - Muted microphone indicator
2017-03-24 13:07:43 -07:00
Anthony J. Thibault
7e6ff7c2fb Scrollbar is visible on marketplace in toolbar mode. 2017-03-24 11:40:10 -07:00
Lexx
fa606446a7 remove cache buster 2017-03-24 18:27:38 +00:00
Anthony J. Thibault
54b11bb6ee Hide the scrollbar on the marketplace 2017-03-24 11:22:50 -07:00
ZappoMan
52335e20a2 fix typo 2017-03-24 09:59:55 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay.
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Dante Ruiz
dfa6174069 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help 2017-03-23 17:34:50 +01:00
Seth Alves
62f10204d9 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:25:48 -07:00
Triplelexx
6a17e328e8 fix myVisibility typo 2017-03-22 22:13:39 +00:00
Dante Ruiz
3a89654111 saving work 2017-03-22 19:14:53 +01:00
Anthony J. Thibault
2c38d7ff89 Tablet spawn orientation now takes hand orientation into account.
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
2017-03-22 11:03:03 -07:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00