overte/interface/resources/qml
David Rowe e2e762f9e7 Merge branch 'master' into 21055
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
2016-10-07 11:27:35 +13:00
..
controller
controls Move keyboard QML files 2016-09-25 09:54:48 +13:00
controls-uit Move "," and "." to numeric keyboard for ready use with numeric fields 2016-09-29 10:17:31 +13:00
desktop Add basic implementation of customPrompt 2016-07-15 17:35:55 -07:00
dialogs Miscellaneous fixes 2016-09-26 15:34:39 +13:00
hifi Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
js
LoginDialog Fix Asset Browser dialog 2016-08-18 09:37:26 +12:00
menus Remove highlight animation duration on menus 2016-07-14 10:30:36 -07:00
styles
styles-uit Fix Asset Browser dialog 2016-08-18 09:37:26 +12:00
windows Fix field not scrolling into view when raise keyboard in settings 2016-09-29 10:47:15 +13:00
AddressBarDialog.qml Merge branch 'master' into 21055 2016-10-07 11:27:35 +13:00
AssetServer.qml removed extraneous debug prints 2016-08-19 11:32:13 -07:00
AvatarInputs.qml fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
Browser.qml Prevent flicker of keyboard area when navigate to a new page in browser 2016-09-29 10:35:18 +13:00
ForceLoad.qml
InfoView.qml Support toolbar API 2016-06-17 13:06:42 -07:00
LoginDialog.qml UI wiring 2016-08-08 15:39:25 -07:00
Marketplaces.qml Renamed isZipped for more clarity on checking for non-fbx files 2016-09-02 16:48:55 -07:00
QmlWebWindow.qml Raise and lower keyboard for HTML fields in Marketplace window 2016-09-28 16:41:01 +13:00
QmlWindow.qml CR changes 2016-08-10 10:26:58 -07:00
Stats.qml Updating stats display for threaded rendering 2016-09-02 14:41:49 -07:00
Tooltip.qml
ToolWindow.qml Remove duplicate keyboard 2016-09-29 12:09:04 +13:00
UpdateDialog.qml fixed errors in Browser.qml and UpdateDialog.qml 2016-07-07 14:06:57 -07:00