John Conklin II afe6d97b00 Merge pull request #14100 from danteruiz/soft-entities-updates ... update soft entities and fix deadlock from qml.		2018-10-04 13:33:34 -07:00
..
+android	Working on the LOD system	2018-08-23 11:39:47 -07:00
controller
controls	Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back	2018-08-21 10:20:51 -07:00
controls-uit	couple Spinbox fixes:	2018-08-10 12:58:45 +03:00
desktop	Rollback PR 12888 by deleting alternative +android files	2018-07-11 21:21:12 -03:00
dialogs	Tweak vertical spacing	2018-09-28 15:42:48 +12:00
hifi	Merge pull request #14100 from danteruiz/soft-entities-updates	2018-10-04 13:33:34 -07:00
js	remove cached file	2018-02-13 11:07:15 -08:00
LoginDialog	reszing unameField/showing flavorText	2018-09-21 14:36:13 -07:00
styles
styles-uit	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
windows	added logging + activity logging	2018-09-10 15:06:14 -07:00
AnimStats.qml	Fix for type in AnimStats.qml	2018-09-17 15:17:43 -07:00
AudioScopeUI.qml	minimize diff	2018-03-29 11:24:31 -07:00
AvatarInputsBar.qml	Merge branch 'master' into move_to_qqc2	2018-03-24 15:32:04 +01:00
Browser.qml	Adding potential fix	2018-07-12 14:15:16 -07:00
ConnectionFailureDialog.qml
CurrentAPI.qml	Fix font loading for MacOS via different font loading method	2018-03-08 14:31:48 -08:00
ForceLoad.qml
InfoView.qml
InteractiveWindow.qml	CR fixes	2018-08-28 19:43:59 +02:00
LoginDialog.qml	adding user activity logging	2018-09-10 23:04:50 -07:00
OverlayWindowTest.qml	InteractiveWindow scripting API	2018-06-28 19:04:08 +02:00
QmlWebWindow.qml	Don't allow Web surfaces created by non-client scripts to access files	2018-08-01 15:12:45 -07:00
QmlWindow.qml
Stats.qml	Remove anim stats from plain ole stats.	2018-09-06 17:58:40 -07:00
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml