Commit graph

207 commits

Author SHA1 Message Date
Brad Davis
5946a965da Disable touch event emulation for tablet until we fix crash 2017-07-28 18:54:16 -07:00
Brad Davis
d42052a299 Fix overlay event handling thread issues 2017-07-28 14:56:21 -07:00
vladest
45934cb53e Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode 2017-07-28 18:04:29 +02:00
Zach Fox
7702bfceaa Big cleanup and preparation; Actually fix desktop tablet 2017-07-25 16:12:32 -07:00
Dante Ruiz
3c862c34b2 disable reload default scripts by default 2017-07-20 21:15:00 +01:00
Dante Ruiz
2f192fd48a added scroll fix for qt 5.6 2017-07-11 21:19:06 +01:00
Dante Ruiz
01ca192613 fixed tablet scrolling 2017-07-11 21:16:13 +01:00
Brad Davis
4439de240a Trying to fix QtQml/QtScript crashes 2017-06-22 16:39:57 -07:00
Dante Ruiz
b7286db523 fixed merge conflict 2017-06-21 01:10:54 +01:00
Zach Pomerantz
7e84f67391 Merge pull request #10744 from zzmp/audio/output-sample
Add "Play sample sound" to audio setting
2017-06-20 15:32:57 -07:00
Zach Pomerantz
f55d842fac add SoundCache to tablet for PlaySampleSound 2017-06-20 12:16:08 -07:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread
Cleanup and refactoring
2017-06-19 13:31:44 -07:00
Vladyslav Stelmakhovskyi
f34faa3ee7 Fix backward compatibility with Qt 5.6 2017-06-18 10:54:59 +02:00
Vladyslav Stelmakhovskyi
a1475bc65f Forgot if statement 2017-06-17 23:02:52 +02:00
Vladyslav Stelmakhovskyi
b8bb8026ca Merge branch 'master' into fix_tablet_buttons_qt59 2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi
5a0783c38c Send mouse events before touch event. It seems the order is important for Qt 5.9 2017-06-17 22:24:27 +02:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07: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
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
Zach Pomerantz
d416464b62 add Audio to tablet context 2017-06-06 17:55:19 -04:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Dante Ruiz
f0f10f74c6 inpput configutration stub 2017-06-03 00:30:00 +01:00
Zach Pomerantz
b2eda7cf22 rm AudioDevice interface 2017-05-28 19:04:51 -04:00
volansystech
8d9cfbdf31 Resolve comments of @sethalves . Remove whitespaces. 2017-05-26 11:41:35 +05:30
volansystech
cab6f3f7c3 Solve Jitteriness while scrolling. 2017-05-25 17:28:19 +05:30
volansystech
6da46c2d4c Resolve Mouse hover issue. 2017-05-22 10:53:58 +05:30
volansystech
b2ac4381eb Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar. 2017-05-18 19:13:59 +05:30
Ryan Huffman
bddfdfa838 Adjust Web3DOverlay to load QML even if not visible 2017-05-09 16:01:20 -07:00
Vladyslav Stelmakhovskyi
c8a9b02c7a Block only secondary button 2017-05-04 20:26:02 +02:00
Vladyslav Stelmakhovskyi
99ed2556f2 Do not send non primary button events to Tablet window 2017-05-04 16:11:07 +02:00
Zach Fox
3ce81844da Snapshot JS interface for better Settings handling 2017-04-27 14:01:08 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
Anthony Thibault
999bd0d339 Merge pull request #10075 from sethalves/tablet-ui
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Seth Alves
43e1cec8a3 merge from upstream 2017-04-03 06:28:59 -07:00
David Rowe
2b4afdb987 Fix tablet window getting stuck to pointer if release mouse off tablet 2017-04-02 12:58:11 +12:00
Chris Collins
3c62826ef9 Merge pull request #10091 from ctrlaltdavid/21248
Fix HTML controls not working properly in the tablet
2017-04-01 08:41:44 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2
PAL v2.0
2017-03-31 17:00:41 -07:00
David Rowe
25ac82f162 Don't send "move" events for non-move events 2017-04-01 10:47:04 +13:00
David Rowe
b03fd44240 Fix controls in HTML pages not responding to mouse events on tablet 2017-04-01 10:40:06 +13:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
David Rowe
06910d1881 Add comment re scrollbar stability in tablet 2017-03-30 14:20:02 +13:00
David Rowe
f954767b84 Get entities list and entity properties scrollbars working on tablet 2017-03-30 14:04:03 +13:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master"
This reverts commit b5ba4a109d.
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
Seth Alves
39ec53d69a Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy
Mark the system TabletProxy object as Cpp ownership.
2017-03-28 10:08:05 -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
ec6ef01600 Mark the system TabletProxy object as Cpp ownership.
This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.
2017-03-28 09:53:00 -07: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
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
Anthony J. Thibault
8915ecd23d compile time option to switch from touch to mouse events for web tablet 2017-03-23 13:54:17 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
Seth Alves
ff3fc244d1 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-23 09:50:53 -07:00
Zach Fox
0506fc0033 New goTo() behavior; Fix goBack 2017-03-20 12:55:38 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
Zach Fox
05fec328c0 Make tablet popups work like they should 2017-03-16 10:38:46 -07:00
Vladyslav Stelmakhovskyi
856e15060d Implemented Domain Connection statistics for Tablet UI 2017-03-15 21:05:13 +01:00
Vladyslav Stelmakhovskyi
99c74cec41 Merge branch 'tablet-ui' into tablet-ui-entity-statistics 2017-03-14 15:59:27 +01:00
David Rowe
4dd7667fd7 Merge branch 'tablet-ui' into 21209
# Conflicts:
#	interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
#	interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-14 08:50:01 +13:00
Vladyslav Stelmakhovskyi
9e9c64021c Merge branch 'tablet-ui' into tablet-ui-entity-statistics 2017-03-13 19:54:40 +01:00
Vladyslav Stelmakhovskyi
49055cfa5c Some statistics showed 2017-03-13 16:31:29 +01:00
Vladyslav Stelmakhovskyi
81bc56f124 Fixed slider groove size calculation. Added LOD Tools to Tablet UI 2017-03-11 14:44:33 +01:00
David Rowe
71713b10f3 Merge remote-tracking branch 'upstream/tablet-ui' into 21209
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-11 09:14:06 +13:00
druiz17
0069569e96 Merge branch 'tablet-ui' into 21197 2017-03-09 09:31:15 -08:00
druiz17
8750982567 Merge pull request #9785 from druiz17/menuFix
More dialog porting to tablet
2017-03-09 09:29:31 -08:00
David Rowe
1fc6d82456 Tablet and desktop versions of avatar attachments dialog 2017-03-09 13:04:57 +13:00
Seth Alves
28ade45f97 make maxFPS a property 2017-03-08 15:30:15 -08:00
Vladyslav Stelmakhovskyi
a02807fb26 Merge branch 'menuFix' into menuFix_AssetServer 2017-03-07 21:07:53 +01:00
Brad Davis
8782fe1d93 Merge branch 'master' into smarter_textures
Conflicts:
	libraries/model-networking/src/model-networking/TextureCache.cpp
