1870 commits

Author	SHA1	Message	Date
Brad Davis	3b4f5d36a5	PR feedback	2016-01-03 12:29:32 -08:00
Stephen Birarda	abea65fa84	resolve conflicts on merge with upstream/master	2015-12-29 17:54:45 -08:00
Seth Alves	f0bffe7a24	fix success return value	2015-12-21 14:29:07 -08:00
Seth Alves	bc52576ba2	Merge branch 'fix-entity-server-crash' of github.com:sethalves/hifi into near-grab-via-parenting	2015-12-19 08:14:15 -08:00
Seth Alves	9271209d89	another	2015-12-19 08:13:53 -08:00
Seth Alves	a175bb85f9	Merge branch 'fix-entity-server-crash' of github.com:sethalves/hifi into near-grab-via-parenting	2015-12-19 08:09:44 -08:00
Seth Alves	8b9de716f1	fix bad pointer juju	2015-12-19 08:08:10 -08:00
Seth Alves	d34e166b48	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-17 07:31:52 -08:00
Atlante45	2c8be15e66	Unnecessary shutdown (Already shutting down)	2015-12-16 15:56:22 -08:00
Atlante45	b709c8162c	Fix node flapping race	2015-12-16 14:27:26 -08:00
Atlante45	6bda8d3f18	CR logging category	2015-12-16 14:27:26 -08:00
Atlante45	b55d8f750f	CR	2015-12-16 14:27:26 -08:00
Atlante45	0f7093bed7	Whitespace	2015-12-16 14:27:26 -08:00
Atlante45	df24fafe49	CR feedback	2015-12-16 14:27:26 -08:00
Atlante45	a655557af0	Make variable name more obvious	2015-12-16 14:27:26 -08:00
Atlante45	b4dc3b1b47	Fix windows compile error.	2015-12-16 14:27:26 -08:00
Atlante45	a541fdd2df	Move OctreeSendThread to the OctreeServer	2015-12-16 14:27:26 -08:00
Atlante45	51ec7ae2ed	Keep UUID of node in send thread	2015-12-16 14:27:26 -08:00
Atlante45	3cd1eea1dc	Use weak pointer to the Node instead of strong ownership	2015-12-16 14:27:26 -08:00
Atlante45	346c28f9e2	Remove OctreeServer's static instance	2015-12-16 14:27:26 -08:00
Atlante45	09701fdcf1	deadlock 101	2015-12-16 14:27:26 -08:00
Atlante45	b65cdd2865	Add logging categories to assignment client.	2015-12-16 14:27:26 -08:00
Atlante45	bd7fa266cf	Bit of cleanup	2015-12-16 14:27:26 -08:00
Seth Alves	45d19167c9	fix a couple of missing-parent bugs	2015-12-16 10:09:46 -08:00
Ryan Huffman	b907a04a3f	Add log directory to AssignmentClientMonitor	2015-12-16 09:08:51 -08:00
Ryan Huffman	195f58e130	Add log-directory option to AC monitor	2015-12-16 08:51:13 -08:00
Seth Alves	a3631ea1d1	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-15 10:12:49 -08:00
Seth Alves	b9fc368857	Merge pull request #6633 from huffman/agent-spatial-finder ... Add AssignmentParentFinder to Agent	2015-12-14 09:35:27 -08:00
Seth Alves	008065ba38	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-14 09:15:56 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Ryan Huffman	66ed8dc053	Add AssignmentParentFinder to Agent	2015-12-11 14:51:14 -08:00
Brad Hefta-Gaub	a7a924153a	Merge pull request #6617 from huffman/entity-query-keyhole ... Add keyhole radius to OctreeQuery	2015-12-11 09:35:46 -08:00
Brad Hefta-Gaub	c1fe30ff49	Merge pull request #6620 from huffman/fix-agent-entity-delete ... Fix EntityErase packets not being handled on agents	2015-12-10 17:27:21 -08:00
Ryan Huffman	4c8b7aa800	Fix EntityErase packets not being handled on agents	2015-12-10 16:26:16 -08:00
Ryan Huffman	b5e3dce376	Add keyhole radius to OctreeQuery	2015-12-10 14:34:28 -08:00
Brad Hefta-Gaub	2fbabf20db	properly handle repack attempts	2015-12-10 14:03:06 -08:00
Leonardo Murillo	dda99bfea6	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-12-08 14:07:50 -08:00
Leonardo Murillo	25494ec867	Merge pull request #6562 from Atlante45/baseball ... Baseball	2015-12-07 14:11:21 -08:00
Clément Brisset	42365acef5	Merge pull request #6561 from ZappoMan/cruftRemovalRedux ... More Cruft Removal	2015-12-07 11:39:54 -08:00
Ryan Huffman	34138f07bd	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-07 08:58:47 -08:00
Seth Alves	62b4eac875	fix avatar-mixer parents-related crash	2015-12-04 16:41:56 -08:00
Atlante45	1d498af76e	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub	46946212cf	remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true	2015-12-04 14:24:31 -08:00
Brad Hefta-Gaub	f44a9daa21	remove WANT_DELTA from OctreeQuery	2015-12-04 14:04:57 -08:00
Brad Hefta-Gaub	0d9d5375c7	remove optional WANT_COMPRESSION from OctreeQuery	2015-12-04 13:29:18 -08:00
Ryan Huffman	89c412c324	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents ... Parents	2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub	49a7852d76	Merge pull request #6540 from Atlante45/warnings ... Fix warnings on OS X	2015-12-04 10:19:25 -08:00
Atlante45	cb758ca6b4	Fix override warnings on XCode 7	2015-12-04 08:55:43 -08:00
Brad Hefta-Gaub	f472b515c3	remove wantsColor support since its always true and required for entities	2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub	81fb4476bc	remove coverage map and occulusion culling, since it was always disabled	2015-12-03 20:29:23 -08:00
Brad Hefta-Gaub	5a75a17174	Revert "Cruft removal"	2015-12-03 17:40:41 -08:00
Brad Hefta-Gaub	1a5bc5d111	removing optional compression	2015-12-03 12:40:24 -08:00
Brad Hefta-Gaub	849a8707d2	remove wantsColor support since its always true and required for entities	2015-12-03 11:11:15 -08:00
Seth Alves	4e74c98ae7	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-03 11:00:13 -08:00
Brad Hefta-Gaub	0c05ffe9ce	remove coverage map and occulusion culling, since it was always disabled	2015-12-03 10:20:04 -08:00
Ryan Huffman	ce882a9c11	Replace QSharedPointer ctor with ::create	2015-12-03 09:43:36 -08:00
Brad Hefta-Gaub	4497d21aec	remove nodes that disconnect from out viewer stats	2015-12-02 14:51:48 -08:00
Brad Hefta-Gaub	1e51a90204	add edit times and entity ids to the viewer stats	2015-12-02 14:43:00 -08:00
Seth Alves	6eae98fb28	merge from upstream	2015-12-02 14:38:26 -08:00
Brad Hefta-Gaub	08ba535c38	add some basic send tracking	2015-12-02 13:43:05 -08:00
Brad Hefta-Gaub	75a57c3cb8	Merge pull request #6500 from Atlante45/octree_crash ... Octree crash fix	2015-12-02 09:59:56 -08:00
Atlante45	c3e2d920ee	Move timing at the top	2015-12-02 09:45:51 -08:00
Seth Alves	0595ef0938	merge from upstream	2015-12-02 09:30:19 -08:00
Leonardo Murillo	f5dfc7d3e4	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-12-02 10:42:57 -06:00
Brad Hefta-Gaub	82d6718d8b	Merge pull request #6510 from birarda/es-deadlock ... fix infinite loop on shutdown in OctreeInboundPacketProcessor	2015-12-02 08:16:28 -08:00
Atlante45	0bc914bf19	Don't grab subTree outside lock	2015-12-01 19:33:44 -08:00
Atlante45	f06b5b05b3	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-01 15:14:58 -08:00
Howard Stearns	8f7f3eed6e	ScriptAvatar now gets the .fbx joints: ... Because the joint mappings in the .fst can be wrong when the .fst isn't updated for quick changes in the .fbx. Because models now really need the preRotation, which is only in the avatar .fbx.	2015-12-01 11:52:42 -08:00
Stephen Birarda	557ab315d9	make resettable stats atomic	2015-12-01 10:51:52 -08:00
Stephen Birarda	27227181f0	fix for infinite loop in OctreeeInboundPacketProcessor	2015-12-01 10:45:19 -08:00
Leonardo Murillo	418b9c8fea	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-12-01 11:57:38 -06:00
Atlante45	083205916f	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-30 18:25:53 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Clément Brisset	e168966b87	Merge pull request #6409 from birarda/injector-hybrid ... more efficient threading of networked AudioInjector objects	2015-11-30 15:36:41 -08:00
Atlante45	4aaa9ca02f	Make OctreeElementBag safer to use	2015-11-30 15:23:49 -08:00
Stephen Birarda	4573e5c59e	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
Ryan Huffman	1b0413f8e3	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-30 10:23:40 -08:00
Seth Alves	081174fe69	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-30 10:18:01 -08:00
Andrew Meadows	49a6f63663	remove whitespace and fix warning (unused var)	2015-11-30 10:00:05 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Atlante45	a364e85e1d	Remove DeleteHooks	2015-11-25 17:21:56 -08:00
Leonardo Murillo	b7cdca75b7	Checkpoint towards integrated delivery	2015-11-24 16:12:04 -06:00
Ryan Huffman	669d3c3523	Rename several ReceivedMessage params from packet to message	2015-11-24 11:29:02 -08:00
Ryan Huffman	dac491ef41	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-24 09:59:22 -08:00
Stephen Birarda	7f7d05fc42	fix double initialization of AssetClient in Agent	2015-11-24 10:46:35 -06:00
Stephen Birarda	ab7cbc0b76	Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid	2015-11-24 10:45:00 -06:00
Brad Hefta-Gaub	82ff0af05c	Merge pull request #6472 from murillodigital/stack-manager ... Stack manager - integration checkpoint	2015-11-23 16:53:53 -08:00
Seth Alves	5fe41662d8	fix comment header paths	2015-11-23 14:31:40 -08:00
Stephen Birarda	0997d3dcae	resolve conflicts on merge with upstream/master	2015-11-23 16:15:15 -06:00
Seth Alves	ba30e01664	include global position in avatar-mixer protocol so server knows where avatars are in world-space	2015-11-23 14:12:49 -08:00
samcake	25654824a2	Copy pasting the code that Stephen did and also adding the AssetServer to the list of dependent nodes for the agent	2015-11-23 12:32:27 -08:00
Leonardo Murillo	ec6be93938	Merge branch 'master' of https://github.com/highfidelity/hifi into stack-manager	2015-11-23 14:22:05 -06:00
samcake	301f0ba145	Trying to instenciate the AssetCLient in the Agent	2015-11-23 11:48:02 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
samcake	5d17fa0b34	Merge pull request #6458 from ZappoMan/acPlayback ... allow playbackAgents to auto-register	2015-11-20 16:25:02 -08:00
Stephen Birarda	b24b095c90	add a missing space in Agent	2015-11-20 16:09:41 -08:00
Brad Hefta-Gaub	f56d2fba7f	allow playbackAgents to auto-register	2015-11-20 16:00:43 -08:00
Leonardo Murillo	5d2700309d	Merge branch 'master' of github.com:highfidelity/hifi into stack-manager	2015-11-20 17:43:25 -06:00