19 commits

Author	SHA1	Message	Date
Zach Fox	14a04dfb1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 13:52:35 -07:00
Zach Fox	4c006c50aa	Controls almost done	2019-08-16 15:53:30 -07:00
Zach Fox	0338b0258c	Add Search to Emoji window and clean up some code	2019-08-15 12:21:29 -07:00
RebeccaStankus	8728640f60	Initial CR changes	2019-08-14 12:03:49 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
Zach Fox	8af469992e	BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-27 15:55:58 -07:00
Zach Fox	1d2ed1985f	DEV-142 & DEV-140: Scrollbars in Your Profile and Settings	2019-06-17 12:35:45 -07:00
Zach Fox	6fed581452	DEV-128: Update settings screen with latest design	2019-06-12 14:22:02 -07:00
Zach Fox	46ee148a69	Fix a bug and remove magic numbers	2019-05-22 15:24:33 -07:00
Zach Fox	5749392e83	New bg color; Final status indicator design; Fixed HMD icon	2019-05-21 14:10:27 -07:00
Zach Fox	15bdb66943	Integrate Status into top bar; improve Audio settings; improve spacing between settings	2019-05-17 17:25:48 -07:00
Zach Fox	971e07c646	update spacing between settings	2019-05-14 16:44:25 -07:00
Zach Fox	f9b51df296	Reduce size of output muted overlay; restore scroll to 0 on settings tab switch	2019-05-14 15:05:26 -07:00
Zach Fox	8724cf4edf	UIT TextField	2019-05-14 12:27:33 -07:00
Zach Fox	cf46f3c9d4	CheckBox UIT and CheckBox added to Avatar app	2019-05-14 11:50:07 -07:00
Zach Fox	7bb2d6871b	Simlpified Slider (not totally working; position is off)	2019-05-13 15:58:04 -07:00
Zach Fox	f799f96fba	simplifiedUI UIT switch	2019-05-13 13:04:12 -07:00
Zach Fox	feb5021372	UIT RadioButton	2019-05-13 11:07:39 -07:00
Zach Fox	314c04ab96	Simplified UI v1	2019-05-10 10:49:25 -07:00