Commit graph

17 commits

Author SHA1 Message Date
Simon Walton
9b6306601a Merge Clement's PR12700 diffs for early trace start 2018-04-10 13:13:46 -07:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66
RC66 merge back to master
2018-04-09 13:17:12 -07:00
SamGondelman
d38dadaf58 possible fix for qml texture leak 2018-04-06 09:34:00 -07:00
John Conklin II
97d9c1b735
Merge pull request #12726 from jherico/fix/rc66_crashes
Attempt to resolve potential overlay crashes at shutdown
2018-03-29 09:37:23 -07:00
Cristian Luis Duarte
fe9481b28d Cleanup code, comment out log, simplify radar is valid touch code (no more flag) 2018-03-28 19:50:44 -03:00
Brad Davis
9be162de95 Synchronously shut down QML rendering threads 2018-03-28 09:13:46 -07:00
Cristian Luis Duarte
242b009562 Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events. 2018-03-23 18:59:55 -03:00
Gabriel Calero
d0f1aa9020 Refactor fix for keyboard crash 2018-03-14 19:18:42 -03:00
Gabriel Calero
e744edc6a0 Possible fix for keyboard crash 2018-03-14 18:11:23 -03:00
Gabriel Calero
109fa1d832 Add the url of each qml as on-screen debug info 2018-03-07 17:18:37 -03:00
Gabriel Calero
069d3e40bc Merge branch 'android' into android_bubble_fix 2018-03-06 18:58:49 -03:00
Brad Davis
24545f8b58 Fixing android errors 2018-02-26 12:32:57 -08:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08: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
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
Brad Davis
8853bd6388 Fix spectator camera crash 2018-02-14 11:11:28 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00