522 commits

Author	SHA1	Message	Date
Stephen Birarda	b8b5b2b6ec	don't check the root object for path	2015-01-14 16:56:49 -08:00
Stephen Birarda	6e1ba17c6e	handle application title change for place name change	2015-01-13 15:07:45 -08:00
Stephen Birarda	92b8cd2d1e	handle storage of user location in new format	2015-01-13 15:02:04 -08:00
Stephen Birarda	16261a5fc1	more updates for new place/location APIs	2015-01-13 14:49:24 -08:00
Stephen Birarda	1af87e57da	handle new places API format in AddressManager	2015-01-13 14:21:07 -08:00
Atlante45	b6ba82653f	Remove glm dependency	2015-01-12 17:00:39 -08:00
Atlante45	80af2adf12	Remove constexpr because windows can't handle them	2015-01-12 16:42:27 -08:00
Atlante45	8415098fc2	Set different caches size depending on cache type	2015-01-12 15:36:36 -08:00
Atlante45	e70e435dcc	Added Min/Max values for cache size	2015-01-12 12:45:13 -08:00
Atlante45	81bf1e4f53	Some code maintainance	2015-01-12 11:46:38 -08:00
Atlante45	bad96e0ba4	cache size getter/setter	2015-01-12 11:37:42 -08:00
Atlante45	ea0ffd0125	Introduce reserveUnusedResource	2015-01-12 11:37:00 -08:00
Atlante45	cb3f07e6f5	Remove unusedResourcesMaxCount	2015-01-12 11:18:55 -08:00
Atlante45	5cdc76ad35	Put cache max size/count as class members	2015-01-11 22:48:42 -08:00
Atlante45	02b9aaacf8	Bump packet version	2015-01-09 11:16:58 -08:00
Philip Rosedale	285e588266	Merge pull request #4072 from Atlante45/network_replies_cleanup ... Windows crash fix	2015-01-09 07:42:36 -08:00
Atlante45	441a1e4fee	Turns out windows doesn't like constexpr	2015-01-08 18:35:23 -08:00
Atlante45	ea832cfd45	Added constant	2015-01-08 17:33:47 -08:00
Atlante45	77e4a2ef35	Add byte limit to chaches	2015-01-08 17:06:05 -08:00
Atlante45	af9525ed33	Bump AvatarData packet number	2015-01-08 11:49:39 -08:00
Clément Brisset	fb6fb8a38d	Merge pull request #4050 from birarda/lasagna-not-spaghetti ... put back current address storage in Menu	2015-01-06 16:29:52 -08:00
Stephen Birarda	9c191be106	use the AddressManager's method to store current address	2015-01-06 16:13:06 -08:00
Philip Rosedale	413cbacbc1	Merge pull request #4043 from ZappoMan/voxelEctomy ... more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 10:07:38 -08:00
Stephen Birarda	5fadfa8c17	remove doubled friend declaration, is in macro	2015-01-06 09:35:11 -08:00
ZappoMan	b940dcfdb3	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
Atlante45	be050b0469	Added missing deletes	2015-01-05 15:13:07 -08:00
Stephen Birarda	51bba4884f	resolve conflicts on merge with upstream master	2015-01-05 14:40:48 -08:00
Stephen Birarda	dfb02aea0c	resolve conflicts on merge, add cstring inc	2015-01-05 09:25:30 -08:00
ZappoMan	67595ea571	more voxelEctomy	2014-12-30 20:35:21 -08:00
ZappoMan	5cef7d0e9d	more voxelEctomy	2014-12-30 20:24:27 -08:00
Andrzej Kapolka	c9b3b5ff7d	Scale back on first dropped packet, use Qt send/receive buffer size options ... rather than setsockopt/getsockopt.	2014-12-30 12:30:38 -08:00
Stephen Birarda	e02f81da01	fix a call to address manager in nodelist	2014-12-29 11:00:49 -07:00
Stephen Birarda	c7a5f3c86c	resolve conflicts and merge with upstream master	2014-12-29 10:59:42 -07:00
Stephen Birarda	08581b4dac	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-19 12:50:32 -08:00
Stephen Birarda	979f5f8fc5	fix for coding standard compliance	2014-12-19 12:19:49 -08:00
Stephen Birarda	114e3bb2ff	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
Stephen Birarda	3a4f75ff62	fix AddressManager domain lookup to handle port	2014-12-18 16:40:02 -08:00
Stephen Birarda	1ab66c2bfe	split port and hostname for cleaner domain changes	2014-12-18 16:17:03 -08:00
Stephen Birarda	087ac1db90	send port along with domain hostname lookup	2014-12-18 16:03:13 -08:00
Stephen Birarda	325d0dbce1	include QUuid instead of UUID in UUIDHasher	2014-12-18 14:31:34 -08:00
Stephen Birarda	e13e9febdc	unlock the node mutex if node not found	2014-12-18 14:16:22 -08:00
Stephen Birarda	07f95c597c	add read locks for find on tbb hash	2014-12-18 14:08:55 -08:00
Stephen Birarda	df3eca5aca	add a comment for the UUID hasher	2014-12-18 14:01:22 -08:00
Stephen Birarda	587df1178d	use constant for MSEC to USEC conversion	2014-12-18 13:57:19 -08:00
Stephen Birarda	b326ab9839	remove quotes from library links for debug/optimized	2014-12-18 09:38:48 -08:00
Stephen Birarda	d38c78f2c3	remove bubbling of linked libraries, cmake does it	2014-12-18 09:34:04 -08:00
Stephen Birarda	7beb3a7b62	resolve conflicts on merge with upstream master	2014-12-17 16:57:35 -08:00
Stephen Birarda	737741c13b	Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo	2014-12-17 09:23:42 -08:00
Stephen Birarda	1cf88e7666	Merge branch 'master' of https://github.com/highfidelity/hifi into lasagna-not-spaghetti	2014-12-16 10:47:45 -08:00
Andrzej Kapolka	892141fe14	Fix for crash on exit due to cache references' not being cleared.	2014-12-15 16:36:26 -08:00