508 commits

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