527 commits

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