832 commits

Author	SHA1	Message	Date
Seth Alves	83f60d6e97	make entity properties for model-entity joint-states	2015-12-23 15:43:50 -08:00
Brad Davis	6ef77bc46a	Support the marketplace in QML	2015-12-21 11:34:03 -08:00
Atlante45	d3224bfde3	More warning fixes	2015-12-11 16:03:44 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Atlante45	f72eb679c6	More warning fixes	2015-12-11 15:04:33 -08:00
Atlante45	a07d7494f0	More OS X warning cleanup	2015-12-11 14:20:36 -08:00
Ryan Huffman	87e30a2157	Remove EntityQuery version and just append new data to end	2015-12-11 09:03:39 -08:00
Ryan Huffman	b5e3dce376	Add keyhole radius to OctreeQuery	2015-12-10 14:34:28 -08:00
Clément Brisset	42365acef5	Merge pull request #6561 from ZappoMan/cruftRemovalRedux ... More Cruft Removal	2015-12-07 11:39:54 -08:00
Brad Hefta-Gaub	1eb5b21e48	fix warning	2015-12-04 15:17:16 -08:00
Brad Hefta-Gaub	be4bc7b2ca	going a different way, same packet version, but always send feature requests to old servers	2015-12-04 14:55:16 -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	18e62290f3	fix warnings	2015-12-04 08:37:46 -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	528b8e5d3f	fix warnings	2015-12-03 16:45:01 -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
Brad Hefta-Gaub	0c05ffe9ce	remove coverage map and occulusion culling, since it was always disabled	2015-12-03 10:20:04 -08:00
Brad Hefta-Gaub	1e51a90204	add edit times and entity ids to the viewer stats	2015-12-02 14:43:00 -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
Stephen Birarda	7dbf29821a	don't persist the octree if it never loaded	2015-12-01 10:00:25 -08:00
Atlante45	4aaa9ca02f	Make OctreeElementBag safer to use	2015-11-30 15:23:49 -08:00
Atlante45	5019f79947	Fix header name	2015-11-30 11:48:34 -08:00
Atlante45	a364e85e1d	Remove DeleteHooks	2015-11-25 17:21:56 -08:00
Atlante45	cd2e610e17	Remove OctreeElement's UpdateHooks	2015-11-25 15:35:15 -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
Brad Hefta-Gaub	8ba6dfe721	add deprication warning about binary SVOs	2015-11-20 09:29:36 -08:00
Ryan Huffman	07d21514c5	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-19 10:47:37 -08:00
Seth Alves	98073de0b8	Merge pull request #6426 from ZappoMan/entitiesFileDownload ... implement support to download the persist file from entity server status page	2015-11-19 09:47:10 -08:00
Ryan Huffman	8adf456b91	Update range of LOD to go up to 20:2	2015-11-19 08:52:57 -08:00
Brad Hefta-Gaub	456da661ff	implement support to download the persist file from entity server status page	2015-11-18 17:30:07 -08:00
Ryan Huffman	2a416ebc61	Merge branch 'master' of https://github.com/highfidelity/hifi into received-message	2015-11-18 16:52:23 -08:00
Seth Alves	36af315e5d	Merge pull request #6383 from birarda/goodbye-packet ... send a hopeful disconnect packet from ACs and Interface	2015-11-16 11:28:48 -08:00
Stephen Birarda	0a64242160	cleanup string grabbing for PacketType enum	2015-11-12 14:43:25 -08:00
Brad Hefta-Gaub	da651ac475	fix mac compiler error	2015-11-12 13:47:27 -08:00
Brad Hefta-Gaub	8bfb368a61	fix mac compiler error	2015-11-12 13:32:43 -08:00
Brad Hefta-Gaub	33110eda30	fix mac compiler error	2015-11-12 13:25:50 -08:00
Brad Hefta-Gaub	14a6e1fb6b	fix mac compiler error	2015-11-12 13:24:25 -08:00
Brad Hefta-Gaub	66a2b38f50	switch various status to use thread safe atomics	2015-11-12 13:09:51 -08:00
Brad Hefta-Gaub	ea917f85f4	added ability to set keyhole radius on EntityViewer	2015-10-22 12:56:45 -07:00
Brad Hefta-Gaub	954afe45d3	Merge pull request #6112 from ericrius1/rayPickAdditions ... Moved whitelist and raypicking code out of octree, fixed small bug with polylines	2015-10-21 09:08:56 -07:00
Andrew Meadows	7fa069cf30	fix line endings grumble gruble	2015-10-20 09:38:25 -07:00
ericrius1	dcb37ccd73	Removed whitelist and raypicking code from octree, fixed a small bug with polylines	2015-10-19 13:14:19 -07:00
ericrius1	8c229d88a8	moving whitelist code out of octree	2015-10-19 11:59:44 -07:00