21804 commits

Author	SHA1	Message	Date
Sam Gateau	a7fd35747d	Merge pull request #13896 from AndrewMeadows/workload-feedback ... Filter timings used in feedback logic for workload region sizes	2018-08-30 19:11:49 -07:00
Anthony Thibault	78d7c321b8	Merge pull request #13796 from amantley/noNeckFix ... Avatar without Neck Joint bug 14620	2018-08-30 14:52:44 -07:00
John Conklin II	8fa4a2855e	Merge pull request #13641 from amantley/rotateFilterChange ... Hand Azimuth Controls Shoulder Rotation	2018-08-30 13:59:00 -07:00
David Back	cee270780b	Merge pull request #13908 from dback2/androidCrashStateVariables ... Fix Android StateController assert	2018-08-30 13:37:13 -07:00
John Conklin II	f5ebdfa233	Merge pull request #13905 from zfox23/fixPr13870 ... Fixup PR13870: Make the feature work in Master	2018-08-30 11:08:23 -07:00
John Conklin II	bf0ab865bb	Merge pull request #13903 from birarda/bug/av-entity-delete-master ... send MyAvatar avatar entity updates through entity tree	2018-08-30 10:25:31 -07:00
David Back	8b1fcfcce9	fix double windows platform	2018-08-30 10:16:27 -07:00
Sam Gateau	12ec56875e	Merge pull request #13867 from SamGondelman/recurse ... findRayIntersection/findParabolaIntersection performance improvements	2018-08-30 09:49:16 -07:00
Zach Fox	b8cd5dd8b9	Fixup PR13870: Make the feature work in Master	2018-08-29 16:58:19 -07:00
Sam Gondelman	cfffa65819	Merge pull request #13899 from SamGondelman/pointerPerf ... Improve Pointer performance	2018-08-29 16:57:43 -07:00
Stephen Birarda	aaf5f593c5	send MyAvatar avatar entity updates through entity tree	2018-08-29 16:30:24 -07:00
Angus Antley	9fb0f8b7c0	added condition to prevent overwriting tracker input with estimated orientation for spine2 joint	2018-08-30 00:25:53 +01:00
SamGondelman	cda8b82ead	improve pointer performance	2018-08-29 13:32:53 -07:00
Angus Antley	f7d0cdda02	added a check for whether the head to shoulder azimuth is greater than 100 degrees. If so unflip the chest azimuth	2018-08-29 20:44:21 +01:00
David Back	96d2ba660c	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-29 12:05:51 -07:00
Andrew Meadows	f9d14e1351	filter time-cost drivers for region regulation	2018-08-29 11:17:59 -07:00
John Conklin II	4ab45e70a4	Merge pull request #13887 from sethalves/fix-pick-reg-point-1 ... fix far-grab laser-lock on entities with non-default registration point	2018-08-29 10:42:03 -07:00
Angus Antley	ee33f5dc97	normalize the hip hand vector in getSpine2RotationRigSpace, made computeHandAzimuth a const function that returns a vec2	2018-08-29 01:57:49 +01:00
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -07:00
Sam Gondelman	89bd24dd54	Merge pull request #13880 from SamGondelman/matCrash ... Fix crash on shutdown in domain with material	2018-08-28 11:48:35 -07:00
amantley	3c792a04c1	fixed roll rotation added to azimuth in MySkeletonModel.cpp	2018-08-28 11:25:42 -07:00
Sam Gateau	d9d23e7fcf	Merge pull request #13877 from luiscuenca/multiplyOtherAvatars ... Create N replicas of each other-avatar on the client side	2018-08-28 09:02:13 -07:00
amantley	89b508251e	added some comment to explain rig to avatar transform	2018-08-27 17:57:50 -07:00
Seth Alves	52bbb4d2ab	fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.	2018-08-27 16:21:01 -07:00
SamGondelman	aae06e8f49	faster aabox ray intersection and pre-computed inverse direction	2018-08-27 15:40:33 -07:00
David Back	b6edb2c9d6	platform states, edit controller mapping, separate mac/win delete	2018-08-27 14:53:13 -07:00
amantley	055f03878e	made changes to add roll to the spine2 rotation. also only the shoulders control the rotation recenter now	2018-08-27 14:44:27 -07:00
amantley	dd8a00983c	Merge remote-tracking branch 'upstream/master' into rotateFilterChange	2018-08-24 16:29:20 -07:00
amantley	2bec867863	added the sanity check to see if the shoulders have flipped	2018-08-24 16:29:08 -07:00
SamGondelman	98d145dc24	fix crash on shutdown in domain with material	2018-08-24 15:19:48 -07:00
SamGondelman	70f4d0c634	Merge remote-tracking branch 'upstream/master' into perf	2018-08-24 14:04:37 -07:00
John Conklin II	477fba4b15	Merge pull request #13847 from AndrewMeadows/workload-avatars-002 ... workload tracks other avatars and adds/removes from physics simulation accordingly	2018-08-24 12:43:51 -07:00
luiscuenca	ddbadf5a69	change to Test API	2018-08-24 11:59:46 -07:00
SamGondelman	3d048c77ba	Merge remote-tracking branch 'upstream/master' into recurse	2018-08-24 11:39:05 -07:00
amantley	a60ab863a3	demo version of the head and hands determining the rotate function	2018-08-24 11:06:36 -07:00
Angus Antley	25610c7587	got the hands turning the shoulders, needs error checking	2018-08-24 11:04:36 +01:00
Angus Antley	44a6c7df5f	added hook to myskeleton model to update spine2, need to get the rotation from myavatar then we have spine rot	2018-08-24 07:17:17 +01:00
amantley	0e0561bb24	latest rotate code	2018-08-23 17:59:18 -07:00
SamGondelman	b5b7167644	add to stats	2018-08-23 17:56:24 -07:00
Andrew Meadows	10d0833c19	use DynamicsWorld::numCollisionObjects instead of our own count	2018-08-23 15:57:54 -07:00
Zach Fox	dddb2141f0	Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 15:45:29 -07:00
Zach Fox	a1d88a8588	Merge howard/wallet-locker2 into my branch	2018-08-23 14:45:16 -07:00
Andrew Meadows	abf4a926d8	cleanup	2018-08-23 12:59:28 -07:00
Andrew Meadows	8f2141b592	fix compile error	2018-08-23 12:59:28 -07:00
Andrew Meadows	777b90bdc0	add 'physics body count' to debug stats	2018-08-23 12:59:28 -07:00
Andrew Meadows	f5cae61b43	fix typo causing compile failure	2018-08-23 12:59:28 -07:00
Andrew Meadows	87223946ad	add/remove avatars according to workload region	2018-08-23 12:59:28 -07:00
Andrew Meadows	3ecabb6583	cleanup after removing spaghetti	2018-08-23 12:59:28 -07:00
Andrew Meadows	99aafb1f95	move code from Avatar to OtherAvatar	2018-08-23 12:59:28 -07:00
Andrew Meadows	615b8addd0	fix order of includes	2018-08-23 12:59:28 -07:00