2017-03-06 15:29:41 -08:00
Vladyslav Stelmakhovskyi
6d9e7de6dc Implemented AssetBrowser in Tablet view 2017-03-06 21:45:55 +01:00
David Rowe
09ecb12510 Merge branch 'tablet-ui-edit-js' into 21197
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-07 08:59:40 +13:00
Seth Alves
08e2e421e4 Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js 2017-03-06 11:08:27 -08:00
Seth Alves
93246b24b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 08:54:49 -08:00
Dante Ruiz
d5948079c7 Merge branch 'master' of github.com:highfidelity/hifi into menuFix 2017-03-06 16:29:37 +00:00
David Rowe
0333122b23 Make Save and Cancel buttons close preferences dialog 2017-03-04 15:27:31 +13:00
David Rowe
b31cf23c8d Fix tablet QML fonts path
This is the path for running scripts from build/install directory rather
than from source directory.
2017-03-03 17:45:23 +13:00
David Rowe
3285816fca Fix up audio stats displayed in tablet 2017-03-03 16:45:35 +13:00
Anthony J. Thibault
465a9e2008 Responsiveness improvement to tablet
PointerEvents sent from handControllerGrab.js to the Qml window are now direct connections, instead of queued.
This should reduce latency of laser and finger pressed onto the tablet.
2017-03-01 14:31:04 -08:00
samcake
6938948501 Merge branch 'master' of https://github.com/highfidelity/hifi into texmex 2017-02-22 12:00:11 -08:00
Dante Ruiz
f58a018c64 fixing merge conflicts 2017-02-21 15:46:41 +00:00
Seth Alves
4c1f5c1dc8 Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-17 09:58:58 -08:00
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -08:00
Seth Alves
c1e41311fc working toward using uuids for overlay IDs 2017-02-16 17:18:09 -08:00
Dante Ruiz
afd56bbbbe fixed qml font path issue for desktop and tablet 2017-02-17 00:01:12 +00:00
Seth Alves
792c7ff51f PointerEvent will now relay keyboard modifiers 2017-02-15 10:41:56 -08:00
Dante Ruiz
888d4ff706 basic prefreneces done 2017-02-14 07:46:32 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00
Dante Ruiz
5c5ace7c7b goto in tablet 2017-02-09 07:13:29 -08:00
Anthony J. Thibault
a209d0372a First cut of pal on tablet. 2017-02-08 17:34:03 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode.
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Anthony J. Thibault
bcd94203e6 Raised min fps of tablet overlay for smoother scrolling 2017-01-18 15:32:39 -08:00
dante ruiz
865a78a8c8 saving work 2017-01-18 07:40:14 -08:00
Seth Alves
cc4f4ac506 fix merge from upstream 2017-01-12 17:08:14 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
Brad Davis
f235a52a6d Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet 2017-01-11 14:21:29 -08:00