152 commits

Author	SHA1	Message	Date
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