70965 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
John Conklin II	fcdbc6c6d2	Merge pull request #13778 from SamGondelman/bloom ... Enable bloom in zone properties	2018-08-24 14:46:31 -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
Sam Gateau	699240027e	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2018-08-23 19:29:14 -07:00
Howard Stearns	9a472fa388	Merge pull request #13870 from zfox23/wallet_autologout ... Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 18:04:38 -07:00
John Conklin II	bc90d1a439	Merge pull request #13869 from zfox23/MS17738_fixBlastIcon ... Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review	2018-08-23 17:40:24 -07:00
Sam Gateau	57fd824005	working on the LOD behavior	2018-08-23 17:30:23 -07:00
Zach Fox	dc1a33ba6e	Merge branch 'master' of github.com:highfidelity/hifi into wallet_autologout	2018-08-23 16:58:49 -07:00
Howard Stearns	fe3f48b194	Merge pull request #13859 from howard-stearns/wallet-locker2 ... Wallet Locker	2018-08-23 16:54:19 -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
Stephen Birarda	6ab3f83be0	Merge pull request #13868 from birarda/feat/avatar-traits ... fix traits re-send after node unignored, agent crash	2018-08-23 15:53:16 -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
Stephen Birarda	e1879bf26a	add assignment dynamic factory to ESS	2018-08-23 13:55:17 -07:00
Stephen Birarda	09065cf19a	provide assignment dynamic factory to agent	2018-08-23 13:31:18 -07:00
Stephen Birarda	36784b0039	reset sent trait data when re-send required	2018-08-23 13:31:18 -07:00
Zach Fox	e3d03cd321	Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review	2018-08-23 13:16:02 -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	1c87d7b109	reorder initialization to remove compile warning	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	55b1a6762c	explicit delete default ctor, make _nestableType private	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
Howard Stearns	b7d074aaa4	remove comment	2018-08-23 10:41:19 -07:00
Howard Stearns	b7fa47da35	cr feedback	2018-08-23 10:37:55 -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
John Conklin II	b8e93ec688	Merge pull request #13863 from wayne-chen/enableAdvancedMovement-case-17774 ... MS17774: Enable advanced movement on first run	2018-08-22 19:00:30 -07:00
Simon Walton	c0966d738e	Use EntityVersion for the EntityQueryInitialResultsComplete packet	2018-08-22 16:40:49 -07:00
Simon Walton	c4b916af62	Just bump packet version for EntityQueryInitialResultsComplete	2018-08-22 16:22:30 -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
John Conklin II	24d097502e	Merge pull request #13858 from birarda/bug/ess-crash ... fix a crash in ESS from missing dependency	2018-08-22 15:27:50 -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
Howard Stearns	88a3505b6a	cleanup	2018-08-22 14:30:27 -07:00
Howard Stearns	13629f6870	bypass setup and password, and convert old wallets to account based ... before lockering	2018-08-22 14:30:27 -07:00