2297 commits

Author	SHA1	Message	Date
luiscuenca	e8da6b5a0c	add getFlowData	2019-03-08 10:36:58 -07:00
David Rowe	0b7cddb886	Fill in and tidy MyAvatar JSDoc	2019-03-08 13:49:10 +13:00
John Conklin II	9a4b95faa2	Merge pull request #15111 from luiscuenca/flowDataOnFst ... Load flow bone data from FST file	2019-03-07 12:48:36 -08:00
SamGondelman	380df059ff	fix shapes app	2019-03-06 18:18:39 -08:00
luiscuenca	dfb434ea09	Fix warning and refactoring	2019-03-06 09:25:49 -07:00
luiscuenca	76609197e2	Read flow data from the fst file	2019-03-05 18:50:53 -07:00
David Rowe	d73ff2e855	Revise current MyAvatar API JSDoc	2019-02-28 10:40:10 +13:00
r3tk0n	42b62ff2d5	Fix Ubuntu compiler warnings.	2019-02-26 19:16:34 -08:00
r3tk0n	a093fe5c4f	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-26 15:08:57 -08:00
r3tk0n	030211aea8	Fix OSX compiler error, init list in wrong order after merge.	2019-02-26 14:46:04 -08:00
r3tk0n	5d3a778b0b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation	2019-02-25 13:10:47 -08:00
SamGondelman	e102ad073e	allow flying in HMD if you would otherwise fall forever	2019-02-25 11:49:38 -08:00
Anthony Thibault	8785f733db	Merge pull request #14817 from amantley/animSplineIK ... AnimSplineIK node added to inverse kinematics	2019-02-21 17:13:41 -08:00
Anthony Thibault	e54754c4ce	Merge pull request #14926 from luiscuenca/flowCpp ... Cpp implementation of the Flow script	2019-02-21 17:10:05 -08:00
amantley	6323f49f26	changed the define variable to HIFI_USE_OPTIMIZED_IK	2019-02-21 14:36:05 -08:00
r3tk0n	a3c4747290	Add leveled controller-relative movement option.	2019-02-21 11:17:31 -08:00
amantley	afed0b5442	review changes	2019-02-21 11:08:29 -08:00
amantley	27bfe2f0fe	changed name of pre processor variable	2019-02-20 15:14:12 -08:00
luiscuenca	04e57d0dd1	No Rig pointer on Flow class, solve network animations and fixed bug	2019-02-19 17:45:46 -07:00
r3tk0n	ebbf48a11b	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-02-19 12:02:50 -08:00
amantley	d78f253d24	code to generate pole vector from theta	2019-02-15 17:43:53 -08:00
amantley	36093926d0	added fake android defines for running the new ik on pc	2019-02-15 15:00:39 -08:00
amantley	0fcaa695ba	Merge remote-tracking branch 'upstream/master' into animArmIK	2019-02-15 10:35:33 -08:00
amantley	d6dfaacf6f	adding ifdef for android os	2019-02-15 10:35:25 -08:00
luiscuenca	c966f71cb1	More fixes	2019-02-15 10:17:37 -07:00
luiscuenca	98c321c718	Fix warnings	2019-02-15 09:40:49 -07:00
luiscuenca	624a53449f	Merge branch 'master' into flowCpp ... # Solved Conflicts: # interface/src/avatar/MyAvatar.cpp	2019-02-14 18:55:43 -07:00
luiscuenca	3e66bce112	set useFlow function	2019-02-14 18:30:37 -07:00
Anthony Thibault	a3407b96b0	Merge branch 'master' into bug-fix/revert-anim-pose-optimization	2019-02-14 16:56:17 -08:00
Anthony Thibault	39b4eaac34	Revert "AnimPose operator* optimizations" ... This reverts commit 569bef50fd.	2019-02-14 16:13:00 -08:00
Andrew Meadows	ed8481ead9	fix grab bugs	2019-02-12 14:04:56 -08:00
luiscuenca	954cac907d	Other avatars after update and mod timer when active	2019-02-12 15:02:56 -07:00
r3tk0n	bdafb99402	Remove unused variable and function to address warnings in Mac and Linux builds.	2019-02-11 14:19:15 -08:00
Anthony Thibault	d012d07519	Merge pull request #14865 from hyperlogic/feature/anim-optimizations ... Animation System Optimizations	2019-02-08 12:44:10 -08:00
Jeff Clinton	54109deab9	Merge pull request #14825 from SamGondelman/fall ... Case 20829: Always fall when flying is not allowed	2019-02-07 14:39:46 -08:00
Shannon Romano	30a6f25b69	Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor ... case 20048: don't allow MyAvatar to move until physics enabled	2019-02-06 11:52:42 -08:00
Anthony Thibault	569bef50fd	AnimPose operator* optimizations	2019-02-05 14:48:05 -08:00
Andrew Meadows	cbd83f972c	remove unsued variable	2019-02-05 10:17:10 -08:00
Andrew Meadows	e50892b3d2	MyAvatar is unmovable until physics is enabled	2019-02-05 09:00:48 -08:00
SamGondelman	2d0c1184e4	only domain zone entities control flying and ghosting	2019-01-30 18:27:17 -08:00
r3tk0n	7e9d35a0fb	Add individual speed settings per control mode.	2019-01-30 15:06:35 -08:00
Seth Alves	30d9fe705e	avoid possible crash	2019-01-30 14:56:50 -08:00
Seth Alves	c6f44234f8	avoid possible crash	2019-01-30 14:56:02 -08:00
Seth Alves	3ab2db96b6	deactivate grab action when grab is released	2019-01-30 14:43:11 -08:00
Seth Alves	0846eb8ec6	attempt to allow position edits in releaseGrab entity-method	2019-01-30 14:43:11 -08:00
r3tk0n	e1cbb187cd	Clean up comments in MyAvatar.cpp	2019-01-29 16:12:49 -08:00
r3tk0n	d4cf1de4dd	Fix default locomotion scaling.	2019-01-29 12:02:02 -08:00
luiscuenca	a6dce5dd84	Merge branch 'master' into multiSphereAvatar04	2019-01-28 17:48:22 -07:00
Shannon Romano	607ce00713	Merge pull request #14766 from AndrewMeadows/grab-it ... case 20701: fixes for grab	2019-01-28 15:57:36 -08:00
r3tk0n	0f45781779	Remove extra qualifier from function signature in MyAvatar.h	2019-01-28 15:52:18 -08:00
r3tk0n	0429280148	Default vs Analog implemented.	2019-01-28 14:06:32 -08:00
luiscuenca	cc73649ef8	Merge branch 'master' into multiSphereAvatar04	2019-01-28 11:57:04 -07:00
r3tk0n	6552d8d9ee	Add settings for control scheme.	2019-01-28 10:40:31 -08:00
Jamil Akram	bcaad3092b	Merge pull request #14695 from amantley/trumpFix ... Fixed Sinking Trump Avatar Bug: Stops unnecessary vertical re-centering with big-headed avatar	2019-01-28 10:12:55 -08:00
Shannon Romano	a2b2f3f67c	Merge pull request #14742 from hyperlogic/bug-fix/user-recenter-model-pref ... Settings > Controls > User Recenter Model now saves properly	2019-01-25 17:34:33 -08:00
Shannon Romano	f084021fdf	Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type ... Added HMD Avatar Alignment Type	2019-01-25 17:32:41 -08:00
amantley	91fddf783f	increased the threshold to stop vertical recentering	2019-01-25 16:09:45 -08:00
r3tk0n	338d4c3c18	Lay groundwork for control scheme selection.	2019-01-25 15:14:17 -08:00
amantley	cc4d9e2ae2	Merge remote-tracking branch 'upstream/master' into trumpFix	2019-01-25 15:05:00 -08:00
r3tk0n	9ea476ea89	Attempt to add acceleration curve.	2019-01-25 14:27:54 -08:00
luiscuenca	f54f9e5bfd	Merge branch 'master' into multiSphereAvatar04	2019-01-25 13:54:01 -07:00
luiscuenca	df4be641eb	More fixes	2019-01-25 13:42:18 -07:00
Shannon Romano	28edb472fc	Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale ... 20565 Avatar::_collideWithOtherAvatars does not scale	2019-01-25 11:06:36 -08:00
Andrew Meadows	09fe9735fa	plug grab leak, more correct names	2019-01-24 14:57:54 -08:00
Andrew Meadows	ee3fde9df1	unravel spaghetti, prefer std over Qt containers	2019-01-24 14:39:00 -08:00
r3tk0n	a1c24516c2	Fix strafing with controller-relative movement (was wrong local axis for controller).	2019-01-24 14:38:31 -08:00
Anthony Thibault	a7a71e4286	Merge branch 'master' into feature/hmd-avatar-alignment-type	2019-01-23 15:52:20 -08:00
r3tk0n	1e10afe762	Add function for calculating direction in MyAvatar.	2019-01-22 14:14:54 -08:00
Jeff Clinton	3776472550	Merge pull request #14731 from AndrewMeadows/fix-mexico-hats ... cases 20709 and 20715: wear and see mexico hats	2019-01-22 12:58:56 -08:00
r3tk0n	4fa8454216	Add condition for HMD mode to hand-relative code block.	2019-01-21 13:25:06 -08:00
Anthony Thibault	205e375d36	Settings > Controls > User Recenter Model now saves properly	2019-01-18 16:58:26 -08:00
raveenajain	d2e37d0c90	my and other avater changes, if setting toggled can pass through other avatar	2019-01-18 16:50:44 -08:00
Andrew Meadows	9a854291af	supress spurious not important AvatarEntity updates	2019-01-18 15:36:38 -08:00
r3tk0n	79ff0a5b65	Basic controller-relative (non-leveled) locomotion working.	2019-01-18 14:35:26 -08:00
Antonina Savinova	8c4c488676	Merge pull request #14721 from Atlante45/feat/upstream-limitter ... Limit upstream bandwidth to the Avatar Mixer	2019-01-18 13:32:03 -08:00
r3tk0n	0c20107203	Add Controller menu items for hand/head-relative movement.	2019-01-18 12:46:19 -08:00
luiscuenca	43244193e8	Mesh picking against default pose with transformed ray	2019-01-18 12:46:18 -07:00
Andrew Meadows	74f9a415d3	move _cauterizationNeedsUpdate back to MyAvatar	2019-01-17 13:58:34 -08:00
Seth Alves	4fbc257be0	don't cauterize head-children when they are grabbed	2019-01-17 13:34:36 -08:00
Adam Smith	f955313afc	Merge pull request #14687 from SamGondelman/cancel ... Case 20580: Trying to fix wearables and avatar app	2019-01-17 11:25:30 -08:00
SamGondelman	9727c8fd38	CR	2019-01-16 14:14:01 -08:00
luiscuenca	67cc5bd7f2	Fix warnings and wrong shapes position for myAvatar	2019-01-16 10:52:34 -07:00
Seth Alves	fd09180776	Merge pull request #14645 from ctrlaltdavid/M19774-d ... Make mouselook directly proportional to right-click mouse	2019-01-16 09:09:38 -08:00
luiscuenca	a7f143dbce	Merge branch 'master' into multiSphereAvatar04 ... # Resolved Conflicts: # interface/src/avatar/MyAvatar.h # interface/src/avatar/OtherAvatar.cpp	2019-01-15 18:27:04 -07:00
luiscuenca	71e7023a3e	Refactor and optimizations	2019-01-15 18:07:50 -07:00
Clement	8480624797	Limit upstream data to avatar mixer	2019-01-15 14:18:53 -08:00
SamGondelman	68e15c6c07	fixes from 78	2019-01-14 13:36:21 -08:00
luiscuenca	19701ef333	Fix scale and add rayTest	2019-01-11 15:36:07 -07:00
amantley	8cba72743e	changed the value for the top threshold that triggers a vertical reset, this stops unwanted recentering	2019-01-11 08:46:20 -08:00
Andrew Meadows	9ea6968e35	fix bug where attached AvatarEntities do not update in timely fashion	2019-01-09 17:40:18 -08:00
Andrew Meadows	8206daf1a6	send update when loading AvatarEntity from Settings	2019-01-09 17:28:00 -08:00
Andrew Meadows	e2d6e6f3dc	more correct AvatarEntityData settings when switching domains	2019-01-09 17:28:00 -08:00
Andrew Meadows	27318a3f17	update AvatarEntitData blobs before writing to JSON during recordings	2019-01-09 17:28:00 -08:00
Andrew Meadows	c998ddbb9e	ScriptableAvatar::setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	63ed0a3a98	move blob conversion recipes to EntityItemProperties	2019-01-09 17:28:00 -08:00
Andrew Meadows	855497e604	MyAvatar.updateAvatarEntity(id, data) works in theory	2019-01-09 17:28:00 -08:00
Andrew Meadows	a4be4fb6c0	MyAvatar.setAvatarEntityData() works	2019-01-09 17:28:00 -08:00
Andrew Meadows	329ec84104	MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings	2019-01-09 17:28:00 -08:00
Andrew Meadows	cbcd70aee6	namechanges and comments to help clarify necessary fixes	2019-01-09 17:28:00 -08:00
Andrew Meadows	9f404ef006	Agent bots can manipulate AvatarEntities again	2019-01-09 17:28:00 -08:00