26462 commits

Author	SHA1	Message	Date
Sam Gateau	7dfdc79644	Picking pid values	2018-08-28 12:21:15 -07:00
Sam Gateau	7b399d9a04	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-28 09:20:13 -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
Sam Gateau	63eb57c741	Exploring PID again	2018-08-28 08:58:25 -07:00
Sam Gateau	a6f7135ad8	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-27 10:54:23 -07:00
Sam Gateau	d97d655148	USing a simpler halfTan test for culling	2018-08-26 23:17:29 -07:00
Sam Gateau	294fe51fde	Trying to simplify the LOD culling test	2018-08-24 16:48:23 -07:00
Sam Gateau	8f8bcc1901	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-24 15:23:37 -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
Sam Gateau	699240027e	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2018-08-23 19:29:14 -07:00
Sam Gateau	cee9b90930	working on the LOD behavior	2018-08-23 16:48:42 -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
Andrew Meadows	598a227f1a	use OtherAvatar instead of Avatar in AvatarMotionState	2018-08-23 12:59:28 -07:00
Andrew Meadows	3c01433e12	stub for avatars changing workload regions	2018-08-23 12:59:28 -07:00
Andrew Meadows	21adbf49c0	remove cruft	2018-08-23 12:59:28 -07:00
Andrew Meadows	15665b25e8	give OtherAvatars a proxy in workload	2018-08-23 12:59:28 -07:00
Sam Gateau	b725ed440b	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-23 11:40:10 -07:00
Sam Gateau	473f8d0ca5	Working on the LOD system	2018-08-23 11:39:47 -07:00
John Conklin II	1320a34a18	Merge pull request #13841 from luiscuenca/noAttachmentsToJSON ... Don't include old attachment data on new avatar recordings	2018-08-23 10:51:33 -07:00
John Conklin II	5dd64645eb	Merge pull request #13861 from SimonWalton-HiFi/safe-landing-fixes ... Fix safe-landing protocol for sparse domains	2018-08-23 10:17:08 -07:00
Wayne Chen	4daa30c1d0	changing text for check preference	2018-08-22 15:58:37 -07:00
Wayne Chen	9518b8cdaf	rearrangement	2018-08-22 15:46:02 -07:00
Wayne Chen	c32cc1ead2	adding implementation	2018-08-22 15:42:15 -07:00
Simon Walton	dd098f05c2	Change EntityQueryInitialResultsComplete protocol to use exclusive sequence number	2018-08-22 14:54:07 -07:00
luiscuenca	b3d127c953	Fix flickering	2018-08-22 14:31:34 -07:00
John Conklin II	50684f00c8	Merge pull request #13856 from sethalves/dont-squash-delete-events ... don't squash delete events during shutdown so that QtWebEngine process gets destoryed	2018-08-22 12:44:35 -07:00
Seth Alves	579b2435c2	don't squash delete events during shutdown so that QWebEngine process gets destroyed	2018-08-22 11:04:26 -07:00
John Conklin II	04d72ea39d	Merge pull request #13850 from samcake/punk ... Adjust Workload Region to be bigger	2018-08-22 10:21:14 -07:00
John Conklin II	32562511e8	Merge pull request #13782 from ElderOrb/FB17184 ... Add Support for Managing Avatar Entities to the Avatar App	2018-08-22 10:20:04 -07:00
luiscuenca	5f4903f884	Record entities	2018-08-22 08:53:51 -07:00
Sam Gateau	0f6f465e7f	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-08-21 19:23:33 -07:00
Alexander Ivash	cfb820762d	bulk adjusting to coding guidelines	2018-08-22 00:42:01 +03:00
Stephen Birarda	1723f3d3d8	don't use entity tree to clear all avatar entities	2018-08-21 12:21:29 -07:00
Stephen Birarda	a177e49877	Revert "send attachment clears through setAvatarEntityData" ... This reverts commit 25876bca63.	2018-08-21 12:18:11 -07:00
Stephen Birarda	3e2d4dc696	fixes and improvments addressing CR comments	2018-08-21 10:53:52 -07:00
Stephen Birarda	25876bca63	send attachment clears through setAvatarEntityData	2018-08-21 10:32:05 -07:00
Stephen Birarda	f0ba61ff05	add missing local ID, reset client processed trait versions	2018-08-21 10:32:05 -07:00
Stephen Birarda	e33f349d53	fix flagging for avatar entity update/delete	2018-08-21 10:32:05 -07:00