1355 commits

Author	SHA1	Message	Date
ZappoMan	b44ced4c21	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Seth Alves	93fd2a6a6b	clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared	2017-11-15 20:10:05 -08:00
Ryan Downe Karpf	9ff4541ee3	Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack ... Remove hack for missing inttypes.h header on VS2010	2017-11-12 10:59:19 -08:00
Anthony J. Thibault	5507bcea3c	Remove hack for missing inttypes.h header on VS2010	2017-11-09 10:34:01 -08:00
vladest	6685b74c2a	Remove checking of empty model url and add sanity for checking modelUrl field existing	2017-11-08 21:23:50 +01:00
ZappoMan	b5199220ab	cleanup SpatiallyNestable Velocity to match WorldVelocity naming	2017-11-02 17:07:53 -07:00
ZappoMan	f63db42c0e	migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation	2017-10-28 10:14:25 -07:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -07:00
Ryan Huffman	9c06afc4c8	Merge pull request #11326 from cain-kilgore/21537 ... WL 21537 - Improve log naming	2017-10-06 08:51:42 -07:00
Bradley Austin Davis	bc4193f276	Merge branch 'master' into android_new	2017-09-19 14:27:31 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Cain Kilgore	387e474889	WIP	2017-09-08 23:48:09 +01:00
Anthony J. Thibault	9cd8b6991e	Merge branch 'master' into feature/ant-man	2017-08-30 08:58:55 -07:00
Chris Collins	47a2e57e26	Merge pull request #10625 from humbletim/21180-C++ ... CR 21180-C++ Camera app -- core changes	2017-08-30 07:20:00 -07:00
Anthony J. Thibault	573985c7c9	Merge branch 'master' into feature/ant-man	2017-08-28 09:27:04 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
humbletim	9348048387	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04:00
Anthony J. Thibault	d62a0ea8ff	Correct controller offsets with sensor scaling	2017-08-22 11:43:39 -07:00
Anthony Thibault	9af6f2683a	Merge pull request #11083 from Menithal/experimental-face-expressions ... Opened up setForceFaceTrackerConnected	2017-08-14 14:19:08 -07:00
Menithal	9ec14057f0	Opened up setForceFaceTrackerConnected	2017-07-29 21:51:19 +03:00
Andrew Meadows	8c55476c65	fix motor direction when walking upside down ... also maintain worldUp and remove unnecessary cruft	2017-07-24 16:00:13 -07:00
Andrew Meadows	29be9aee65	move nextAttitude() from AvatarData to MyAvatar	2017-07-24 16:00:13 -07:00
humbletim	f9e0e616f7	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-18 17:34:39 -04:00
Dante Ruiz	21d760a533	make sure to lock data	2017-07-17 22:11:05 +01:00
Dante Ruiz	f6208a394c	delete avatar entity when switching domains	2017-07-17 21:27:55 +01:00
Stephen Birarda	f6d9a79fb5	Revert "Revert "fix for invisible avatars after radius ignore""	2017-07-12 10:36:53 -07:00
Andrew Meadows	782155e9ea	Merge pull request #10876 from Atlante45/fix/ac-crash ... Fix AC crash (buffer overflow)	2017-07-11 14:26:08 -07:00
Atlante45	c32f4ab0d3	CR	2017-07-10 14:24:53 -07:00
Seth Alves	6782a891d0	rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different	2017-07-07 10:35:45 -07:00
Atlante45	1d07ab70f0	Fix warnings	2017-07-06 10:56:09 -07:00
Atlante45	9a1d38384d	Remove unecessary loops	2017-07-05 17:43:09 -07:00
Atlante45	20a633eb89	Check struct sizes at compile time	2017-07-05 17:42:59 -07:00
Atlante45	95abbd0ad4	Prevent Interface from trying to send packets bigger than an MTU	2017-07-05 17:08:04 -07:00
Atlante45	7e9ce5a58b	Don't overflow during AvatarData::toByteArray	2017-07-05 16:15:18 -07:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
humbletim	026e05f80c	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-03 11:55:59 -04:00
Stephen Birarda	f6fe3f91fd	Merge pull request #10829 from birarda/bug/sequence-skips ... fix avatar mixer sending empty avatar identities	2017-06-30 15:28:29 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Dante Ruiz	f6ba264de6	avatar recording fix	2017-06-28 16:22:28 +01:00
Stephen Birarda	089a2bb362	do not manage identity data without identity data received	2017-06-27 11:58:03 -07:00
Ryan Huffman	b56cfa56c7	Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated	2017-06-23 14:23:20 -07:00
humbletim	f6262ad54d	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-06-23 16:37:10 -04:00
Stephen Birarda	ccbae07170	rename _sequenceNumber to _lastSequenceNumber	2017-06-22 11:23:58 -07:00
Stephen Birarda	42cceb02a4	push sequence number when managing identity data for agent	2017-06-22 11:10:43 -07:00
Stephen Birarda	aeb3f443f8	address code review comments	2017-06-21 16:14:14 -07:00
Ryan Huffman	0e7ddfd29f	Disable silence/ban buttons in PAL if avatar is replicated	2017-06-21 09:49:16 -07:00
Ryan Huffman	8ce1474d9a	Add isReplicated to avatar identity data	2017-06-21 09:48:34 -07:00
humbletim	fbeaa01f7d	remerge master / remove debug block	2017-06-20 01:51:33 -04:00