101 commits

Author	SHA1	Message	Date
Zach Fox	b06b0b51df	Mipmap the emoteIndicator Image	2019-08-16 10:07:22 -07:00
Zach Fox	92c5ca2d75	Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd	2019-08-16 09:58:44 -07:00
RebeccaStankus	73941f1ece	Fixed bug with emote indicator icon not restoring	2019-08-16 09:46:46 -07:00
RebeccaStankus	a06cb85f9e	Indicator image swapping	2019-08-15 17:20:27 -07:00
Zach Fox	6176214d45	Remove extra log	2019-08-15 17:00:59 -07:00
Zach Fox	a053f9ed9e	Impelement settingChanged; clean up some emoteIndicatorVisible code	2019-08-15 17:00:27 -07:00
RebeccaStankus	876ae771d4	Tray buttons swap color on hover	2019-08-15 16:44:50 -07:00
Zach Fox	98eff6ebb6	Mipmap the emoji bar images	2019-08-15 16:32:59 -07:00
RebeccaStankus	64dcb48925	Removed extra file, moved qml images	2019-08-15 16:31:37 -07:00
RebeccaStankus	f93d754f15	Button label characters are now images	2019-08-15 16:25:25 -07:00
RebeccaStankus	2fc603b85e	Replacing button label characters with images	2019-08-15 15:35:41 -07:00
Zach Fox	d29cdffe8c	Toggle reaction bugfix	2019-08-15 14:42:27 -07:00
Zach Fox	2149f1acc7	Reaction logic now nice and stable!	2019-08-15 14:40:33 -07:00
RebeccaStankus	af97384948	Adding icon swaps to emoteIndicator	2019-08-15 14:21:03 -07:00
Zach Fox	0497c10d69	Ensure mask covers non-circular emoji	2019-08-15 13:20:09 -07:00
Zach Fox	9ae5eba12a	Remove reliance on QML timer - still need to fix non-circular emoji mask	2019-08-15 13:04:50 -07:00
Zach Fox	dcae607cfb	Applause sound and fixup handler	2019-08-15 12:46:30 -07:00
Zach Fox	38743f924f	Autofocus Emoji search text field	2019-08-15 12:23:29 -07:00
Zach Fox	0338b0258c	Add Search to Emoji window and clean up some code	2019-08-15 12:21:29 -07:00
RebeccaStankus	078ff223a4	Emote animations start and stop correctly	2019-08-15 12:01:25 -07:00
Zach Fox	143c3e966c	Big optimizations to Emoji window	2019-08-15 10:58:13 -07:00
Zach Fox	2c604d2c5b	Simpler code!	2019-08-15 09:58:45 -07:00
Zach Fox	bfb4c0c49a	Fixup emote indicator	2019-08-15 09:21:42 -07:00
RebeccaStankus	46a8e804b3	Working on tray functionality	2019-08-15 09:11:52 -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
sabrina-shanman	71bc1a4258	Make simplifiedUI default to 20:20 vision	2019-08-08 13:03:39 -07:00
milad	b8c5192d7a	add images	2019-08-06 19:59:10 -07:00
milad	c2fddbf03a	cut down files	2019-08-06 19:55:48 -07:00
milad	82f6c29923	updated emoji size info	2019-08-06 13:23:10 -07:00
milad	f1ff9207f9	removing empty js file	2019-08-06 13:20:15 -07:00
milad	c20933b813	removed saved emoji called and also add more info to description	2019-08-06 13:16:58 -07: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
Shannon Romano	75146a104d	Merge pull request #15982 from sabrina-shanman/bug_lod_too-low ... (BUGZ-1040) Fix LOD randomly being too low in simplified UI	2019-07-29 09:45:19 -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
milad	f87e306ad4	adding extra padding to the initial textbox calculation	2019-07-25 16:35:30 -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
milad	77ec048947	added change to the statusIndicator for the same thing	2019-07-16 12:23:32 -07:00
milad	53ec19dd57	removed session display name from nametag	2019-07-16 10:27:56 -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	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
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
Sam Gateau	1a71a63a8b	Merge pull request #15867 from SamGondelman/unlit ... BUGZ-661: Add unlit property to text entities	2019-07-03 18:43:26 +02:00