62 commits

Author	SHA1	Message	Date
RebeccaStankus	94e71e1bdd	Still trying get QML gridLayouts to work	2019-10-02 17:14:50 -07:00
RebeccaStankus	b1fd6050c7	Merged Zach's work	2019-10-02 12:55:51 -07:00
RebeccaStankus	dc15b55aa5	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-02 12:05:34 -07:00
Zach Fox	6bfca4e587	DEV-2275: Move 'input device muted' banner and make it slightly smaller	2019-10-02 11:48:50 -07:00
RebeccaStankus	d2e62749c7	Ready for Zach to add default avatar changes	2019-10-01 16:36:06 -07:00
RebeccaStankus	0dfb234089	Finished UI, ready for CR	2019-10-01 09:58:44 -07:00
RebeccaStankus	0f1190df8b	Trying to make QML UI work second launch	2019-09-30 15:03:58 -07:00
RebeccaStankus	9a03058e88	Trying to make QML UI work	2019-09-30 12:09:22 -07:00
RebeccaStankus	b98d106a3b	mend	2019-09-30 10:39:35 -07:00
RebeccaStankus	b25c874e5f	More work on second launch UI	2019-09-30 10:38:11 -07:00
RebeccaStankus	44d9610048	Working on UI	2019-09-30 09:17:51 -07:00
RebeccaStankus	f4ecd3dcd8	Working on initial/second launch	2019-09-27 09:15:39 -07:00
RebeccaStankus	982bdf5c98	Prereq work for 'Reduce User Friction'	2019-09-23 16:49:16 -07:00
milad	bb0b51116a	cr1	2019-09-06 11:29:29 -07:00
milad	b352d53083	removed space made on accident	2019-09-06 11:00:14 -07:00
milad	120c678557	added a wearable check for avimojis on startup	2019-09-06 10:51:12 -07:00
milad	252e8a2ed6	removed commented out code	2019-09-04 16:49:46 -07:00
milad	79b7271729	removed startup/unload apis from the 3 main modules	2019-09-04 16:48:24 -07:00
RebeccaStankus	0be3f133de	Removed some Milad notes	2019-08-20 14:17:00 -07:00
RebeccaStankus	cc22386f06	CR feedback changes	2019-08-20 13:29:02 -07:00
Zach Fox	14a04dfb1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 13:52:35 -07:00
Zach Fox	05abff1c0b	Merge pull request #16071 from zfox23/helpApp1 ... Help App: Phase 1	2019-08-19 11:16:44 -07:00
RebeccaStankus	44d0e0ba1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 09:16:19 -07:00
Zach Fox	a274e5c2b1	Fix BUGZ-1263 and probably BUGZ-1273: Fix input device muted banner	2019-08-16 12:31:50 -07:00
RebeccaStankus	bc67241100	Finished changes for CR feedback	2019-08-14 14:09:48 -07:00
RebeccaStankus	0645796e74	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-14 13:28:08 -07:00
RebeccaStankus	8728640f60	Initial CR changes	2019-08-14 12:03:49 -07:00
Zach Fox	52c4d4fe69	better FAQ	2019-08-14 09:31:08 -07:00
Zach Fox	7297ac9a09	Merge branch 'master' of github.com:highfidelity/hifi into helpApp1	2019-08-14 09:11:04 -07:00
sabrina-shanman	71bc1a4258	Make simplifiedUI default to 20:20 vision	2019-08-08 13:03:39 -07:00
Zach Fox	72e14a32f9	Implement the Help App skeleton; Implement Help App Controls; Implement Help App About	2019-08-07 17:13:20 -04:00
milad	1a95c126c3	working version but taking a snapshot of added emoji code before removing for handoff	2019-08-06 13:13:38 -07:00
milad	d1efbc051a	working UI	2019-08-04 15:11:55 -07:00
sabrina-shanman	601b579c42	Set the LOD angle in simplifiedUI to current effective default, to be adjusted later	2019-07-25 17:32:56 -07:00
sabrina-shanman	4b5a45209e	Prefer using LODManager.lodAngleDeg for setting manual LOD	2019-07-25 17:15:22 -07:00
sabrina-shanman	3a4ce44633	On second thought, do not expose default octree size scale	2019-07-24 17:32:25 -07:00
sabrina-shanman	9d93a2f502	Fix simplifiedUI stuck on wrong LOD value	2019-07-24 16:27:24 -07:00
Zach Fox	85b563461a	DEV-165: Move Simplified UI scripts around; remove extra copy of scripts; never pause other scripts	2019-07-10 12:06:08 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
Zach Fox	5048b8bd89	Implement DEV-218 & DEV-219 and commit a starting point for the Emote app	2019-07-08 16:46:58 -07:00
Zach Fox	eb79752455	BUGZ-930: No more auto-LOD adjustment for SimplifiedUI users	2019-07-05 12:00:17 -07:00
Zach Fox	cccc241553	Actually fix the bug	2019-06-21 16:19:09 -07:00
RebeccaStankus	772bad58ca	Increased bottom margin on muted overlay	2019-06-13 15:55:49 -07:00
Preston Bezos	e32d6e96ce	code was backwards	2019-06-12 16:12:24 -07:00
Preston Bezos	2eeec3518d	one last fix	2019-06-12 16:03:03 -07:00
Preston Bezos	3cd3f1a508	one last fix	2019-06-12 15:56:27 -07:00
Preston Bezos	8dcf6e6a03	removed a dead line of code, made a couple formating changes	2019-06-12 15:47:19 -07:00
Preston Bezos	29d795af5b	hopefully good now	2019-06-12 15:36:20 -07:00
Preston Bezos	8fa80f8935	fixed some formatting problems	2019-06-12 14:57:37 -07:00
Preston Bezos	038747e645	Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering	2019-06-12 14:55:37 -07:00