6441 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	35a2cb7f27	BUGZ-1295: Fix typo in Help > Controls > Turn Right	2019-08-19 13:08:42 -07:00
Zach Fox	42705c2fea	Combine conditional statements	2019-08-19 11:04:54 -07:00
Zach Fox	2b86947d4a	Mipmap images; better padding	2019-08-19 10:32:08 -07:00
Zach Fox	3de9f44bf3	It's working	2019-08-16 16:00:30 -07:00
Zach Fox	4c006c50aa	Controls almost done	2019-08-16 15:53:30 -07:00
Zach Fox	a053f9ed9e	Impelement settingChanged; clean up some emoteIndicatorVisible code	2019-08-15 17:00:27 -07:00
Zach Fox	0338b0258c	Add Search to Emoji window and clean up some code	2019-08-15 12:21:29 -07:00
Zach Fox	143c3e966c	Big optimizations to Emoji window	2019-08-15 10:58:13 -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
Shannon Romano	1011880698	Merge pull request #16049 from sabrina-shanman/ourLODEInvestigation ... (BUGZ-1112) Make 20:20 vision equal seeing 1m cube from 400 meters away	2019-08-09 17:28:46 -07:00
Zach Fox	66199297cb	button	2019-08-09 12:24:37 -07:00
Zach Fox	dc2e08ef6b	Initial integration of browser	2019-08-09 12:05:03 -07:00
sabrina-shanman	49f1ecb1bf	Fix new bugs in TabletLODTools.qml	2019-08-09 11:41:11 -07:00
Anthony J. Thibault	733d7455f4	new seated talking anim	2019-08-09 08:52:38 -07:00
Anthony J. Thibault	b4869508a0	updated clap	2019-08-08 14:47:31 -07:00
sabrina-shanman	8347d9d23e	Update LODManager setter in TabletLODTools.qml	2019-08-08 13:59:50 -07:00
Anthony J. Thibault	ef81ccafed	Hooked up seated clap	2019-08-08 13:02:19 -07:00
Anthony J. Thibault	5d405cac3b	Merge branch 'master' into feature/reaction-intro-loop-outro	2019-08-08 09:56:45 -07:00
Anthony J. Thibault	317c2f5219	sitting raise hand	2019-08-08 09:37:03 -07:00
Anthony J. Thibault	e5e012a83e	agree, point and disagree sitting emotes	2019-08-07 14:15:29 -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
Anthony J. Thibault	147753309f	Updated clap02 with new version that is not as slow.	2019-08-06 17:57:27 -07:00
Anthony J. Thibault	3f6b488f27	Added intro-loop-outro phases for raiseHand, applaud and point	2019-08-06 17:39:30 -07:00
sabrina-shanman	bc3acfa3c0	Clean up and re-name to reflect what uses octreeSizeScale and what uses ... visibilityDistance	2019-08-06 15:46:10 -07:00
milad	75708170dd	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-06 13:23:32 -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
Zach Fox	8b85bbfe67	Merge pull request #16034 from zfox23/masterGPU ... BUGZ-1103: Use 'Master GPU' information in About screen	2019-08-06 12:31:54 -07:00
Zach Fox	2a4c0a3ecd	BUGZ-1103: Use 'Master GPU' information in About screen	2019-08-06 14:13:31 -04:00
milad	77023b281b	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-06 09:27:49 -07:00
Anthony J. Thibault	704a2d2ac9	Merge branch 'master' into feature/reaction-fixes	2019-08-05 09:43:32 -07:00
Anthony J. Thibault	649ef6c721	Added sitting idle variation and removed rejected emote variations.	2019-08-05 09:42:01 -07:00
milad	d1efbc051a	working UI	2019-08-04 15:11:55 -07:00
Anthony J. Thibault	31762a0c80	Bug fixes in seated reactions	2019-08-02 10:17:59 -07:00
Anthony J. Thibault	c8e4536bba	Hooked up variations of seated while talking and stubs for reactions while seated.	2019-08-02 10:11:38 -07:00
Anthony J. Thibault	f843c01b35	added missing seated idle pose	2019-08-01 13:09:02 -07:00
Anthony J. Thibault	a2e37b7275	talking/reactions while seated, work in progress check in	2019-08-01 13:05:15 -07:00
Seth Alves	d8b940cc96	add control to enable/disable acoustic echo cancellation to simplified UI	2019-07-30 14:09:34 -07:00
Seth Alves	8ec4505b95	add an on/off control for audio echo cancelation to Audio Settings page. It's not yet hooked to anything.	2019-07-30 14:09:32 -07:00
Anthony J. Thibault	ee4bb233b9	Bug fix for head nod not going back to idle.	2019-07-30 12:56:43 -07:00
MiladNazeri	b81d0ecce3	Merge pull request #16002 from MiladNazeri/addNewTextSizeAPI ... [BUGZ-972] :: changed root to micBar which had the gated property	2019-07-30 09:59:40 -07:00
Anthony J. Thibault	4f5d0d1c0f	Updated a negative reaction animation.	2019-07-29 16:49:16 -07:00
Anthony J. Thibault	6f3bb749e2	Added new applaud, point and raisehand reactions.	2019-07-29 16:17:50 -07:00
Shannon Romano	f29284198c	Merge pull request #15978 from roxanneskelly/bugz829 ... BUGZ-829 DEV-168 - domain backup/content management improvements	2019-07-29 15:28:49 -07:00
Anthony J. Thibault	e205d90df6	Hooked up random positive & negative emote animations.	2019-07-29 15:01:10 -07:00
milad	2ea8b9efa4	changed root to micBar which had the gated property	2019-07-29 14:05:55 -07:00
Anthony J. Thibault	6e6440232c	Updated avatar-animation.json from animedit tool	2019-07-29 10:49:34 -07:00