9 commits

Author	SHA1	Message	Date
Zach Fox	314c04ab96	Simplified UI v1	2019-05-10 10:49:25 -07:00
Seth Alves	29af3b1612	add a button to Avatar panel to lock or unlock wearables. ... allow grabbing / adjusting others' wearables if they are unlocked.	2019-03-27 10:12:57 -07:00
Wayne Chen	650b34c463	adding clock	2019-02-25 18:00:56 -08:00
danteruiz	d0fecac0d8	+android -> +android_interface	2019-02-06 11:37:52 -08:00
Wayne Chen	c53febceac	adding oculus to login dialog/adding focus wip	2018-11-26 15:10:04 -08:00
Wayne Chen	51586625e7	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-07 12:02:38 -08:00
Alexander Ivash	27bb8a0de7	rename stylues-uit => stylesUit & controls-uit => controlsUit ... note: the idea is to make imports like 'import controlsUit 1.0' to work with 'styles-uit'/'controls-uit' it is not possible because of two reasons: 1. import controls-uit 1.0 is invalid syntax 2. qmldir inside controls-uit is 'module controlsUit'	2018-11-06 14:21:14 +05:30
Brad Hefta-Gaub	405b1d5725	Revert "Better imports for controls and styles"	2018-10-23 10:58:28 -07:00
Alexander Ivash	740123b853	rename stylues-uit => stylesUit & controls-uit => controlsUit ... note: the idea is to make imports like 'import controlsUit 1.0' to work with 'styles-uit'/'controls-uit' it is not possible because of two reasons: 1. import controls-uit 1.0 is invalid syntax 2. qmldir inside controls-uit is 'module controlsUit'	2018-10-18 21:05:20 +03:00