Commit graph

472 commits

Author SHA1 Message Date
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -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
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -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
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
cbb2d9d854 Merge remote-tracking branch 'upstream/master' into android 2018-01-17 17:51:39 -08: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