30257 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
Shannon Romano	3db915c432	Merge pull request #16275 from dooglifeSF/sit_variants_and_fidgets ... Sit variants and fidgets	2019-10-07 09:14:38 -07:00
Shannon Romano	f797f714bd	Merge pull request #16298 from luiscuenca/addisSeatedAPImethod ... DEV-2011: Add MyAvatar::isSeated API method	2019-10-04 15:06:46 -07:00
luiscuenca	07080f0138	Clarify jdocs	2019-10-04 13:47:20 -07:00
luiscuenca	3a9c829c95	Add MyAvatar::isSeated API method	2019-10-04 11:07:49 -07:00
dooglifeSF	37afabe866	Merge branch 'master' into sit_variants_and_fidgets	2019-10-04 10:29:15 -07:00
RebeccaStankus	2f2b7b0306	Ready for CR Thank you Zach	2019-10-03 17:30:47 -07:00
luiscuenca	e0d0ec5852	Fix isInAir so takes into account the new seated state:	2019-10-03 10:36:23 -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
luiscuenca	75f0b4ea54	Fix First Person Camera issues	2019-10-02 14:17:57 -07:00
luiscuenca	059bcc10cc	merge master	2019-10-02 13:24:32 -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
luiscuenca	521aa50356	Set time and angle recentering parameters	2019-10-02 11:43:06 -07:00
Zach Fox	50b06a40d7	Improved random avatar selection logic, plus local avatars	2019-10-01 17:22:24 -07:00
amer cerkic	c0a852d68c	updated audio wording and removed audio defaul spamming.	2019-10-01 16:55:37 -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
luiscuenca	18af7c5d84	Add recenter timer and temp API	2019-10-01 13:44:27 -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
Maia Hansen	220123ff3b	Merge pull request #16254 from kencooke/macos-appnap-disabler ... BUGZ-1117: On Mac OS, disable App Nap to prevent audio glitches	2019-10-01 10:53:03 -07:00
luiscuenca	d4a74f798c	aimToBlendValues to static function	2019-10-01 10:15:16 -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	c2690eb39d	Merge pull request #16268 from luiscuenca/limitRotationWhileSeated ... DEV-2125: Rotation while seated do not trigger re-centering	2019-10-01 09:33:02 -07:00
luiscuenca	7c55cee1f0	Limit rotation while seated to not trigger recentering	2019-09-30 17:37:14 -07:00
luiscuenca	0fac1e134f	Allow avatar look at when in first person camera	2019-09-30 16:43:02 -07:00
Shannon Romano	e8f1eecc5b	Merge pull request #16258 from samcake/yellow ... DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches	2019-09-30 16:36:24 -07:00
Ken Cooke	de5da65757	Use NSActivityUserInitiated instead of NSActivityBackground	2019-09-30 15:48:01 -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
Shannon Romano	95b219475d	Merge pull request #16260 from jherico/warnings ... BUGZ-1596: Cleaning up android build warnings	2019-09-30 11:58:21 -07:00
luiscuenca	02d889ba6e	account for point target validity	2019-09-30 11:35:00 -07:00
RebeccaStankus	68f52584cf	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-09-30 09:19:15 -07:00
Sam Gateau	c8663f7fe6	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-30 09:18:23 -07:00
David Rowe	cd6d9b57c4	Fix Blocks script displaying a blank page	2019-09-28 11:30:56 +12:00
Sam Gateau	25bcc31b72	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-27 09:24:25 -07:00
Brad Davis	403499bf32	Cleaning up android build warnings	2019-09-27 09:19:52 -07: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
Sam Gateau	24cc302a8b	second pass of cleaning on the code to make it ready for merge	2019-09-26 16:56:00 -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
Sam Gateau	9d999baab2	FIrst pass to clean up before pushing a pr:	2019-09-26 11:59:01 -07:00
Ken Cooke	6e54ff30bd	Bugfix	2019-09-26 11:36:23 -07:00
Ken Cooke	3f686be7ab	Add all Objective-C sources in CMakeLists.txt	2019-09-26 10:50:00 -07:00