6494 commits

Author	SHA1	Message	Date
luiscuenca	1054e8fcde	Selfie camera and updated camera menus	2019-09-17 17:15:16 -07:00
luiscuenca	7c7c3cd223	merge master	2019-09-11 14:07:19 -07:00
Shannon Romano	65d0bb1342	Merge pull request #15906 from kasenvr/kpi-v1-modkit-rc ... Kasen Plugin Infrastructure v½ Codename "Modkit Mini"	2019-09-11 13:04:01 -07:00
Zach Fox	50ba55a988	Protect against engine not returning a valid CPU/GPU object	2019-09-10 13:03:40 -07:00
Zach Fox	e52d65a7bc	BUGZ-1451: Update links in controller reference	2019-09-10 11:31:51 -07:00
Zach Fox	eb286d992e	Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound ... Emoji app duplicates sound on opening from toolbar	2019-09-09 11:27:26 -07:00
RebeccaStankus	33b78bea4f	Changed textField module sounds	2019-09-09 10:36:35 -07:00
luiscuenca	3b8d3f987d	Add animation	2019-09-06 14:31:53 -07:00
luiscuenca	0e4e09acb5	Add blending	2019-09-06 14:30:10 -07:00
luiscuenca	189ddf39e2	Merge branch 'master' into addLookAtThirdCamera	2019-09-06 14:29:51 -07:00
dooglifeSF	422ad52a87	Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges	2019-09-06 13:57:33 -07:00
luiscuenca	78eee5961c	Fix key mapping for new camera	2019-09-05 18:05:46 -07:00
dooglifeSF	b5d2675a05	Merge branch 'master' into Sitting_emote_variants	2019-09-05 16:45:24 -07:00
dooglifeSF	5061aca487	Update sitting_emote_raisehand03_all.fbx	2019-09-05 16:44:13 -07:00
dooglifeSF	9cfa4753d9	sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit	2019-09-05 15:31:07 -07:00
humbletim	271fac4bca	Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge	2019-09-05 09:46:21 -04:00
milad	5fdcf0ecaf	updated setting name and changed default value to true for show tray	2019-09-04 12:59:17 -07:00
milad	669fef763a	removed logs	2019-09-03 18:11:56 -07:00
milad	44e518f5a1	working fix	2019-09-03 18:06:25 -07:00
dooglifeSF	6b3dfd6d56	sitting emote raised hand 03 wip	2019-09-03 16:53:36 -07:00
Jamil Akram	a9d8f105ae	Merge pull request #16112 from dooglifeSF/Anim_memory_reduction ... Anim memory reduced ~10mb by removing static channels	2019-09-03 10:08:02 -07:00
Bradley Austin Davis	8e3b337a6e	Merge pull request #16120 from jherico/fix/bugz-1365 ... BUGZ-1365: prevent server scripts from accessing local files in HTML controls	2019-08-30 13:10:09 -07:00
Brad Davis	31340d278a	Add test for local file access	2019-08-29 13:45:43 -07:00
dooglifeSF	974b18b16b	Export one more that used to be hosted. I moved it to the source repo.	2019-08-28 14:16:57 -07:00
dooglifeSF	577a82f750	Export animations, remove static channels. Remove unused joints. Exclude all scene data from fbx.	2019-08-28 10:10:39 -07:00
dooglife@gmail.com	01b912210a	json tuning to minimize the double-blend reduced animation effect, and to address some Joshua feedback	2019-08-23 15:06:31 -07:00
dooglife@gmail.com	e8492beb4a	Merge branch 'master' into tweak_sit_pose	2019-08-23 14:21:09 -07:00
Shannon Romano	86518d222d	Merge pull request #16089 from RebeccaStankus/MuteIssues ... Push To Talk Bugs 1207/1208	2019-08-23 10:42:16 -07:00
dooglife@gmail.com	fed14ac588	Merge branch 'master' into tweak_sit_pose	2019-08-23 09:34:45 -07:00
dooglife@gmail.com	01e98e194a	animation tuning pass	2019-08-22 16:48:41 -07:00
Andy Howell	f5767168ed	Merge pull request #16035 from MiladNazeri/emojiAppAdd ... Using my superpowers to get this in the build.	2019-08-22 16:10:22 -07:00
RebeccaStankus	6e96b800b6	Engine handles turning PTT off if unmuting	2019-08-22 13:22:45 -07:00
Zach Fox	7c4a0545c4	BUGZ-1327: Fix PTT icon when PTTing and clipping	2019-08-22 12:51:34 -07:00
dooglife@gmail.com	75dd4d8da9	json tuning, adding cheer/disbelief anim block-ins, BUG: these are tposing here so do not merge - this is a test	2019-08-22 11:50:22 -07:00
Zach Fox	330b8ceb91	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-22 10:24:00 -07:00
dooglife@gmail.com	ec06a02fdf	Merge branch 'master' of https://github.com/highfidelity/hifi into tweak_sit_pose	2019-08-21 08:46:59 -07:00
Zach Fox	70b3f44f8c	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 14:04:35 -07:00
RebeccaStankus	cc22386f06	CR feedback changes	2019-08-20 13:29:02 -07:00
Zach Fox	780a081d16	Remove unused TabletAddressDialog internal property, fixing BUGZ-1294	2019-08-20 12:05:00 -07:00
Zach Fox	41d992a307	Merge pull request #16078 from zfox23/helpSupport1 ... DEV-412: Implement Support tab in Help app	2019-08-20 11:57:44 -07:00
dooglifeSF	8d05d9e5d4	fix the worst of the mismatched emote poses for the eval mtg	2019-08-20 11:57:20 -07:00
Zach Fox	bb97b4f866	Fix BUGZ-1303: Make 'View All Controls' go to knowledge base	2019-08-20 11:17:05 -07:00
Anthony Thibault	2b74e2a7fa	Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes ... Avatar sitting bug fixes	2019-08-20 11:09:25 -07:00
Zach Fox	0cc28c58ae	DEV-415: Implement Support tab in Help app	2019-08-20 10:54:58 -07:00
dooglifeSF	8a3b93b913	add 3 sits with different hand placements for eval - also 2 new sit emotes	2019-08-20 10:35:56 -07:00
RebeccaStankus	e48e733343	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 09:01:18 -07:00
Zach Fox	78edfb9af9	Remove 'About' tab from Settings	2019-08-19 17:22:38 -07:00
Zach Fox	b40d5658e3	Moved a timer from JS to QML; progress circle on Emote Indicator	2019-08-19 15:12:48 -07:00
Jamil Akram	a3919af747	Merge pull request #16062 from dooglifeSF/animation_json_tuning ... Tuning pass on anim-graph, using the new blend modes and engine features	2019-08-19 14:02:37 -07:00
Zach Fox	14a04dfb1a	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-19 13:52:35 -07:00