14 commits

Author	SHA1	Message	Date
Zach Fox	4dfbc489e8	Merge branch 'master' of github.com:highfidelity/hifi into SUI/emoteAppPrototype	2019-07-09 15:40:16 -07:00
RebeccaStankus	714a3f6b08	Fixed path to tabletAssetServer in HMD, simplifiedUI system folder	2019-07-09 13:02:54 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
RebeccaStankus	352f9590b1	Fixed Qt.resolvedUrl format	2019-07-05 16:23:29 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
RebeccaStankus	d8daee49a8	Fixed bad path to gridControls	2019-06-25 16:31:21 -07:00
RebeccaStankus	e9777dc40f	Merge branch 'master' of github.com:highfidelity/hifi into create	2019-06-25 09:28:43 -07:00
RebeccaStankus	6aca2fcf07	Working on new file structure	2019-06-24 14:01:51 -07:00
RebeccaStankus	e7cec0f11f	Fixed dialogs imports	2019-06-20 15:07:39 -07:00
RebeccaStankus	f5fa44dc21	Revert "Changed icons path to be relative" ... This reverts commit e277070423.	2019-06-19 12:06:34 -07:00
RebeccaStankus	e277070423	Changed icons path to be relative	2019-06-19 11:17:52 -07:00
RebeccaStankus	30dd667b17	Changed qml import method	2019-06-19 10:40:32 -07:00
RebeccaStankus	3b53e34c95	fixing paths	2019-06-18 11:35:00 -07:00
RebeccaStankus	5a49ac9a22	moved files	2019-06-17 16:45:54 -07:00