784 commits

Author	SHA1	Message	Date
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
Brad Davis	8f85c7650b	Make sure loaded components get the right parent context	2017-11-13 14:16:04 -08:00
SamGondelman	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
Brad Davis	5cf9c1bb33	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 10:48:21 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
beholder	5fcde1186a	hide keyboard before showing to solve clearing 'mirrorText' on jumping between input fields without hiding keyboard	2017-11-10 21:20:00 +03:00
beholder	db3ed81513	adjust to changed requirements: ... 1. The keyboard collapse button is moved to the lower right, replacing the keys there 2. The button next to m is a hyphen instead of a underscore, it turns to a underscore when the user clicks on shift 3. The input text at the top occupies the full width and is center aligned, when you start typing the text moves in both directions the left and the right	2017-11-10 21:20:00 +03:00
beholder	a9fe3596cf	4684 Add collapse button on the virtual keyboard	2017-11-10 21:20:00 +03:00
Elisa Lupin-Jimenez	119c662899	fixed null file path in file dialog call	2017-11-09 11:46:19 -08:00
Brad Davis	1a58aee385	Fix scripting URL injection, I hope	2017-11-08 12:00:29 -08:00
SamGondelman	7d420f5242	isLeftHand, isRightHand, isMouse	2017-11-06 12:29:21 -08:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
luiscuenca	c834cf1cf3	Comments and corrections	2017-11-01 21:55:31 -07:00
SamGondelman	657a0fb036	Merge remote-tracking branch 'upstream/pointers' into ui	2017-10-31 17:41:14 -07:00
SamGondelman	64665c87b2	replace ids with unsigned ints	2017-10-31 17:07:48 -07:00
SamGondelman	3c779f1528	HUD events WIP, fix entity/overlay hover, no hover for empty renderState	2017-10-31 14:42:31 -07:00
luiscuenca	8d5c95b1d6	Various corrections	2017-10-30 16:47:59 -07:00
luiscuenca	f32282afdd	Clean update bug 8027	2017-10-27 11:03:02 -07:00
Zach Fox	002141724b	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Dante Ruiz	92f765fe52	property set echomode for keyboard for wallet and webviews	2017-10-24 13:53:50 -07:00
Zach Fox	c64c2e17c8	First pass at consolidation	2017-10-24 12:01:05 -07:00
Dante Ruiz	0242e8e4ba	fixed crash and login password	2017-10-23 16:33:49 -07:00
vladest	fa349a694c	Code style fixes	2017-10-20 15:12:09 +02:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
beholder	e8589d53dd	updated code based on code review	2017-10-18 03:45:50 +03:00
Andrew Meadows	25818fc5e9	Merge pull request #11613 from jherico/feature/qml_whitelist ... Support for custom functionality for specific QML URLs	2017-10-17 17:34:22 -07:00
Bradley Austin Davis	f53a74b515	Support for custom functionality for specific QML URLs	2017-10-17 11:53:30 -07:00
beholder	fa7892e5c6	8217 Search in tablet doesn't update	2017-10-17 02:02:21 +03:00
beholder	f83040c572	updating code accordingly to the comments	2017-10-14 12:29:06 +03:00
beholder	c31aa6bcdb	8213 Keyboard Input Field: Reveals Passwords	2017-10-12 22:08:46 +03:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 ... Commerce: One step closer!	2017-10-03 11:56:00 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Zach Fox	b5dc6b791b	Fix commerce setting handle	2017-09-28 10:42:45 -07:00
Andrew Meadows	dafadf82bb	Merge pull request #11458 from jherico/fix/tablet_latency ... Fix long tablet lag on first load	2017-09-26 16:18:31 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -07:00
vladest	074362b228	Remove logging	2017-09-25 23:10:26 +02:00
vladest	1a2d38e31f	Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds	2017-09-25 17:11:44 +02:00
vladest	5a452fa981	Merge branch 'master' into tablet_extended_sounds	2017-09-25 15:40:40 +02:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
Brad Davis	549cb77902	Fix dimensions of rendered web entities	2017-09-21 20:59:01 -07:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Andrew Meadows	6b3b3a7448	Merge pull request #11382 from ElderOrb/case6618 ... 6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-21 08:54:11 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
vladest	50ee41e095	Fix file loading dialogs	2017-09-19 22:42:15 +02:00
beholder	8b39c56aa1	rename 'target' to 'targetOverride' to indicate that parameter overrides default target	2017-09-18 20:40:22 +03:00
vladest	e26118254f	Implemented Audio injector in Tablet scripting interface. Added missed sound events	2017-09-18 19:40:06 +02:00
vladest	bb214d7bf3	Merge branch 'master' into tablet_extended_sounds	2017-09-17 16:16:03 +02:00
vladest	1cde504c74	Memleak fix. Cleanup	2017-09-16 22:57:26 +02:00
vladest	5585265349	Merge branch 'master' into modal_dialogs_async	2017-09-16 22:06:49 +02:00
vladest	3ceeb0d83e	Rework all c++ calls	2017-09-16 22:04:53 +02:00
beholder	871b169128	6618 [Worklist] Add Input Field On Top of Keyboard	2017-09-16 16:17:36 +03:00
vladest	de4f34aacb	Add resizable flag. Use the flag for Create only	2017-09-15 21:49:38 +02:00
vladest	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
vladest	7c1827d672	use AduioEvent instead of string	2017-09-14 20:21:11 +02:00
vladest	61b283743e	Merge branch 'master' into tablet_extended_sounds	2017-09-14 19:52:35 +02:00
David Kelly	7550374f8f	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/oneFileWallet	2017-09-13 04:49:13 -07:00
David Kelly	187ed71a8a	more cleanup, plus now keyfile associated with user directly	2017-09-12 10:55:27 -07:00
anshuman64	996277b34c	Merge pull request #11335 from vladest/menu_fix ... Make sure root item is created before lambda gets called for desktop …	2017-09-11 12:47:40 -07:00
vladest	34c1cb6579	Typos and naming fixes	2017-09-11 19:42:05 +02:00
Chris Collins	47a9337aa7	Merge pull request #11323 from jherico/mac_fixes ... Mac fixes	2017-09-11 09:10:50 -07:00
vladest	dfaa8761e5	Make sure root item is created before lambda gets called for desktop loader	2017-09-10 20:08:40 +02:00
vladest	832e4aa5eb	Introducong tablet audio events	2017-09-08 09:51:10 +02:00
Bradley Austin Davis	eb8b892571	Various Mac fixes	2017-09-07 14:45:35 -07:00
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00
beholder	c62f9007e9	7196 Mouse pointer no longer visible in HMD mode ... The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins. The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins	2017-09-03 15:20:59 +03:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
vladest	1b5e6fd5f8	Merge branch 'master' into modal_dialogs_async	2017-08-31 20:39:48 +02:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
Zach Fox	271fcbf8b4	Merge pull request #11271 from davidkelly/dk/securityImageIssue ... security image shows up in every qml engine now	2017-08-30 10:52:48 -07:00
David Kelly	72b15b4223	fix comment	2017-08-29 20:28:57 -07:00
druiz17	2a97257698	Merge pull request #11140 from ElderOrb/case6788 ... 6788: You can deselect your current view mode	2017-08-29 17:15:51 -07:00
David Kelly	a2b1cfc7ac	security image shows up in every qml engine now	2017-08-29 17:06:57 -07:00
beholder	a0a43ebf26	show checkbox or radiobutton dependently on exclusiveGroup presence	2017-08-29 23:23:16 +03:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
beholder	cbbe03cee7	6788: You can deselect your current view mode	2017-08-25 02:33:11 +03:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
howard-stearns	bd37679b65	working	2017-08-18 14:03:40 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
vladest	a87a93d991	Implemented input dialog async functions	2017-08-16 15:35:51 +02:00
vladest	757af1e2e5	Added Save, Directory and Assets async methods	2017-08-15 14:44:01 +02:00
vladest	ac7aa609f2	Open file async implemented	2017-08-14 16:23:53 +02:00
vladest	b604b1bbac	Async file dialogs #1	2017-08-13 11:02:29 +02:00
Elisa Lupin-Jimenez	6c2bf63392	Back button works	2017-08-10 17:51:19 -07:00
Elisa Lupin-Jimenez	da5bb03187	Trying to add in a back button	2017-08-10 16:34:37 -07:00
vladest	68e9d335cd	Added async information and critical dialogs	2017-08-10 10:46:06 +02:00
vladest	556569819d	1st stage of moving to async dialogs	2017-08-09 14:00:19 +02:00
Seth Alves	186035dc5d	adjust various things that cause a crash-on-exit on Linux	2017-08-06 11:57:55 -07:00
vladest	a439cc1837	Make connection to tablet shown signal more consistent, eliminates missed signals	2017-08-03 20:58:44 +02:00
vladest	b049b0f415	Merge conflicts	2017-08-03 19:43:42 +02:00
vladest	638eeede43	Merge conflict	2017-08-02 20:07:06 +02:00
Dante Ruiz	05f1caab01	better solution to help and blank tablet issues	2017-08-02 16:35:58 +01:00
vladest	2d4396ac8e	Merge branch 'master' into fix_toolbar_apps_switch	2017-08-02 16:34:49 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
Dante Ruiz	cca29e849b	fix issue of tablet begin blank when switching between HMD and Desktop mode	2017-08-01 23:18:42 +01:00
vladest	e30e0b1a5f	Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption	2017-07-31 16:45:21 +02:00
vladest	bb7110d81b	Desktop Running scripts window now closed and as soon as Tablet opened, it will show Running Script. TODO: make Tablet opens automatically	2017-07-30 19:22:54 +02:00
vladest	0333849aa8	Merge branch 'master' into fix_menu_landscape	2017-07-29 11:44:58 +02:00
Stephen Birarda	17dd028ec7	make Paths available to desktop and tablet QML context	2017-07-28 14:23:18 -07:00
Brad Davis	3d0c13915a	Fix tablet button crash	2017-07-28 11:20:57 -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
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 ... WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
Dante Ruiz	fdfeab77eb	made requested changes	2017-07-19 16:28:16 +01:00
Dante Ruiz	06a69c8bd7	fixed another tablet stuck on help screen	2017-07-18 20:27:55 +01:00
Andrew Meadows	99aad77e53	Merge pull request #10954 from jherico/qml_crashes_again ... Still trying to address QML crashes	2017-07-17 10:21:23 -07:00
druiz17	3b112450f0	Merge pull request #10959 from druiz17/bug/wrong-tablet-state ... Fix tablet scripting interface setting its internal state to home when switching between toolbar and tablet mode	2017-07-14 14:31:04 -07:00
Dante Ruiz	e07b067d7b	fixed tablet getting in the wrong state	2017-07-12 21:09:54 +01:00
Brad Davis	0e9f8cc103	Still trying to address QML crashes	2017-07-12 11:04:33 -07:00
Seth Alves	3670a04d8e	switch bare pointers to AudioInjector objects to be QSharedPointers	2017-07-11 14:24:58 -07:00
Dante Ruiz	75e1b265d5	comment out code that causes a crash on launch from fresh install	2017-07-10 17:48:53 +01:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	9c37b28ba0	Remove tool window logic	2017-06-30 10:58:19 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Seth Alves	2f3109e4be	move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it	2017-06-28 11:00:05 -07:00
Brad Davis	08784ff30c	Fix toolbar button mouse click when they were added via the tablet scripting interface	2017-06-25 02:34:58 -07:00
humbletim	c10475186c	add support for switching cursor from arrow to reticle	2017-06-23 18:48:29 -04:00
Brad Davis	341646c780	Fix bad invocation, cleanup signatures	2017-06-23 09:58:27 -07:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
NeetBhagat	ead0d42cf3	Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h	2017-06-07 15:47:19 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Brad Davis	fb995bebf1	Prevent crash on switching to 3D display twice	2017-05-04 12:04:21 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
Dante Ruiz	50ed4a61f7	Merge branch 'master' of github.com:highfidelity/hifi into tablet-crash	2017-04-21 18:26:37 +01:00
Dante Ruiz	8cfa03fa56	tablet cpp ownership	2017-04-21 18:26:26 +01:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
Zach Fox	50456f71ed	Merge pull request #10142 from Triplelexx/21258 ... 21258 - Don't render (or heavily use GPU) when window in minimized	2017-04-19 16:26:49 -07:00
David Rowe	00b6b2a2c0	Implement desktop recordings browser dialog	2017-04-19 12:34:59 +12:00
David Rowe	dae6d6fb69	Stub desktop dialog to select recording to play from ATP assets	2017-04-18 11:43:42 +12:00
Triplelexx	27a404d0ea	remove extra lines	2017-04-07 07:09:18 +01:00
Triplelexx	279997d905	change display plugin to deactivate when window minimized	2017-04-07 06:49:28 +01:00
Vladyslav Stelmakhovskyi	aa487faad1	Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings	2017-04-04 16:59:09 +02:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
Andrew Meadows	f6d6c62fab	move variable closer to context where it is used	2017-03-27 14:40:31 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Brad Davis	e265a0a1f8	Fix possible crash in Menu::removeSeparator	2017-03-16 13:12:30 -07:00