29104 commits

Author	SHA1	Message	Date
Stephen Birarda	7d8db482a3	put back ExtendedIODevice ctor for ubuntu warning	2018-08-21 13:21:21 -07:00
Stephen Birarda	8226ffb916	fix ref to instances vector for instance erase	2018-08-21 11:57:21 -07:00
Stephen Birarda	8c58ae4e60	fix insert of second trait instance	2018-08-21 11:56:28 -07:00
Stephen Birarda	25ed166f07	fix logic for initial send of deleted trait instance	2018-08-21 11:49:48 -07:00
Stephen Birarda	3e2d4dc696	fixes and improvments addressing CR comments	2018-08-21 10:53:52 -07:00
Stephen Birarda	4875738a05	always add to detached, flag update on full replace	2018-08-21 10:32:05 -07:00
Stephen Birarda	99f532a20e	always check added avatar entities once in updateAvatarEntities	2018-08-21 10:32:05 -07:00
Stephen Birarda	eda84d2816	flag deleted avatar entities when replacing full map	2018-08-21 10:32:05 -07:00
Stephen Birarda	cd05d9335a	remove debug of entity json document	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	6c204b682d	include trait bytes written in over budget calculation	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
Stephen Birarda	0f03764c97	create missing avatar when processing traits	2018-08-21 10:31:15 -07:00
Stephen Birarda	1158ec8d50	improve change avoidance after avatar url override	2018-08-21 10:31:15 -07:00
Stephen Birarda	de6fe43dda	ensure joint mapping is processed for current FST url	2018-08-21 10:31:15 -07:00
Stephen Birarda	a56e9b0860	allow agent to create and get avatar entities from script	2018-08-21 10:31:15 -07:00
Stephen Birarda	e6b419d283	add instanced traits and migrate avatar entities	2018-08-21 10:31:15 -07:00
Stephen Birarda	ea7c0e923a	make client traits handler a unique ptr in AvatarData	2018-08-21 10:31:15 -07:00
Stephen Birarda	a0df68f32f	move skeleton model URL emit to AvatarData	2018-08-21 10:31:14 -07:00
Stephen Birarda	be7eb57205	handle whitelist avatar URL override via traits	2018-08-21 10:31:14 -07:00
Stephen Birarda	a80d19a44a	remove skeleton from identity, handle in clients	2018-08-21 10:31:14 -07:00
Stephen Birarda	26a1f03314	send traits in bulk to avatar mixer client	2018-08-21 10:31:14 -07:00
Stephen Birarda	f23a036f4a	add node local ID retreivable from NodeData	2018-08-21 10:31:14 -07:00
Stephen Birarda	ac835650b7	add skeleton trait sending to Agent, queuing in AvatarMixer	2018-08-21 10:31:14 -07:00
Stephen Birarda	486557e28a	initial trait packet sending on skeleton URL change	2018-08-21 10:31:14 -07:00
Wayne Chen	acc7d493ec	Merge pull request #13812 from SimonWalton-HiFi/safe-landing ... Safe landing client-side improvements	2018-08-20 20:36:17 -07:00
John Conklin II	e6c81cdfba	Merge pull request #13833 from sabrina-shanman/stt_performance ... Performance improvements for Collision Pick API	2018-08-20 17:34:46 -07:00
Sam Gateau	d237195944	Merge pull request #13840 from AndrewMeadows/revert-backfacing-triangle-hack ... fix MyAvatar collision bug at transitions between meshes	2018-08-20 17:01:40 -07:00
John Conklin II	b28aa3951f	Merge pull request #13802 from jherico/feature/scribe_programs ... Migrating to scribe program descriptors	2018-08-20 14:48:54 -07:00
Andrew Meadows	3068865a6c	fix MyAvatar collision bug at transitions b/w meshes	2018-08-20 11:42:28 -07:00
sabrina-shanman	74f482b361	Revert "Convert entityIntersections/avatarIntersections lists in" ... This reverts commit aa4a6b2eae.	2018-08-20 10:15:28 -07:00
sabrina-shanman	2933038d04	Rename PhysicsEngine::getCollidingInRegion to contactTest and change it to accept collision flags instead of a MotionState enum	2018-08-17 14:22:42 -07:00
sabrina-shanman	b65572725d	Merge branch 'master' into stt_performance	2018-08-16 14:44:58 -07:00
John Conklin II	bbf6162361	Merge pull request #13632 from Atlante45/fix/udt-rtt ... Fix potential reliable connection lockup.	2018-08-16 13:15:23 -07:00
John Conklin II	1edf1b4337	Merge pull request #13555 from SamGondelman/destroy ... Trying to fix dependency shutdown	2018-08-16 13:14:58 -07:00
John Conklin II	02f53c4ee5	Merge pull request #13808 from dback2/createEntitiesGrabbable ... Use Create Entities as Grabbable option when adding asset to world	2018-08-16 09:22:23 -07:00
sabrina-shanman	aa4a6b2eae	Convert entityIntersections/avatarIntersections lists in ... CollisionPickResult to shared pointers	2018-08-16 08:59:29 -07:00
Sam Gondelman	5f4f232602	Merge pull request #13604 from huffman/feat/oven-etc2 ... Add ETC2 support to Oven	2018-08-15 13:55:44 -07:00
sabrina-shanman	61d12923ea	Do not copy list of collision pick contact points when filtering them	2018-08-15 11:12:50 -07:00
sabrina-shanman	83ededfd37	Pass collision filter flags into AllContactsCallback for more efficient collision filtering	2018-08-15 11:12:50 -07:00
John Conklin II	032e67fd8e	Merge pull request #13748 from ElderOrb/FB16831 ... FB16831 qml-related warnings in log	2018-08-14 16:40:07 -07:00
Seth Alves	3623590e90	Merge pull request #13784 from sethalves/far-point-joints ... Far point joints	2018-08-14 15:40:07 -07:00
John Conklin II	007652632c	Merge pull request #13724 from gcalero/android_audio_fixes3 ... Android audio tests	2018-08-14 13:57:59 -07:00
Alexander Ivash	4478733c27	fix coding conventions	2018-08-14 21:18:54 +03:00
Seth Alves	dce7b6eae6	Merge pull request #13714 from sabrina-shanman/safe-teleport-target ... Create CollisionPick API	2018-08-14 09:56:51 -07:00
Seth Alves	41e9c3a2ad	Merge pull request #13820 from AndrewMeadows/dont-try-physics-for-invalid-models ... don't attempt physics with invalid modelURL	2018-08-14 09:47:37 -07:00
Seth Alves	527b27da96	pseudo-joints for far-grab positions	2018-08-14 08:55:20 -07:00
sabrina-shanman	2576d502ab	Remove unused getter for btCollisionWorld in PhysicsEngine	2018-08-13 17:27:57 -07:00
Ryan Huffman	0fcf1517a5	Fix TextureCache not correctly choosing gl41 when gl45 is disabled	2018-08-13 16:35:21 -07:00
sabrina-shanman	e5cb078133	Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target	2018-08-13 14:51:37 -07:00