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
|
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
|
737741c13b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo
|
2014-12-17 09:23:42 -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
|
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 |
|
Andrzej Kapolka
|
1d9c7d7c72
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-26 10:56:23 -08:00 |
|
Andrzej Kapolka
|
8d3f4a627b
|
Working on quadtree for heightfields.
|
2014-11-25 14:10:44 -08:00 |
|
David Rowe
|
01867e2459
|
Display "--" for ping values if not yet valid
|
2014-11-24 18:32:47 -08:00 |
|
Andrzej Kapolka
|
0a976ad262
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-20 11:26:29 -08:00 |
|
Stephen Birarda
|
1aa98dfc4c
|
trim whitespace for place name lookup
|
2014-11-20 09:24:43 -08:00 |
|
Atlante45
|
b5abf44aa3
|
Comment packt type number every 5
|
2014-11-19 14:31:49 -08:00 |
|
Andrzej Kapolka
|
632f3bfa7f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-18 17:12:40 -08:00 |
|
Stephen Birarda
|
2274b35d08
|
connect to sandbox domain by default
|
2014-11-18 15:35:11 -08:00 |
|
Andrzej Kapolka
|
4308a45028
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-17 16:46:51 -08:00 |
|
Atlante45
|
46eebe9d40
|
Give noisy mutes their own packet type
|
2014-11-17 10:26:47 -08:00 |
|
Andrzej Kapolka
|
aae168dd46
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-14 12:43:52 -08:00 |
|
Brad Hefta-Gaub
|
3441167838
|
Merge pull request #3790 from Atlante45/entities_userdata
Entities userdata
|
2014-11-13 20:43:57 -08:00 |
|
Atlante45
|
f47620231e
|
Entities have user data
|
2014-11-13 16:16:20 -08:00 |
|
Stephen Birarda
|
e10d132f75
|
avoid Qt QTimer thread bug by putting SoundCache on same thread
|
2014-11-13 14:47:28 -08:00 |
|
Andrzej Kapolka
|
8a0ff4acf5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
interface/src/ui/MetavoxelEditor.cpp
|
2014-11-13 12:17:37 -08:00 |
|
ZappoMan
|
8ad3ce7daf
|
bump packet version
|
2014-11-13 09:32:59 -08:00 |
|
Andrzej Kapolka
|
08475cc90b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-11-11 14:40:34 -08:00 |
|
Philip Rosedale
|
d9141b4010
|
Merge pull request #3750 from Atlante45/reverb_for_own_voice
Reverb for own voice
|
2014-11-11 10:52:26 -08:00 |
|
Andrzej Kapolka
|
0664ff3181
|
Moved spanners into separate file, working on heightfields as spanners.
|
2014-11-10 15:51:41 -08:00 |
|
Stephen Birarda
|
beb7c339f3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo
|
2014-11-07 11:18:04 -08:00 |
|
ZappoMan
|
fdc5aa1da5
|
include urls with texture names, make sure to wait till default textures loaded before setting new textures
|
2014-11-07 09:54:13 -08:00 |
|
Stephen Birarda
|
0f32346324
|
resolve conflicts on merge with upstream master
|
2014-11-07 09:10:12 -08:00 |
|
Stephen Birarda
|
996c76c723
|
repairs for node teardown on domain dissappear or node disconnect
|
2014-11-06 16:05:01 -08:00 |
|