58 commits

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