Stephen Birarda
10be0ee984
resolve conflicts on merge with upstream master
2015-01-19 10:26:56 -08:00
Stephen Birarda
990ca8397e
add extra debugging for AddressManager connect to domain
2015-01-19 10:23:05 -08:00
Atlante45
967028e5cf
Removed more QSettings references
2015-01-18 19:29:27 -08:00
Atlante45
df69466887
Moved copyPath/Address out of Menu
...
Moved into AddressManager
2015-01-18 05:48:14 -08:00
Andrzej Kapolka
b6c843497d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2015-01-16 11:56:04 -08:00
Stephen Birarda
6f5d9d54ec
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-01-15 14:15:38 -08:00
Stephen Birarda
250a3de9fe
make node mutex in LimitedNodeList recursive for double read lock
2015-01-15 13:34:33 -08:00
Stephen Birarda
e538669343
resolve conflicts on merge with upstream
2015-01-15 13:12:05 -08:00
Stephen Birarda
b8b5b2b6ec
don't check the root object for path
2015-01-14 16:56:49 -08:00
Atlante45
f77fab2fe0
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
2015-01-13 20:38:52 -08:00
Atlante45
38729c5790
Made dependencies inherit from Dependency
2015-01-13 20:38:01 -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
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -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
Andrzej Kapolka
cad8313e56
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2015-01-12 12:00:20 -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
Stephen Birarda
d30490c760
resolve conflicts on merge with upstream master
2015-01-12 09:25:37 -08:00
Atlante45
5cdc76ad35
Put cache max size/count as class members
2015-01-11 22:48:42 -08:00
Andrzej Kapolka
e3074d726b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
libraries/metavoxels/src/Spanner.cpp
2015-01-09 11:52:05 -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
Andrzej Kapolka
c99e2c3ec6
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-01-08 14:57:03 -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
135e3bf574
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-12-30 13:25:57 -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
Andrzej Kapolka
c78d38b925
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-12-29 14:38:17 -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
Atlante45
327daacecd
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
libraries/networking/src/NodeList.cpp
2014-12-22 13:34:18 -08:00
Stephen Birarda
979f5f8fc5
fix for coding standard compliance
2014-12-19 12:19:49 -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
Atlante45
296c0025de
Switched to auto and changed macro
2014-12-18 15:42:38 -08:00
Atlante45
9c038d33b9
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
2014-12-18 14:43:01 -08:00
Stephen Birarda
325d0dbce1
include QUuid instead of UUID in UUIDHasher
2014-12-18 14:31:34 -08:00
Atlante45
990362b8ff
Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11
2014-12-18 14:18:21 -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
Atlante45
aa0998dc7d
Moved LimitedNodeList into DM
2014-12-18 10:32:34 -08:00
Stephen Birarda
7beb3a7b62
resolve conflicts on merge with upstream master
2014-12-17 16:57:35 -08:00
Atlante45
0bd9ed469e
Changed NodeList::getInstance() calls to use the DM
2014-12-17 15:28:25 -08:00
Atlante45
52f2033dce
Updated Nodelist class
2014-12-17 15:27:35 -08:00
Atlante45
ce7f72d2cd
Update macro
2014-12-17 15:26:47 -08:00
Stephen Birarda
737741c13b
Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo
2014-12-17 09:23:42 -08:00
Atlante45
c40e83c9e4
Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11
2014-12-16 15:42:40 -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
564bce7c10
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-12-15 17:09:32 -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
Andrzej Kapolka
5e01695899
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-12-12 12:11:33 -08:00
Stephen Birarda
687072f19c
fix for domain failed reconnect after disconnect
2014-12-12 09:47:15 -08:00
Andrzej Kapolka
828813dd07
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-12-11 14:57:36 -08:00
ZappoMan
628046f13c
potential fix to crash on windows startup
2014-12-09 18:26:59 -08:00
Andrzej Kapolka
65bd3a3d26
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-12-09 18:09:38 -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
c96be3fe3d
Removed unused functions, stubbing out "stack" layer.
2014-12-05 17:46:28 -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
Stephen Birarda
998457665f
add back c++11 support to all, fix includes in networking
2014-11-18 17:26:42 -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
Stephen Birarda
a8cc565baf
set the default hostname for GVRInterface client
2014-11-18 13:43:49 -08:00
Stephen Birarda
9f4e1c8a27
cleanup indentation in AndroidManifest file
2014-11-18 13:38:37 -08:00
Andrzej Kapolka
4308a45028
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-17 16:46:51 -08:00
Stephen Birarda
fce239fb70
replace auto_ptr with unique_ptr
2014-11-17 14:17:50 -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
Stephen Birarda
f23b08971c
merge with cuckoo branch, fix makefile OS X support
2014-11-14 10:52:12 -08:00
Stephen Birarda
9dfdbc4352
remove unused includes in NetworkPacket
2014-11-14 10:14:47 -08:00
Stephen Birarda
5b379ae2ff
use portable solution for setSockOpt
2014-11-14 10:12:34 -08:00
Stephen Birarda
df23366b8c
remove setsockopt calls for DTLS to pass android build
2014-11-14 10:01:01 -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
Atlante45
4dc40c9e84
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_for_own_voice
2014-11-06 23:17:53 +01:00
Stephen Birarda
51bc5d10b5
fix network includes in LimitedNodeList
2014-11-06 13:46:26 -08:00
Stephen Birarda
e92376cf64
distinguish between eachNode and eachNodeBreakable
2014-11-06 13:41:55 -08:00
Stephen Birarda
270823be43
update domain-server to leverage intel tbb hash
2014-11-06 13:39:15 -08:00
Stephen Birarda
c80633499f
make eachNode callers return bool to say if iteration should continue
2014-11-06 11:35:07 -08:00
Stephen Birarda
e0c4f14c81
move networking lib to TBB concurrent_unordered_map
2014-11-06 11:19:16 -08:00
Stephen Birarda
a39ed798ae
replace libcuckoo requirement with tbb
2014-11-05 15:45:51 -08:00
Stephen Birarda
8a72cdd59d
leverage new libcuckoo hash outside LimitedNodeList
2014-11-05 15:09:54 -08:00
Stephen Birarda
a492abc3a1
complete LimitedNodeList changes for new cuckoo hash
2014-11-05 14:40:56 -08:00
Atlante45
4460e23b68
Suppress repeated Hash mismatch debug messages
2014-11-05 23:08:00 +01:00
Stephen Birarda
35d0d31350
change the NodeHash to a cuckoohash_map with CityHash
2014-11-05 13:54:38 -08:00
Stephen Birarda
b8d0bd5d6b
allow a target to bubble up required includes
2014-11-05 13:25:32 -08:00
Stephen Birarda
118b3133c5
change call to std::abs to abs in SequenceNumberStats
2014-11-05 11:45:14 -08:00
Atlante45
4b73a5ac35
Modify injected audio stream to send the ignore penumbra option
2014-11-05 16:22:06 +01:00
Stephen Birarda
beb350d1e7
fix for HifiSockAddr lookup for ice server from DomainHandler
2014-11-04 13:53:56 -08:00
Stephen Birarda
d46f775f20
async and sync nomenclature flip
2014-11-04 13:23:53 -08:00
Brad Hefta-Gaub
bc51d13c9a
Merge pull request #3726 from birarda/domain-tunnel
...
allow for case insensitivity in domain-server allowed users
2014-11-03 15:52:55 -08:00
Stephen Birarda
0348251cc1
allow case insensitivity for allowed users in domain-server
2014-11-03 15:32:45 -08:00
Stephen Birarda
88300f06ad
cleanup some debug in HifiSockAddr for hostname lookup
2014-11-03 15:14:39 -08:00
Stephen Birarda
74753e5b8b
allow a blocking lookup of IP address in HifiSockAddr
2014-11-03 15:13:41 -08:00
Stephen Birarda
acef1b868c
Revert "Revert "don't allow a HifiSockAddr lookup to block application""
...
This reverts commit fabc3aea57
.
2014-11-03 15:05:40 -08:00
Stephen Birarda
fabc3aea57
Revert "don't allow a HifiSockAddr lookup to block application"
2014-11-03 12:54:28 -08:00
Stephen Birarda
9e1da64895
use different include style for QHostInfo
2014-11-03 12:03:10 -08:00
Stephen Birarda
e976942515
fix includes for HifiSockAddr
2014-11-03 11:44:15 -08:00
Stephen Birarda
2746733687
don't allow HifiSockAddr lookup to block application
2014-11-03 10:46:17 -08:00
Philip Rosedale
e5c9ad4525
Merge pull request #3661 from Atlante45/reverb_fixed
...
Audio Environment packets
2014-10-28 18:11:14 -07:00
Brad Hefta-Gaub
7ecc0ccb30
Merge pull request #3683 from birarda/lobby
...
fix for location naming break after AddressManager changes
2014-10-28 17:58:34 -07:00
Brad Hefta-Gaub
be65a798db
Merge pull request #3681 from birarda/verbose-log-silencer
...
logging tweaks to reduce spam from repeated log messages
2014-10-28 17:58:17 -07:00
Stephen Birarda
33c247918e
fix for domainID wrapped in braces
2014-10-28 15:37:42 -07:00
Stephen Birarda
2816e8f114
fix location DataWebDialog missing InterfaceLocation object
2014-10-28 15:32:23 -07:00
Stephen Birarda
424793b905
complete output of suppressed repeated messages to log
2014-10-28 14:49:14 -07:00
Stephen Birarda
8e3102266a
use the LogHandler in Interface
2014-10-28 14:23:34 -07:00
Stephen Birarda
d3bbd251db
move Logging to LogHandler
2014-10-28 13:59:23 -07:00
Stephen Birarda
2711ff2b5f
move functionality from VerboseLoggingHelper into the Logging class
2014-10-28 13:48:53 -07:00
Stephen Birarda
8a4c716452
leverage the VerboseLoggingHelper for packets from unknown nodes
2014-10-28 12:15:52 -07:00
Stephen Birarda
27f7cdb2d4
handle location set/get in AddressManager, handle set to address map
2014-10-28 10:35:56 -07:00
Stephen Birarda
b90db2856b
add a method to AddressManager to handle address maps from JS
2014-10-28 10:00:39 -07:00
Atlante45
847ef64b66
move audio env data over to new packet
2014-10-24 14:27:55 -07:00
Atlante45
6072fd4066
Added audio env packet type
2014-10-24 10:41:54 -07:00
Atlante45
d528c47a83
Bump audio packet version
2014-10-23 13:42:17 -07:00
Atlante45
06d528fce5
bump audio version number
2014-10-23 09:28:48 -07:00
Andrzej Kapolka
d64b43693d
Networking fix.
2014-10-20 15:33:46 -07:00
Andrzej Kapolka
e98b99fe84
Merge pull request #3622 from birarda/domain-tunnel
...
work around double login issue by generating keypair on each launch
2014-10-17 18:05:45 -07:00
Stephen Birarda
5ecdb58e20
generate a new keypair on every interface launch
2014-10-17 16:55:50 -07:00
Brad Hefta-Gaub
023d47918f
Merge pull request #3620 from birarda/domain-tunnel
...
repairs to domain change reset to correctly clear nodes
2014-10-17 16:05:28 -07:00
Stephen Birarda
7cb8cbfdd4
repairs to domain change reset to clear nodes
2014-10-17 14:49:25 -07:00
ZappoMan
fc507850be
Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles
2014-10-16 20:36:28 -07:00
Stephen Birarda
1fb2dd4460
use OPENSSL_free to free DER private and public key buffers
2014-10-16 15:13:45 -07:00
Stephen Birarda
f9e9a743fb
fix error handled instances of key deletes
2014-10-16 14:49:12 -07:00
Stephen Birarda
f00a4aead6
fix for key deletes in generateRSAKeyPair
2014-10-16 14:44:17 -07:00
Stephen Birarda
7bbaaf6b78
cleanup some username signature debug, fix interest list pull
2014-10-16 11:54:55 -07:00
AndrewMeadows
4fbc589606
Merge pull request #3598 from birarda/domain-tunnel
...
initial pass at using keypairs for username verification for basic domain-server ACL
2014-10-16 10:49:03 -07:00
Stephen Birarda
e4b19545b0
generate a new keypair if one isn't found in settings
2014-10-15 10:36:21 -07:00
Stephen Birarda
50f27d3e16
handle verification of username signature during connection
2014-10-14 18:02:22 -07:00
Stephen Birarda
13f43dfc70
fix for remaining AccountManager converted callbacks
2014-10-14 16:20:17 -07:00
Stephen Birarda
e9bcc90166
handle remaining conversions for AccountManager passing QNetworkReply
2014-10-14 16:16:54 -07:00
Stephen Birarda
46fb7fb4a9
return QNetworkReply for AccountManager callbacks
2014-10-14 16:12:04 -07:00
Stephen Birarda
c4b0dc9dcc
initial handling of username signature in domain-server
2014-10-14 16:03:35 -07:00
Stephen Birarda
970f2c7fad
have DSAI generate a username signature upon request, when it has private key
2014-10-14 15:15:16 -07:00
Stephen Birarda
22b599b8cc
repair for persisting of Account to file after keypair generation
2014-10-14 14:21:18 -07:00
Stephen Birarda
bac6961235
fix node auth url to be HTTPS
2014-10-14 14:01:41 -07:00
Stephen Birarda
f8c89d0790
upload the generated public key to data-web, add getter for private key
2014-10-14 13:51:41 -07:00
Stephen Birarda
7ce806b746
fire off generation of key-pair in conjunction with login, store private key
2014-10-14 12:12:32 -07:00
Stephen Birarda
69402e275c
use DER format for generated keys in RSAKeypairGenerator
2014-10-14 11:51:58 -07:00
Stephen Birarda
912512936e
add RSAKeypairGenerator to generate a 2048-bit keypair
2014-10-14 11:36:40 -07:00
Stephen Birarda
14d4dd1f4b
add a private key string to DataServerAccountInfo
2014-10-14 10:43:13 -07:00
Stephen Birarda
cca8b68d2e
update location and profile paths for new format
2014-10-14 10:40:58 -07:00
Stephen Birarda
20f97792bf
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-14 09:26:11 -07:00
Andrzej Kapolka
60576bdcbd
Basic metavoxel scripting bits.
2014-10-13 15:05:16 -07:00
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -07:00
Andrzej Kapolka
1d4d36444f
Bumped the metavoxel version number.
2014-10-10 17:34:16 -07:00
Stephen Birarda
76d00f351d
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-10 09:28:14 -07:00
Stephen Birarda
f637f5a4a6
always allow connection from localhost user
2014-10-09 17:07:32 -07:00
Stephen Birarda
31df339565
pipe username signature requirement through to DomainHandler
2014-10-09 16:53:22 -07:00
Andrzej Kapolka
66b83d0ff9
Increment packet version to avoid crashes.
2014-10-09 14:31:41 -07:00
Stephen Birarda
b368e866fb
change oauth request packet type to username request
2014-10-08 14:26:23 -07:00
Stephen Birarda
7773a94df7
resolve conflicts on merge with upstream master
2014-10-08 09:27:16 -07:00
Stephen Birarda
f19c5c9850
repair NetworkAccessManager returns, handle custom AS port in assignment-client
2014-10-06 14:57:38 -07:00
Stephen Birarda
499e748d54
rebind the node socket when switching to ThreadedAssignment
2014-10-06 13:45:11 -07:00
Stephen Birarda
319cf34b83
use an ephemeral port when using auto-networking for domain-server
2014-10-06 12:24:18 -07:00
Stephen Birarda
253fe53571
cleanup a couple of debug lines
2014-10-06 12:24:12 -07:00
Stephen Birarda
484c0d30cb
don't require refresh of NetworkAccessManager, should handle restarts
2014-10-06 09:54:52 -07:00
Stephen Birarda
78f8aba504
fix for NetworkAccessManager getInstance return
2014-10-06 09:44:47 -07:00
Stephen Birarda
a441c5fb16
don't use an unecessary subclass of QNetworkAccessManager
2014-10-06 09:42:47 -07:00
Stephen Birarda
89cc7c7b0d
add an optional forced reset of NetworkAccessManager
2014-10-06 09:35:44 -07:00
Stephen Birarda
f89b225da2
handle local socket changes by monitoring every so often
2014-10-06 09:17:25 -07:00
Stephen Birarda
5203113b41
separate ICE ID and domain ID for reconnections to moved domains
2014-10-03 17:01:33 -07:00
Stephen Birarda
4e0bb94cdd
fix for double ICE connect attempts from domain-server
2014-10-03 15:25:47 -07:00
Stephen Birarda
52ec949aac
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-03 11:26:23 -07:00
Stephen Birarda
ea0a1a4fb6
don't store domain hostname, leverage AddressManager only
2014-10-03 10:46:05 -07:00
Stephen Birarda
96aacab8ab
load Address from settings to get back to domain and path
2014-10-03 10:42:15 -07:00
Stephen Birarda
f27105100a
have AddressManager know its current domain and current path
2014-10-03 10:29:02 -07:00
Stephen Birarda
cb6e420392
fix for peer addition from ice-server
2014-10-03 09:50:58 -07:00
Stephen Birarda
55a7180838
re-send heartbeat to ICE server after max connection attempts
2014-10-03 09:47:15 -07:00
Stephen Birarda
d9e0c91e02
remove a peer in domain-server after max connection attempts
2014-10-03 09:45:44 -07:00
Stephen Birarda
63024663b2
don't require settings request for agent nodes
2014-10-03 09:37:13 -07:00
Stephen Birarda
c96e7f72f8
use the ice server sock addr returned for the domain
2014-10-03 09:31:38 -07:00
Stephen Birarda
720f8ecae8
handle case where access_token is empty
2014-10-03 09:08:27 -07:00
Stephen Birarda
49d081088a
mode nodes to connected hash upon ping reply receipt
2014-10-03 08:58:03 -07:00
Stephen Birarda
5786d828a0
pass ICE client ID through to domain-server for identification
2014-10-02 17:30:48 -07:00
Stephen Birarda
0d4ef4aaca
ping connecting ICE peers from domain-server
2014-10-02 17:18:05 -07:00
Stephen Birarda
63877b0756
handle domain connection via ICE from NodeList
2014-10-02 16:51:12 -07:00
Stephen Birarda
c7aaf0ce4a
handle ping out from node requiring ice connection to domain
2014-10-02 16:24:46 -07:00
Stephen Birarda
c36774e85d
handle ice response packet in domain handler
2014-10-02 16:05:15 -07:00
Stephen Birarda
956c212db2
manage sets of potential connections in ice server
2014-10-02 15:24:23 -07:00
Stephen Birarda
d26a94f84c
remove inactive peers from memory in IceServer
2014-10-02 15:00:59 -07:00
Stephen Birarda
970ba2296a
initial response from ice server to nodes
2014-10-02 14:50:48 -07:00
Stephen Birarda
6425276eb0
have domain-server using full networking heartbeat with ice-server
2014-10-02 14:33:39 -07:00
Stephen Birarda
262054d0eb
handle ICE requirement in address manager response
2014-10-02 14:18:17 -07:00
Stephen Birarda
11659401ee
add an identifier for repeated requests to the ice server
2014-10-02 13:47:53 -07:00
Stephen Birarda
cca1c30207
build out more of the ice-server, make connect requests from NodeList
2014-10-02 13:39:58 -07:00
Stephen Birarda
e0a721209a
add a Node superclass to handle P2P connection
2014-10-02 09:55:00 -07:00
Stephen Birarda
15156519b3
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-01 16:19:16 -07:00
Andrzej Kapolka
1ca212f43d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-01 11:55:27 -07:00
Stephen Birarda
ac4a767d60
include memory for auto_ptr
2014-09-30 15:25:40 -07:00
Stephen Birarda
cd9029bb92
add some debug to NodeList instance refresh
2014-09-30 14:59:12 -07:00
Stephen Birarda
9950ed9f9f
use auto_ptr in NodeList and LimitedNodeList for cleaner mem management
2014-09-30 14:57:32 -07:00
Andrzej Kapolka
70847ff3f9
Allow painting boxes that aren't grid-aligned; merged color and material
...
tools.
2014-09-30 14:53:19 -07:00
Stephen Birarda
fed7dad2b6
use an auto_ptr to be able to reset the AccountManager
2014-09-30 14:36:32 -07:00
Stephen Birarda
3969c8bfe0
don't allow a username and password for domain auth, require access token
2014-09-30 12:23:04 -07:00
Andrzej Kapolka
001af5f982
Simplify the message situation by removing color-only edits.
2014-09-30 12:17:35 -07:00
Stephen Birarda
3cbfad69cd
fix indentation issues for merged AddressBarDialog classes
2014-09-26 14:32:59 -07:00
stojce
c14bf84af8
layout fix
2014-09-24 00:14:00 +02:00
stojce
5a7b7cca44
Add finish lookup event
2014-09-23 11:32:16 +02:00
stojce
466dbdcee5
added address bar dialog
2014-09-22 20:51:19 +02:00
Stephen Birarda
a0675162b6
hook My Locations to data-web dialog
2014-09-18 09:35:33 -07:00
Stephen Birarda
e2c3b626b3
add a DataWebDialog for authenticated access to data-web html
2014-09-18 09:05:25 -07:00
Stephen Birarda
9ee063bdc1
remove the access token from API urls and put in Authorization header
2014-09-17 16:00:20 -07:00
Craig Hansen-Sturm
7b3f61ddc2
Merge pull request #3428 from ZappoMan/sendPositonOrientationInSilentPackets
...
Send positon orientation in silent packets
2014-09-16 13:39:06 -07:00
ZappoMan
9cbc53abc3
pack position and orientation in silent frames
2014-09-16 13:06:46 -07:00
Stephen Birarda
885030a10c
handle receipt of new public socket and propogation to data-server
2014-09-16 12:37:22 -07:00
Stephen Birarda
866f2005bd
handle case where a location should be faced
2014-09-16 10:08:21 -07:00
Stephen Birarda
0033dfe5af
use quat orientation to store locations and user locations
2014-09-16 09:57:21 -07:00
Stephen Birarda
4cef21aa4f
don't prepend relative paths with hifi scheme
2014-09-16 09:14:06 -07:00
Stephen Birarda
3b21348a63
make sure AddressManager signal is connected to before file event
2014-09-12 15:22:51 -07:00
Stephen Birarda
29dae39ad7
handle location lookup for offline user or not found
2014-09-12 15:01:08 -07:00
Philip Rosedale
3fbe183196
Merge pull request #3402 from ZappoMan/stretchableEntities
...
New Entities Features
2014-09-12 13:57:45 -07:00
Stephen Birarda
f0ead98a2a
put back LocationScriptingInterface so it works prior to replacement
2014-09-12 13:28:18 -07:00
Stephen Birarda
892e0e7cbf
fix node auth url, NAN break on windows
2014-09-12 11:43:50 -07:00
Stephen Birarda
88a75a3585
fix for goToUser from ChatWindow
2014-09-12 11:27:54 -07:00
Stephen Birarda
1084483dd5
fix for default param of default constructed quat
2014-09-12 11:22:34 -07:00
Stephen Birarda
93ff34baaa
force address bar lookup through handleLookupString
2014-09-12 11:21:38 -07:00
Stephen Birarda
ab7df8679d
fix broken hifi linking
2014-09-12 11:19:22 -07:00
Stephen Birarda
1f2020d169
some url handling repairs, move existing error reply handlers to new format
2014-09-12 10:13:33 -07:00
Stephen Birarda
745edb8b0a
fix error handling for location naming
2014-09-12 09:10:47 -07:00
ZappoMan
024f1b47c2
Merge branch 'master' of https://github.com/highfidelity/hifi into stretchableEntities
...
Conflicts:
interface/src/entities/RenderableBoxEntityItem.cpp
interface/src/entities/RenderableModelEntityItem.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/shared/src/Extents.h
2014-09-12 08:18:09 -07:00
Stephen Birarda
b56ea5c936
centralize path creation from position and orientation to AddressManager
2014-09-11 17:17:47 -07:00
Stephen Birarda
23a0ef2de1
remove some spacing in AddressManager
2014-09-11 12:13:13 -07:00
Stephen Birarda
6d21c4bf0d
make lookup for hostnames case insensitive
2014-09-11 11:07:42 -07:00
Stephen Birarda
684aa97b98
add port parsing for domain hostname in address bar
2014-09-11 11:00:24 -07:00
Stephen Birarda
aaabe6b1e1
handle domain changes via address bar
2014-09-11 10:45:45 -07:00
Stephen Birarda
71f2c0b542
initial addition of the AddressManager with location switch hooked up
2014-09-11 10:14:00 -07:00
Stephen Birarda
ee6a90dd54
allow domain to pass down its ID from config
2014-09-10 15:13:02 -07:00
wangyix
7a2897fb6b
fixes/patches for win32/vs2013 startup and shutdown
2014-09-10 12:24:59 -07:00
ZappoMan
b78b8ccbb0
first cut at replacing radius with dimensions
2014-09-09 13:33:05 -07:00
ZappoMan
f234dbf9a1
converting voxel files to new versioned format with buffer breaks
2014-09-05 10:51:08 -07:00
Stephen Birarda
e338c600c3
add debug to show that domain connection is being attempted
2014-09-04 09:29:29 -07:00
ZappoMan
0acbefb6a2
fix but in getMyChildContaining and performance improvement to moving entities
2014-09-03 08:06:42 -07:00
ZappoMan
2bcad6ab2b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-08-28 21:19:56 -07:00
Craig Hansen-Sturm
e941e58626
merge HEAD with PR-3281
2014-08-26 18:25:40 -07:00
Andrzej Kapolka
2dfabdfe64
Support for scaling splat textures in S and T, use mipmaps for them.
2014-08-22 16:43:09 -07:00
Andrzej Kapolka
e9e3671710
Increment the version number.
2014-08-21 18:14:10 -07:00
ZappoMan
3a5a38c342
support chunk sizes in SVO file, allows for chunk based reading of SVO file and fixes issues with entities spanning chunks in file
2014-08-19 10:53:45 -07:00
ZappoMan
32d5eb3cea
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
AndrewMeadows
4b7208ac53
Merge pull request #3280 from huffman/19907
...
Code Review for Job #19907
2014-08-18 10:20:01 -07:00
Stephen Birarda
c58bae9021
attempt to change buffers to 1MB only
2014-08-14 14:27:09 -07:00
Stephen Birarda
1e65a093f2
decouple audio-mixer packet receipt from main thread
2014-08-14 12:37:57 -07:00
Stephen Birarda
64c11ebf8f
don't change the socket buffer sizes if it is already larger
2014-08-14 10:36:54 -07:00
Stephen Birarda
ec260dbab2
change both send and receive socket buffers
2014-08-13 15:50:11 -07:00
ZappoMan
49e616dd49
first cut at using erase entity message to delete entities
2014-08-13 14:11:56 -07:00
wangyix
db0fbcab97
merge with upstream
2014-08-13 11:09:55 -07:00
wangyix
184e4b8bde
sestets added to jitter tester
2014-08-12 14:38:28 -07:00
Philip Rosedale
0e72c6a0b6
Merge pull request #3269 from ey6es/metavoxels
...
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
2014-08-12 00:40:14 -07:00
Ryan Huffman
cb76e3ead0
Merge branch 'master' of github.com:highfidelity/hifi into 19907
2014-08-11 18:44:31 -07:00
Ryan Huffman
d1672b510d
Add DomainHandler::disconnectedFromDomain signal
2014-08-11 18:41:07 -07:00
AndrewMeadows
e5c2a099b8
Merge pull request #3268 from birarda/take-out-the-trash
...
cmake (in)sanity
2014-08-11 09:15:38 -07:00
ZappoMan
275a5c4a47
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
2014-08-08 15:13:55 -07:00
ZappoMan
027b1d58cc
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
interface/src/entities/EntityTreeRenderer.h
interface/src/models/ModelTreeRenderer.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.h
2014-08-08 14:26:56 -07:00
Andrzej Kapolka
468a3d4d67
Bump up the packet version.
2014-08-08 14:18:32 -07:00
wangyix
0dfe0b1f2a
merged with master
2014-08-08 13:32:27 -07:00
Stephen Birarda
17df6484d4
remove ssize_t and replace with size_t or int where appropriate
2014-08-08 13:17:53 -07:00
Stephen Birarda
45afce48f7
remember old session UUID in AvatarHashMap to work around ghosting
2014-08-08 13:14:03 -07:00
Philip Rosedale
d552b7ca97
Merge pull request #3246 from wangyix/inbound_audio_stream
...
Improved SequenceNumberStats handling of out-of-sync seq nums
2014-08-04 14:30:45 -07:00
ZappoMan
3a8c5018ee
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
interface/src/Application.h
libraries/entities/src/EntityTreeElement.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/models/src/ModelTree.cpp
libraries/models/src/ModelTree.h
libraries/models/src/ModelTreeElement.cpp
libraries/networking/src/PacketHeaders.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
wangyix
d394c203b6
improved re-sync handling of SequenceNumberStats
...
removed "duplicate" category since it's not 100% accurate
2014-08-04 11:09:20 -07:00
Philip Rosedale
69558dc574
Merge pull request #3245 from wangyix/inbound_audio_stream
...
Improved SequenceNumberStats
2014-08-04 07:49:31 -07:00
Philip Rosedale
321b8de898
Merge pull request #3230 from Barnold1953/rockPaperScissors
...
Rock Paper Scissors CA script
2014-08-03 13:03:11 -07:00
wangyix
99df05f770
forgot member in reset()
2014-08-01 16:54:29 -07:00
wangyix
1d74ae8197
code cleanup
2014-08-01 16:49:21 -07:00
wangyix
fc670d9edb
minor threshold change
2014-08-01 16:44:01 -07:00
wangyix
f9ec7b6c18
redesiged SequenceNumberStats child instance handling
2014-08-01 16:13:52 -07:00
wangyix
eba07b03e2
recursive SequenceNumberStats; untested
2014-08-01 12:00:41 -07:00
wangyix
e1f905cb36
fixed >100% loss rate bug in SequenceNumberStats
2014-08-01 10:27:51 -07:00
Stephen Birarda
6024b90932
remove extra debug line
2014-07-31 14:08:52 -07:00
Stephen Birarda
8986e62b8a
add distinction between hard reset and soft reset for DomainHandler
2014-07-31 14:08:25 -07:00
Stephen Birarda
adcf45583e
clear domain settings on NodeList reset
2014-07-31 14:06:43 -07:00
Stephen Birarda
3c459d8460
fix include of tgmath for windows
2014-07-31 11:12:41 -07:00
Stephen Birarda
e1ba076a71
complete redemption of signed transactions from octree server
2014-07-31 11:03:12 -07:00
ZappoMan
77e1867b11
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
assignment-client/src/Agent.h
examples/editModels.js
interface/src/Application.h
2014-07-31 10:34:23 -07:00
barnold1953
2c04963242
Merge branch 'master' of https://github.com/highfidelity/hifi into rockPaperScissors
2014-07-31 10:16:35 -07:00
Stephen Birarda
453c37f4b9
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
2014-07-31 10:05:40 -07:00
Stephen Birarda
eadae8ed1a
allow unauthenticated redemptions of signed transactions from octree server
2014-07-31 10:05:26 -07:00
Stephen Birarda
ce4336894a
actually send signed transaction from PaymentManager
2014-07-31 09:26:18 -07:00
Stephen Birarda
363cef6d8a
move satoshi costs to VoxelEditPacketSender
2014-07-30 17:33:37 -07:00
wangyix
af5eedb50e
fixed sequenceNumberStats sender changed msgs
2014-07-30 11:39:29 -07:00
Stephen Birarda
2c8808e922
repairs to cost calculations for voxels
2014-07-30 09:45:33 -07:00
Stephen Birarda
9dbe74b02f
parse voxel costs to the DomainHandler object
2014-07-29 17:22:17 -07:00
Stephen Birarda
85b8449e83
use two different signals for settings success and failure
2014-07-29 11:17:27 -07:00
wangyix
4825457f4d
silent audio packet type generalized
2014-07-28 16:49:53 -07:00
Stephen Birarda
84b86c17b7
use common settings retreival code to block before run in AudioMixer
2014-07-28 15:16:59 -07:00
Stephen Birarda
dbf41c8a42
allow domain-server to serve settings publicly, fix retry in DomainHandler
2014-07-28 14:56:26 -07:00
ZappoMan
805a88b73b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
examples/editModels.js
interface/src/entities/EntityTreeRenderer.h
libraries/models/src/ModelsScriptingInterface.cpp
libraries/script-engine/src/ScriptEngine.cpp
2014-07-28 13:39:35 -07:00
Stephen Birarda
6334116070
request domain settings after successful connection to domain
2014-07-28 12:07:19 -07:00
barnold1953
814dd0fcb6
Fixed another crash relating to undo stack. Made script support the
...
VoxelViewer
2014-07-18 11:37:13 -07:00
Stephen Birarda
5cad6edb38
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-17 14:06:11 -07:00
Brad Hefta-Gaub
437e3efbc2
Merge pull request #3179 from wangyix/quick_audio_PR
...
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
2014-07-17 11:44:05 -07:00
Stephen Birarda
45ae9f614d
add dialog to Menu to insert wallet private key
2014-07-17 11:43:30 -07:00
Stephen Birarda
0c8c4a2cf9
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-17 11:08:35 -07:00
Stephen Birarda
cb9a2c615e
use OpenSSL to create signed wallet transaction using hard-code key
2014-07-16 15:44:49 -07:00
wangyix
6764ace8eb
droppable silent packets are added for dropped packets;
...
_currentJitterBufferFrames replaced with moving average of frames
available. Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
2014-07-16 14:41:24 -07:00
Stephen Birarda
74a107f9f4
initial rev of SignedWalletTransaction that creates a message
2014-07-16 12:26:24 -07:00
Atlante45
5dca794322
On/Off for activity logger
2014-07-16 12:22:27 -07:00
ZappoMan
1eb472c43a
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
2014-07-15 10:05:06 -07:00
ZappoMan
2baac96665
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
examples/sit.js
interface/src/Application.cpp
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelsScriptingInterface.cpp
2014-07-15 10:04:40 -07:00
Leonardo Murillo
6bf06989db
Adding place/user go to logging
2014-07-14 15:24:47 -06:00
wangyix
25f4f63a1e
added window PacketStreamStats to AudioStreamStats
2014-07-10 16:42:23 -07:00
wangyix
01f10024ae
all stats added, needs testing; created PacketStreamStats struct
2014-07-09 18:13:33 -07:00
wangyix
81e168f657
added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg
2014-07-09 15:38:03 -07:00
wangyix
d03d3ef817
new auidostreamstats displayed in interface, domain page stats updated
2014-07-09 11:59:50 -07:00
ZappoMan
e800d5457b
Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities
2014-07-08 13:02:31 -07:00