6558 commits

Author	SHA1	Message	Date
Zach Fox	a23bee19e8	Controls screen done	2019-10-07 19:52:22 -04:00
Zach Fox	643dd21f86	Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration	2019-10-07 13:22:08 -04:00
RebeccaStankus	2f2b7b0306	Ready for CR Thank you Zach	2019-10-03 17:30:47 -07:00
Zach Fox	b23aecf6c5	Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction	2019-10-03 10:12:58 -07:00
Zach Fox	33b8942ffd	Changes to Avatar/Profile App complete	2019-10-03 09:41:30 -07:00
dooglifeSF	ebd0b06475	animation revisions after checking them in a standup group	2019-10-02 17:18:36 -07:00
RebeccaStankus	47841d9bcd	Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction	2019-10-02 12:42:53 -07:00
RebeccaStankus	dc15b55aa5	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-02 12:05:34 -07:00
Zach Fox	50b06a40d7	Improved random avatar selection logic, plus local avatars	2019-10-01 17:22:24 -07:00
dooglifeSF	86e67afe34	Merge branch 'master' into sit_variants_and_fidgets	2019-10-01 16:52:17 -07:00
dooglifeSF	0ab4075c3b	sit idles and idle fidgets with json edits	2019-10-01 16:51:10 -07:00
RebeccaStankus	d2e62749c7	Ready for Zach to add default avatar changes	2019-10-01 16:36:06 -07:00
luiscuenca	09f0222285	Restore previous control keys for free camera	2019-10-01 14:18:46 -07:00
Shannon Romano	38574cd66b	Merge pull request #16245 from luiscuenca/implementPointAt ... DEV-442: Implement directional blending node for point reaction	2019-10-01 11:46:30 -07:00
RebeccaStankus	3167dc9a35	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-01 09:59:14 -07:00
RebeccaStankus	0dfb234089	Finished UI, ready for CR	2019-10-01 09:58:44 -07:00
Anthony Thibault	7ee5b8e229	Merge pull request #16252 from dooglifeSF/emotes_revisions_per_feedback ... Emotes revisions per feedback	2019-09-30 15:46:50 -07:00
dooglifeSF	5cfa1cb5ba	Merge branch 'master' of https://github.com/highfidelity/hifi into sit_variants_and_fidgets	2019-09-30 09:38:45 -07:00
RebeccaStankus	68f52584cf	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-09-30 09:19:15 -07:00
David Rowe	cd6d9b57c4	Fix Blocks script displaying a blank page	2019-09-28 11:30:56 +12:00
RebeccaStankus	de4e8b9cc4	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-09-27 09:16:26 -07:00
RebeccaStankus	f4ecd3dcd8	Working on initial/second launch	2019-09-27 09:15:39 -07:00
luiscuenca	ea23a82f33	Make mouse pitch less sensitive	2019-09-26 15:14:47 -07:00
luiscuenca	1b064a0ebe	Fix Q key on first person cam. Let camera control flying Y axis	2019-09-26 14:29:01 -07:00
dooglifeSF	0fa7220750	tilt head down slightly to minimize crazy eyes	2019-09-25 15:27:11 -07:00
dooglifeSF	a8fa3a136c	emote revisions, json tuning	2019-09-25 14:47:07 -07:00
luiscuenca	0aab2ed07f	Disable head look at when pointing	2019-09-25 12:37:24 -07:00
milad	aba6a28d54	updated camera modes	2019-09-25 11:05:32 -07:00
milad	39d96b76a6	fixed help text	2019-09-25 08:41:38 -07:00
luiscuenca	7c4fe39918	Add point directional blending node to animation json	2019-09-24 18:24:27 -07:00
luiscuenca	ad79393e1f	Implement point at directional blend and API	2019-09-24 17:55:38 -07:00
milad	677dbe59cc	fixed qml typo	2019-09-24 16:47:07 -07:00
milad	edb135776a	Added selfie view and updated help	2019-09-24 16:44:34 -07:00
Shannon Romano	73c558bc51	Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle ... Transition between walk/emote should be faster	2019-09-24 15:49:31 -07:00
RebeccaStankus	982bdf5c98	Prereq work for 'Reduce User Friction'	2019-09-23 16:49:16 -07:00
dooglifeSF	7307bea16f	speed up interpolation of point, rework point animation, add transitions for emotes to idle from settle	2019-09-23 16:45:35 -07:00
dante ruiz	b478a22ed2	fix edge case	2019-09-20 15:25:10 -07:00
Shannon Romano	bd488f0196	Merge pull request #16144 from luiscuenca/addLookAtThirdCamera ... DEV-391: Keyboard Input Controls Camera Not Avatar Orientation	2019-09-20 13:03:03 -07:00
Anthony Thibault	fecef584c9	Merge pull request #16226 from danteruiz/fix-snap-html-issue ... BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page	2019-09-20 12:39:01 -07:00
dante ruiz	fe2a4c3600	fix fix-snap-html-issue	2019-09-19 18:20:08 -07:00
Zach Fox	97ef2c030e	Merge pull request #16223 from zfox23/simplifiedGoToIteration ... Whoops! New placeholder text color	2019-09-19 16:40:48 -04:00
Zach Fox	10352f1cb2	New placeholder text color	2019-09-19 13:38:37 -07:00
luiscuenca	279e25ca70	Merge master	2019-09-19 13:21:49 -07:00
Zach Fox	a472e723e2	Merge pull request #16222 from zfox23/simplifiedGoToIteration ... BUGZ-1529: Iteration on JumpTo Field visuals/interaction states	2019-09-19 16:13:21 -04:00
Zach Fox	5077089518	BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap	2019-09-19 11:15:53 -07:00
luiscuenca	6d98537a20	Clean up code and refactor avatar-animation.json	2019-09-19 10:45:20 -07:00
Zach Fox	5e96ce8822	DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR	2019-09-19 09:48:11 -07:00
luiscuenca	fc223e4cb6	Reverse the up/down arrow keys if in selfie mode	2019-09-18 17:15:25 -07:00
luiscuenca	7bc8e6b237	Solved some sitting and sound issues while looking at	2019-09-18 17:00:10 -07:00
Shannon Romano	e7001c3f1b	Merge pull request #16157 from sethalves/vive-pro-groundwork ... DEV-605: Vive pro groundwork	2019-09-18 16:36:12 -07:00