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 |
|
Stephen Birarda
|
1b48cf7f5a
|
use DependencyManager for AddressManager
|
2014-12-15 14:54:20 -08:00 |
|
Stephen Birarda
|
8549e9cb53
|
resolve conflicts on merge with upstream master
|
2014-12-15 09:36:17 -08:00 |
|
Stephen Birarda
|
687072f19c
|
fix for domain failed reconnect after disconnect
|
2014-12-12 09:47:15 -08:00 |
|
ZappoMan
|
628046f13c
|
potential fix to crash on windows startup
|
2014-12-09 18:26:59 -08:00 |
|
Andrzej Kapolka
|
343f610442
|
Use the 1450 limit everywhere, in case other places are running into the issue
I experienced with metavoxels.
|
2014-12-08 18:45:05 -08:00 |
|
Andrzej Kapolka
|
7a81e6c9e1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-12-03 14:30:31 -08:00 |
|
Stephen Birarda
|
5c3e90f64f
|
resolve conflicts on merge with upstream master
|
2014-12-03 13:11:56 -08:00 |
|
Andrzej Kapolka
|
fecb225a06
|
Prevent erroneous resource download percentages; Qt reports the total bytes as
-1 before the actual size is available.
|
2014-12-03 12:55:58 -08:00 |
|
Andrzej Kapolka
|
e32c214e4d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-12-03 12:08:06 -08:00 |
|
Stephen Birarda
|
49a087018f
|
fix for delayed heartbeats, late socket lookup
|
2014-12-03 08:22:50 -08:00 |
|
Andrzej Kapolka
|
5b4869f43d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-12-01 16:43:39 -08:00 |
|
Stephen Birarda
|
fed7d789f6
|
have the domain-server write its local port into shared memory
|
2014-11-30 17:29:18 -08:00 |
|