636 commits

Author	SHA1	Message	Date
David Rowe	6a2b7244eb	Interim JSDoc for Tablet	2018-04-23 11:06:17 +12:00
Seth Alves	6fc02638d7	control verbose logging with a menu-item in developer menu	2018-04-20 16:08:57 -07:00
Seth Alves	bec39369f7	remove some uncatagorized logging, suppress some categories by default	2018-04-20 16:08:57 -07:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Zach Fox	3b8e52ea41	Merge pull request #12862 from zfox23/discovery_April2018 ... Discovery: April 2018 (Huge PR; see description)	2018-04-17 15:11:50 -07:00
Gabriel Calero	e3b94b163c	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-16 14:55:16 -03:00
Sam Gateau	3ac4a1db2d	Merge pull request #12850 from SimonWalton-HiFi/early-trace ... Enable Interface tracing from earliest execution point	2018-04-16 10:24:55 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
John Conklin II	008c7be369	Merge pull request #12787 from druiz17/fix-offscreen-windows ... hide desktop windows when switching into HMD mode	2018-04-13 12:17:15 -07:00
Gabriel Calero	aaaa17be7b	Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash	2018-04-12 18:00:05 -03:00
Gabriel Calero	476e1cf7ae	Adjust UI with pixel perfect precision. Support devices with on-screen bars.	2018-04-12 17:59:38 -03:00
Cristian Luis Duarte	b031c1c070	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash	2018-04-12 14:32:07 -03:00
Gabriel Calero	865e3a05f1	Move jump button to the right. Adjust position of buttons	2018-04-11 19:33:43 -03:00
John Conklin II	7a905ed420	Merge pull request #12777 from ctrlaltdavid/21813 ... Fix Window API position and size reporting	2018-04-11 13:48:21 -07:00
Zach Fox	b9d0360ea2	Finally fix the grey security pic bug!	2018-04-10 16:00:53 -07:00
Simon Walton	9b6306601a	Merge Clement's PR12700 diffs for early trace start	2018-04-10 13:13:46 -07:00
Cristian Luis Duarte	ffb8b0a60e	Android fly - Use new asset and screen position	2018-04-04 18:19:01 -03:00
Dante Ruiz	09ced24710	hide desktop windows when switching into HMD mode	2018-04-04 11:05:25 -07:00
David Rowe	a3c8b2792d	Fix Window.geometryChanged() values for moving and resizing window	2018-04-04 09:42:05 +12:00
Cristian Luis Duarte	1ea056a8a9	Android - Initial Jump button implementation	2018-04-03 16:07:40 -03:00
Sam Gondelman	c59d29f4ee	Merge pull request #12623 from SamGondelman/android ... Android: Fix corruption on startup	2018-03-12 15:03:07 -07:00
Ken Cooke	c9e253ab14	Merge pull request #12621 from ctrlaltdavid/21791 ... Fix CPU and GPU not throttling when Interface minimized from maximized	2018-03-12 14:43:47 -07:00
SamGondelman	4bef033d6f	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
David Rowe	3001225cb7	Fix CPU and GPU not throttling when Interface minimized from maximized	2018-03-12 15:49:20 +13:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
Cristian Luis Duarte	bde2ba9272	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
Gabriel Calero	069d3e40bc	Merge branch 'android' into android_bubble_fix	2018-03-06 18:58:49 -03:00
John Conklin II	8f403ebc23	Merge pull request #12543 from zfox23/improveFontLoading ... Improve font loading via QRC instead of file path	2018-03-02 14:22:17 -08:00
Gabriel Calero	01699e26a5	Fix QML debug info: print last QML loaded file instead of Desktop.qml	2018-03-02 18:04:36 -03:00
Zach Fox	67034274fa	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
Cristian Luis Duarte	9acb83632c	Android - Make joystick move up when showing the bottom bar	2018-02-28 18:52:13 -03:00
Cristian Luis Duarte	55d52f92df	Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)	2018-02-28 15:55:50 -03:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
Gabriel Calero	1dfdc0ce1b	Hide the selection cursor (android only)	2018-02-27 16:25:04 -03:00
Brad Davis	6254e2b569	PR feedback	2018-02-27 09:11:40 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
vladest	77ef0e05a1	Search main window by checking object name	2018-02-26 13:43:50 +01:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Bradley Austin Davis	12d1885dff	Merge pull request #12428 from gcalero/android_ui_fixes ... Android ui fixes	2018-02-22 18:28:18 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
David Rowe	c88f9a059d	Fix up JSDoc comment blocks in TabletScriptingInterface	2018-02-23 10:39:46 +13:00
Seth Alves	db195c6184	Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items ... Remove some deprecated JavaScript API items	2018-02-21 16:31:16 -08:00
Gabriel Calero	f2ce3d0268	Fix focus hack. Add QML debug info	2018-02-21 20:10:03 -03:00
John Conklin II	92249a2bee	Merge pull request #12396 from ElderOrb/double-connection-fix ... fix 4x 'fromQml' slots execution	2018-02-21 09:01:47 -08:00
MiladNazeri	331b253ba0	Merge pull request #12386 from cain-kilgore/21668 ... WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null	2018-02-16 06:57:03 -08:00
Alexander Ivash	beb595266d	fix 4x 'fromQml' slots execution ... note: per discussion with Austion & Seth, TabletRoot should be the only entity sending 'sendToScript' signals to C++	2018-02-15 21:45:35 +03:00
Sam Gateau	714e3f445d	Merge pull request #11537 from jherico/threaded_qml ... Migrating QML rendering off the main thread	2018-02-12 15:32:33 -08:00
Cain Kilgore	d1ecc85fb3	Merge branch 'master' of https://github.com/highfidelity/hifi into 21668	2018-02-12 23:19:20 +00:00
Cain Kilgore	5048bf16cb	Fixed Async Prompts/Assets/Dialogs	2018-02-12 23:01:19 +00:00
John Conklin II	d084e58f48	Merge pull request #12328 from Atlante45/fix/misc-bugs ... Misc bug fixes	2018-02-12 14:31:38 -08:00
David Rowe	033b85a3a8	Merge branch 'master' into remove-deprecated-items ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 09:42:40 +13:00
Gabriel Calero	0f07d0b493	Add bottom bar and address dialog (Android)	2018-02-09 17:32:12 -03:00
Bradley Austin Davis	fcb59a4ee6	Fixing android	2018-02-07 11:06:30 -08:00
Brad Davis	7d5502eb92	Migrating QML rendering off the main thread	2018-02-06 11:53:09 -08:00
Andrew Meadows	96c97547f9	Merge pull request #12205 from jherico/no_widgets ... Remove some unneeded Qt dependencies	2018-02-05 15:32:54 -08:00
David Rowe	615e54620b	Remove Menu.isInfoViewVisible() and closeInfoView() from JavaScript API	2018-02-04 15:38:33 +13:00
David Rowe	efddec621f	Remove Menu.addActionGroup() and removeActionGroup() from JavaScript API	2018-02-04 15:16:20 +13:00
David Rowe	d842e532ee	Remove Window.customPrompt() from JavaScript API	2018-02-04 14:02:30 +13:00
Atlante45	8ebb3e52d8	Misc bug fixes	2018-02-02 13:10:49 -08:00
Seth Alves	f7027b52e1	Merge pull request #12311 from ElderOrb/FB11511 ... FB11511 - position of log windows should be persistent between invocations of interface	2018-02-01 12:11:30 -08:00
Alexander Ivash	579d9a8640	fix slots invocation	2018-02-01 00:48:03 +03:00
Brad Davis	ef699c2a78	Better fix for AMD crashing (hopefully	2018-01-31 10:38:20 -08:00
Brad Davis	9893273d33	Trying to fix AMD crash in QML rendering	2018-01-31 08:36:52 -08:00
Gabriel Calero	07a542e35d	Add bottom bar and address dialog (Android)	2018-01-30 14:48:37 -03:00
Brad Davis	0781d8eaf0	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -08:00
Brad Davis	5bf2bda96d	Merge branch 'android' into android_new	2018-01-23 08:17:46 -08:00
Brad Davis	8ae0b09ea2	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
Seth Alves	45a00bebc0	Merge pull request #12217 from luiscuenca/sortOrderFix ... Fix sortOrder param on tablet buttons	2018-01-21 10:40:25 -08:00
luiscuenca	b0f21c6931	sorter variable names	2018-01-20 07:09:16 -07:00
Brad Davis	3e7872637d	Merge branch 'android' into android_new	2018-01-19 14:40:01 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
luiscuenca	41f3b792b6	Fix warnings	2018-01-19 14:34:52 -07:00
luiscuenca	27ea74f5bf	Fix sortOrder param on tablet buttons	2018-01-19 11:22:37 -07:00
Alexander Ivash	67e816756c	make gcc happy	2018-01-19 01:51:41 +00:00
Alexander Ivash	50217726c0	remove extra qualification from DesktopPreviewProvider::getInstance() in .h	2018-01-18 23:26:43 +03:00
Alexander Ivash	be3789e70a	show warning on attempt to force 'VSYNC' preview reason	2018-01-18 23:26:43 +03:00
Alexander Ivash	576ae227a8	move imagePaths into .h so simplify matching enum values to image files	2018-01-18 23:26:43 +03:00
Alexander Ivash	744da710a3	move VSYNC into 'PreviewDisabledReasons' enum	2018-01-18 23:26:43 +03:00
Alexander Ivash	a74b093b60	FB11109 Preview disabled image swap (Commerce only)	2018-01-18 23:26:43 +03:00
Brad Davis	d3c4b0ef45	Merge remote-tracking branch 'gcalero/android_virtual_touchpad' into android_new	2018-01-18 10:04:03 -08:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
Gabriel Calero	970ca5e08f	Add virtual pad for android	2018-01-17 15:00:43 -03:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	58d4d193f7	Add command line disabling of QML and KTX cache	2018-01-13 12:22:00 -08:00
Brad Davis	8c528be481	Allow compile time disabling of QML surface rendering	2018-01-13 11:34:00 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
David Rowe	1fa31d3c10	Remove old ToolWindow code	2018-01-13 10:27:43 +13:00
Gabriel Calero	c469e8ce53	Propagate touch events to qml offscreen surface	2018-01-11 20:45:26 -03:00
Brad Davis	97593bc4d8	Fixing compiled resource access	2018-01-10 17:18:12 -08:00
Brad Davis	b1e95681a9	Cleanup android	2018-01-09 23:30:31 -08:00
Brad Davis	105dffebaf	Fixing UI	2018-01-09 18:36:42 -08:00
Gabriel Calero	7fbd23f36b	Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr	2018-01-08 17:38:28 -03:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Brad Hefta-Gaub	7a3835eb33	Merge pull request #11945 from jherico/android_nov ... Updating android toolchain for QML	2018-01-05 13:34:03 -08:00
Gabriel Calero	d31346c047	Use qml engine	2018-01-03 16:40:14 -03:00
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
Brad Davis	829e521320	Merge remote-tracking branch 'upstream/master' into HEAD	2018-01-02 11:37:33 -08:00
vladest	35fee739c5	Use buttons index	2017-12-27 23:50:15 +01:00
vladest	a497047666	Refactored using new GridView approach	2017-12-23 17:44:26 +01:00
vladest	2bca0939b3	Preliminary proxy model	2017-12-21 19:32:13 +01:00
vladest	d6e1a3ea41	Merge conflicts solved	2017-12-21 09:02:04 +01:00
vladest	79f9b54f6a	Store button list in the resources section of fake item instead of C++ space	2017-12-20 22:59:07 +01:00
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08:00
Brad Davis	c6bc6f6ef2	Merge remote-tracking branch 'upstream/master' into android_nov	2017-12-16 16:20:16 -08:00
vladest	62a762b879	Merge branch 'master' into tablet_home_paginate	2017-12-16 20:32:21 +01:00
vladest	cdb9d72387	Added smart pointer for qml buttons. removed extra modifiers. page changed using left and right buttons	2017-12-16 20:27:19 +01:00
Seth Alves	b1503f7c46	Merge pull request #11976 from luiscuenca/fixLinuxAudioDLock ... Fix getActiveDevice deadlocks on Linux	2017-12-15 15:41:41 -08:00
luiscuenca	483443d218	No mutex	2017-12-13 17:02:36 -07:00
luiscuenca	e581c66b56	added mutex for audio handler	2017-12-13 16:11:46 -07:00
luiscuenca	e709561a62	Fix getActiveDevice deadlocks on Linux	2017-12-13 12:14:49 -07:00
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
Bradley Austin Davis	9df9cf7a47	Adding more libs, ifdefs for android incompatible code	2017-12-11 13:18:23 -08:00
Zach Fox	2d786451c2	Add comment	2017-12-11 10:50:24 -08:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
vladest	cc78fc1f53	Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections	2017-12-11 17:50:16 +01:00
vladest	3aaf666295	Merge branch 'master' into tablet_home_paginate	2017-12-08 19:59:41 +01:00
Sam Gondelman	352c11d7c4	Merge pull request #11358 from vladest/fix_google_vr_height ... Momentum aka flickable for WebView	2017-12-08 10:46:52 -08:00
vladest	9b3db0725b	Retreive buttons list from tablet proxy	2017-12-07 22:36:34 +01:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
luiscuenca	fefedc11c8	mac fix	2017-12-01 15:17:23 -07:00
luiscuenca	d271f61987	Proper fix	2017-12-01 14:37:59 -07:00
luiscuenca	83e370d9de	add shared pointer	2017-11-30 17:40:49 -07:00
luiscuenca	5d1f2a04c1	restate deleted lines	2017-11-30 16:43:38 -07:00
luiscuenca	98e8361690	Fix and rebuild	2017-11-30 16:07:43 -07:00
luiscuenca	9cd2dc921a	back to for loop	2017-11-30 15:31:29 -07:00
luiscuenca	0729579266	fix for loop	2017-11-30 15:21:43 -07:00
luiscuenca	58e829dbda	Delete leftover line	2017-11-30 15:11:38 -07:00
luiscuenca	e02e810399	Audio Handler fix	2017-11-30 15:06:02 -07:00
vladest	74c002d1f5	Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events	2017-11-30 12:52:26 +01:00
luiscuenca	b817143e2e	Fixes on web and QML audio sync	2017-11-29 18:16:21 -07:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Brad Hefta-Gaub	5914f27027	Merge pull request #11706 from luiscuenca/webAudioDev_fresh ... QML & Web generated audio now follow the client audio device selection	2017-11-21 11:29:48 -08:00
Howard Stearns	4018b99118	Merge pull request #11848 from zfox23/commerce_flipTheSwitch ... Turn Commerce on by default!	2017-11-20 16:18:53 -08:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
Dante Ruiz	427f676859	minimize diff	2017-11-17 16:06:34 -08:00
Dante Ruiz	ab9432c1cd	load webpage if tablet root is not initialized	2017-11-17 16:02:53 -08:00
Zach Fox	f47f259816	Turn Commerce on by default	2017-11-17 15:12:49 -08:00
SamGondelman	3274c41aeb	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -08:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
Brad Davis	0ad3999741	Fixing misname	2017-11-15 12:24:00 -08:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
Brad Davis	1167be4102	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
Zach Fox	c42003a374	Merge pull request #11794 from ElderOrb/FB4684_3 ... 4684 Add collapse button on the virtual keyboard	2017-11-14 12:22:42 -08:00
Brad Davis	d71fd151c5	Fixing button model exposure	2017-11-13 16:45:27 -08:00
SamGondelman	60db24f2d3	merge with master	2017-11-13 14:36:24 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00