Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-18 10:46:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37270 commits 25 branches 0 tags 1.1 GiB
Commit graph

1820 commits

Author SHA1 Message Date
Atlante45
05df84ee67 Remove AS stats namespace/Filter DS 2015-09-11 15:20:01 +02:00
Atlante45
15f7745bcc JSON stats reliable and ordered 2015-09-11 14:21:54 +02:00
Atlante45
801f32295d Update JSON stats building 2015-09-11 14:21:54 +02:00
Atlante45
08e0a8d705 AssetServer JSON stats 2015-09-11 14:21:53 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Brad Davis
aa989c3687 Fixing some entity race condition crashes 2015-09-10 20:53:17 -07:00
Stephen Birarda
d10095ed20 make sure AC PID is valid before acting on process 2015-09-10 16:55:25 -07:00
Seth Alves
7b656d5ead make a couple variable names better 2015-09-09 03:30:09 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Stephen Birarda
e1c395f5ea resolve conflicts on merge with upstream/master 2015-09-08 14:56:23 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Ryan Huffman
8fffb77f13 Add comment about byte range for ATP get asset request 2015-09-08 09:53:02 -07:00
Stephen Birarda
b2778bff09 fix a bad replacement for AC server hostname 2015-09-08 08:30:16 -07:00
Stephen Birarda
c49088846f add an alias for AvatarDataSequenceNumber 2015-09-08 08:26:14 -07:00
Rudi Chen
b703ce01fb Make sure libdl is linked after libcrypto. 
Fixes a `undefined reference to symbol 'dlclose@@GLIBC_2.2.5' error
I was running into on Linux Mint 17.2.
 2015-09-06 21:42:02 -04:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Seth Alves
0c8848a463 don't update _lastSendJointData if we didn't send 2015-09-03 15:41:40 -07:00
Seth Alves
1071b98260 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:38:46 -07:00
Seth Alves
36ca789d92 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:08:04 -07:00
Stephen Birarda
e5a10e3174 resolve conflicts on merge with upstream/master 2015-09-01 17:07:32 -06:00
Seth Alves
76923583ee Interface only sends joint data to avatar-mixer if they have changed enough since the last send 2015-09-01 13:31:34 -07:00
Ryan Huffman
db92e3155c Update AssetServerError enum to be camelcase 2015-09-01 09:39:30 -07:00
Stephen Birarda
4255220a69 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-31 16:04:44 -06:00
Stephen Birarda
cb903a8d06 fix the new send asset task 2015-08-31 15:30:18 -06:00
Stephen Birarda
dc7d7ef444 make SendAssetTask be consistent with new UploadAssetTask 2015-08-31 15:17:40 -06:00
Stephen Birarda
42105dfc33 replace mutexes with invoked methods in Socket 2015-08-28 16:34:24 -07:00
Stephen Birarda
3f85e8a2fe add an UploadAssetTask so uploading is on diff thread 2015-08-28 11:12:52 -07:00
Stephen Birarda
0b712eef55 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-28 09:10:12 -07:00
Stephen Birarda
28d9610bd4 add a listen port option to ACs 2015-08-28 07:31:17 -07:00
Atlante45
12fdec232b CR 2015-08-28 16:31:02 +02:00
Atlante45
ea05fcea0c Forward AssetResourceRequest loading errors 2015-08-28 16:03:31 +02:00
Ryan Huffman
efef60af04 Rename assetHashHex to hexHash 2015-08-27 15:57:35 -07:00
Ryan Huffman
8452289e00 Fix issue with raw hash not being converted to hex 2015-08-27 15:56:07 -07:00
Stephen Birarda
8eeb808572 Merge branch 'protocol' of github.com:birarda/hifi into asset-hash 2015-08-27 15:16:41 -07:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Stephen Birarda
eae90cbe8a resolve conflicts on merge with origin/protocol 2015-08-27 14:47:35 -07:00
Ryan Huffman
5aa5bca8f7 Add path to headers 2015-08-27 14:29:54 -07:00
Stephen Birarda
86a7a42d24 use compact hash representation for asset-server 2015-08-27 14:22:21 -07:00
Stephen Birarda
f3797964e2 resolve conflicts on merge with huffman/atp-server 2015-08-27 12:21:15 -07:00
Stephen Birarda
16eee10cab repairs to permission error for asset-server upload 2015-08-27 12:13:20 -07:00
Stephen Birarda
c212ef5734 fix PacketReceiver cleanup, return permission error for upload 2015-08-27 12:01:24 -07:00
Ryan Huffman
a49a1eb0d6 Add extension to atp requests 2015-08-27 11:51:45 -07:00
Ryan Huffman
628f275013 Fix asset server upload errors 2015-08-27 10:07:53 -07:00
Ryan Huffman
3731091d5e Remove max chunk requesting from SendAssetTask 2015-08-27 09:30:47 -07:00
Ryan Huffman
f95957a271 Cleanup AssetServer 2015-08-27 09:30:34 -07:00
Ryan Huffman
4ed5748afa Fix new asset loading in directory 2015-08-26 15:37:58 -07:00
Ryan Huffman
287f2533eb Remove AssetServer dtor 2015-08-26 15:37:38 -07:00
Ryan Huffman
d66c521200 Move SendAssetTask to separate file 2015-08-26 15:37:23 -07:00
Ryan Huffman
34f7aa74f3 Move SendAssetTask declaration to header 2015-08-26 14:27:46 -07:00
Ryan Huffman
2e585256ff Update asset hash to Sha256 2015-08-26 14:20:24 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Ryan Huffman
9b174bfbf4 Remove extension from filename 2015-08-26 09:28:19 -07:00
Ryan Huffman
d503c5293a Remove commented out line 2015-08-26 09:28:06 -07:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Ryan Huffman
85f80ff6f9 Update AssetServer to use PacketList 2015-08-25 15:05:35 -07:00
Ryan Huffman
0352782e46 Add SendAssetTask 2015-08-25 12:46:44 -07:00
Ryan Huffman
b865a3f8fb Add thread pool to AssetGet requests 2015-08-25 12:41:55 -07:00
Stephen Birarda
d76e8a7e48 remove double settings request for testing 2015-08-25 11:27:31 -07:00
Stephen Birarda
f7799bcf8f add TODO for settings fail, cleanup 2015-08-24 17:02:47 -07:00
Thijs Wenker
f512205f6f add ability to include scripts from a relative path in assignment-client (for persistent scripts only) 2015-08-22 01:30:07 +02:00
Thijs Wenker
176d7372ad add QWebSockets to assignment-client project (cmake) 2015-08-21 23:03:26 +02:00
Thijs Wenker
d89ecc1e42 Move WebSocketServer to be accessable from Assignment-Client:Agent only. 2015-08-21 22:43:49 +02:00
Ryan Huffman
0a290da529 Merge branch 'ordered-sending' into atp-server 2015-08-20 11:50:06 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Atlante45
62c76d0332 registerListenerForTypes optimisations 2015-08-20 14:56:35 +02:00
Seth Alves
2056f588e3 if environment variable HIFI_MEMORY_DEBUGGING is defined when cmake is run, enable -fsanitize=address on linux 2015-08-19 18:03:16 -07:00
Stephen Birarda
6860f3d126 add readWithoutCopy for clarity in Packet read 2015-08-19 14:32:26 -07:00
Stephen Birarda
42a7262707 Merge pull request #5565 from murillodigital/node-version 
DO NOT MERGE - Node versioning
 2015-08-19 13:32:48 -07:00
Ryan Huffman
5884fcb17b Merge branch 'ordered-sending' into atp-server 2015-08-19 12:23:31 -07:00
Ryan Huffman
a168a1058f Update filename regex in AssetServer to allow extensions 2015-08-19 12:09:46 -07:00
Stephen Birarda
fd43c48eac resolve conflicts on merge with birarda/protocol 2015-08-18 11:48:36 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
Stephen Birarda
d9f445d5f6 put custom hashing for UUID in UUIDHasher 2015-08-17 16:45:15 -07:00
Seth Alves
4a456488a1 remove the option to persist entities as anything other than json.gz files 2015-08-17 14:01:25 -07:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Stephen Birarda
052978898e resolve conflicts on merge with upstream master 2015-08-05 11:16:20 -07:00
Ryan Huffman
027adf73bb Merge branch 'master' of github.com:highfidelity/hifi into asset-server 2015-08-03 16:41:24 -07:00
Ryan Huffman
5258474f98 Update AssetServer with GetInfo packet 2015-08-03 16:24:34 -07:00
Stephen Birarda
41c6220731 resolve conflicts on merge with upstream/master 2015-07-31 17:27:23 -07:00
Seth Alves
bbee001366 Merge pull request #5470 from birarda/master 
fix for unique_ptr<char> allocations
 2015-07-31 15:09:18 -07:00
Stephen Birarda
b0afdb21ad correct the unique_ptr char allocations 2015-07-31 14:29:05 -07:00
Stephen Birarda
1ad2f515de Merge pull request #5455 from thoys/assignment-agent-ping-fix 
Fixes Assignment-Agents to have no constantly reconnecting Avatar/AudioMixer
 2015-07-31 10:41:52 -07:00
Atlante45
9e7644ee78 Change headers/payload size computation 2015-07-30 15:05:51 -07:00
Stephen Birarda
fc80e427b9 remove names from audio-mixer jitter calc comments 2015-07-30 11:08:45 -07:00
Atlante45
b8085086c6 HifiSockAddr have object names 2015-07-29 17:28:37 -07:00
Thijs Wenker
7325e6a7b7 Send ping requests to the nodes (AvatarMixer, AudioMixer, EntityServer) that the Assignment agent connected with to keep the connections alive. 2015-07-29 14:57:06 +02:00
Stephen Birarda
862c788aec move payload adjustments to Packet 2015-07-23 15:27:32 -07:00
Ryan Huffman
4c42edf7fa Add AssetServer to AssignmentFactory 2015-07-23 15:07:40 -07:00
Ryan Huffman
bf9bfb4575 Add AssetServer 2015-07-23 15:07:20 -07:00
Stephen Birarda
19d0bf403c change NLPacket create signature for new headers 2015-07-23 14:06:10 -07:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00
Stephen Birarda
aa08bee69f initial work to make sequence # and bitfield lead all packets 2015-07-23 11:59:37 -07:00
Stephen Birarda
67ca8b2347 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-23 09:51:44 -07:00
Stephen Birarda
67294d3a23 rename nodesToKill to nodesToShutdown 2015-07-22 13:55:22 -07:00
Stephen Birarda
d22219a1f2 make myServer pointer an OctreeServer* again, it's not checked 2015-07-22 13:54:39 -07:00
Stephen Birarda
55b4784a02 avoid entity-server node/octree deadlock on shutdown 2015-07-22 13:52:49 -07:00
Stephen Birarda
9556fecbe2 initial changes to make _nodeSocket a udt::Socket 2015-07-20 17:10:22 -07:00
Stephen Birarda
1fd4a1f0c3 resolve conflicts on merge with upstream master 2015-07-17 16:07:45 -07:00
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Stephen Birarda
1c98c5e02c remove unregisterListener that isn't needed anymore 2015-07-17 11:20:05 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
Stephen Birarda
e7249594e1 unregister the AvatarHashMap packet registrations 2015-07-16 17:55:29 -07:00
Stephen Birarda
040c7557da fix double register for Agent avatar packets 2015-07-16 17:51:06 -07:00
Stephen Birarda
49f5a5ffcb remove double declaration of PacketReceiver 2015-07-16 17:46:46 -07:00
Stephen Birarda
ce6585ccc8 fix AC monitor and AM double register 2015-07-16 17:44:43 -07:00
Atlante45
b60e358a68 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 15:30:00 -07:00
Stephen Birarda
29f91267d9 repairs to nack packet receiving for entity-server 2015-07-16 15:29:50 -07:00
Atlante45
56886e479d Use BulkAvatarData packet type for AvatarMixer upstrea 2015-07-16 15:28:53 -07:00
Stephen Birarda
010cbd9934 don't handle octree query while server shutting down 2015-07-16 14:42:16 -07:00
Stephen Birarda
8921f59e23 fix entity packet send from interface client 2015-07-16 12:09:35 -07:00
Atlante45
c6f6dbd845 Fix QByteArray from rqw data 2015-07-16 09:59:15 -07:00
Stephen Birarda
1752d5e7ca fix mix packet sample copy bug 2015-07-15 17:52:37 -07:00
Stephen Birarda
863cc3390a fix send of mixed audio stream packet from AM 2015-07-15 17:41:00 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Stephen Birarda
5a2d59c530 fix ScriptEngine cleanup for Agent 2015-07-15 15:07:34 -07:00
Stephen Birarda
e90ace6231 fix child assignment UUID, adjust for NLPacket after unpack 2015-07-15 12:37:30 -07:00
Stephen Birarda
432048addf use macro for AvatarMixer, show type for unknown 2015-07-15 11:55:50 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
0327a8d477 fix bytesAvailable, don't double seek in Packet 2015-07-14 20:47:16 -07:00
Stephen Birarda
3bf93063d7 remove the OctreeServerDatagramProcessor 2015-07-14 17:22:42 -07:00
Atlante45
bfb9166b8e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:07:47 -07:00
Stephen Birarda
3cb4be6c02 fix order of setup at startup 2015-07-14 17:04:45 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Ryan Huffman
cb9e12f76a Fix using typeof when should be using sizeof 2015-07-14 16:20:36 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Ryan Huffman
e99df5b56d Fix size of statusPacket in AssignmentClient 2015-07-14 15:55:39 -07:00
Stephen Birarda
fb7cb7ff53 add the option for PacketReceiver to drop packets 2015-07-14 15:49:54 -07:00
Ryan Huffman
71866d52ed Update packet reading to use fromRawData for reading uuid 2015-07-14 15:43:00 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -07:00
Ryan Huffman
7e70e25db8 Update cast to dynamic_cast in AvatarMixer 2015-07-14 15:01:56 -07:00
Ryan Huffman
9d9ac6eefc Rename packetSizeWithHeader to be more descriptive 2015-07-14 15:00:36 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Ryan Huffman
dcb9c8d125 Fix AvatarMixer call to reinterpret_cast to use dynamic_cast 2015-07-14 14:51:37 -07:00
Ryan Huffman
24dddac6b2 Fix call to register for multiple packet types 2015-07-14 14:41:28 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Ryan Huffman
10c5589629 Update OctreeServer to use dynamic_cast 2015-07-14 14:26:06 -07:00
Ryan Huffman
921ee02414 Update EntityServer to use only 1 packet callback for all packet types 2015-07-14 14:25:09 -07:00
Ryan Huffman
f7c1eaf967 Update AssignmentFactory to use peekPrimitive 2015-07-14 14:24:08 -07:00
Ryan Huffman
1af01c9003 Fix style issue in AssignmentClientMonitor 2015-07-14 14:23:53 -07:00
Ryan Huffman
5cb8c1541a Update Agent to use peekPrimitive 2015-07-14 14:23:31 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Stephen Birarda
e3b5972344 use initializer list for packetReceiver register call 2015-07-14 11:21:02 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Ryan Huffman
b45af742ef Remove datagram processing from OctreeServer 2015-07-14 09:37:09 -07:00
Ryan Huffman
c1f026802a Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-13 16:21:39 -07:00
Stephen Birarda
1c9f43e5aa compile fixes for AC status packet 2015-07-13 16:03:05 -07:00
Stephen Birarda
8d38cd5670 use a specific packet type for AC child status 2015-07-13 15:58:44 -07:00
Ryan Huffman
4668914fe2 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/octree/OctreeServerDatagramProcessor.cpp
 2015-07-13 15:48:52 -07:00
Stephen Birarda
49ee35a41c remove call to processNodeData 2015-07-13 15:39:35 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Atlante45
81ad0056c3 Fix a few node deref 2015-07-13 15:34:37 -07:00
Atlante45
44c5d4a2bf Couple fixes SharedNodePointer > Node& 2015-07-13 15:29:41 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Stephen Birarda
f06636d45e repairs for other ThreadedAssignment subclasses 2015-07-13 15:16:55 -07:00
Ryan Huffman
a4ff18d9ec Remove OctreeServerDatagramProcessor 2015-07-13 15:03:10 -07:00
Stephen Birarda
26be492475 use same listener for many packets in AudioMixer 2015-07-13 14:46:56 -07:00
Stephen Birarda
d242f5d5d9 repair AudioMixerClientData parseData 2015-07-13 14:35:03 -07:00
Stephen Birarda
601e8d6e68 fix AssignmentClientChildData parseData override 2015-07-13 14:28:46 -07:00
Stephen Birarda
775c1b7310 Merge branch 'receive_packets' of https://github.com/huffman/hifi into atp 2015-07-13 14:26:23 -07:00
Ryan Huffman
9de6828b03 Remove readPendingDatagram from AudioMixer 2015-07-13 14:24:06 -07:00
Ryan Huffman
591c5d4b60 Fix EntityServer compilation errors 2015-07-13 12:06:43 -07:00
Ryan Huffman
9a977149a4 Update AvatarMixer to use packetReceiver 2015-07-13 12:06:32 -07:00
Ryan Huffman
cdbcaf0f7f Fix AudioMixer compilation errors 2015-07-13 12:06:12 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
Ryan Huffman
582de14917 Fix compilation errors in AssignmentClientMonitor 2015-07-13 09:25:57 -07:00
Ryan Huffman
879b880254 Fix non-ref var to PacketReceiver 2015-07-13 08:30:13 -07:00
Ryan Huffman
ed3b8afbd9 Update AssignmentClientMonitor to use PacketReceiver 2015-07-10 18:09:08 -07:00
Ryan Huffman
c86e481d4f Update OctreeServer packet receive handling 2015-07-10 17:28:27 -07:00
Ryan Huffman
28f6c4021b Fix compilation errors in EntityServer 2015-07-10 17:27:56 -07:00
Ryan Huffman
bfb878210f Fix compilation errors in AudioMixer 2015-07-10 17:27:45 -07:00
Ryan Huffman
8c04aafe67 Update Agent to use PacketReceiver 2015-07-10 17:08:07 -07:00
Ryan Huffman
e0d165bdd8 Fix packet type in AssignmentClient for StopNode 2015-07-10 16:48:28 -07:00
Ryan Huffman
cc7bfd90f1 Move audio packet handling to listener in Agent 2015-07-10 16:27:42 -07:00
Ryan Huffman
910836fa5a Remove readPendingDatagrams from AudioMixer 2015-07-10 16:14:40 -07:00
Ryan Huffman
0d920c7b7c Update method name in AssignmentClient 2015-07-10 16:14:23 -07:00
Ryan Huffman
5c831efe64 Remove avatar packet processing from Agent 2015-07-10 16:13:57 -07:00
Ryan Huffman
1fb4c13b3c Update AssignmentClient to use PacketReceiver 2015-07-10 15:51:12 -07:00
Ryan Huffman
74afbd7de7 Fix AudioMixer packetReceiver calls 2015-07-10 14:22:46 -07:00
Ryan Huffman
09f978207b Add packet handling to OctreeServer 2015-07-10 12:23:58 -07:00
Ryan Huffman
1ee7a83927 Add EntityServer packet handling 2015-07-10 12:23:35 -07:00
Ryan Huffman
99121a3a20 Fix AudioMixer not using PacketReceiver correctly 2015-07-10 12:22:53 -07:00
Atlante45
6c591131ba Made Animations safe for resource reload 2015-07-10 12:01:51 -07:00
Ryan Huffman
c841867044 Update AudioMixer to use PacketReceiver 2015-07-10 09:37:24 -07:00
Seth Alves
2dc4922da3 bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00
Atlante45
c77310019d Some .get() cleanup 2015-07-09 14:03:32 -07:00
Atlante45
f90f3a05be Fail in Packet::create if size is invalid 2015-07-09 13:11:43 -07:00
Atlante45
e1fc242967 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 12:45:46 -07:00
Stephen Birarda
14b73ae00f remove qtimespan that isn't used anymore 2015-07-09 12:45:32 -07:00
Atlante45
2b6d79e030 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 12:33:23 -07:00
Atlante45
e4051f9e30 Remove unnecessary .get() 2015-07-09 12:32:18 -07:00
Stephen Birarda
a38cb56c1c fix an accidental comment add 2015-07-09 11:56:24 -07:00
Stephen Birarda
8e693bfee7 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-09 11:53:27 -07:00
Atlante45
94d2fce1dd Fix sendNackPackets logic 2015-07-09 11:52:57 -07:00
Stephen Birarda
806862fae9 pass existing SharedNodePointer from EntityServer 2015-07-09 11:50:39 -07:00
Stephen Birarda
a49b985dad fix call to packetSent from EntityServer 2015-07-09 11:37:20 -07:00
Stephen Birarda
d3d3b84a20 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-09 11:36:21 -07:00
Stephen Birarda
83cc4380a7 fix for sentPacketHistory dequeue 2015-07-09 11:36:12 -07:00
Atlante45
cc0e0e6a1f Compile fixes in assignment client 2015-07-09 11:35:36 -07:00
Stephen Birarda
7e07754773 fix octreePacketSent call with const NLPacket& 2015-07-09 11:35:12 -07:00
Stephen Birarda
659f6742c6 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-09 11:21:36 -07:00
Stephen Birarda
922d6413d5 change some const unique_ptr to const NLPacket 2015-07-09 11:21:27 -07:00
Atlante45
297d38d4eb Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 11:20:25 -07:00
Atlante45
605b004514 Assigment client compile fixes 2015-07-09 11:19:36 -07:00
Stephen Birarda
885068bd6b create billboard and identity packets of the right size 2015-07-09 11:15:45 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Stephen Birarda
5dc09692b4 more packet creation fixes for entitites 2015-07-08 18:13:06 -07:00
Stephen Birarda
04b3ca3efd fix a bad replacement in AvatarMixer 2015-07-08 10:43:05 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Andrew Meadows
a0a1b01ea9 coalesce dupe action data members: _id and _type 2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7 make some arguments const, cleanup some #includes 2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821 some ObjectAction methods should be const 2015-07-07 17:50:08 -07:00
Stephen Birarda
6c6143f21e remove NetworkPacket and replace with NodePacketPair 2015-07-07 16:56:05 -07:00
Stephen Birarda
ff487ee092 move the AudioClient mix packet 2015-07-07 16:30:50 -07:00
Stephen Birarda
2a69a89696 Merge remote-tracking branch 'huffman/atp' into atp 2015-07-07 16:27:18 -07:00
Ryan Huffman
60538d4a82 Merge branch 'atp' of github.com:birarda/hifi into atp 
Conflicts:
	libraries/audio-client/src/AudioIOStats.cpp
 2015-07-07 16:26:22 -07:00
Ryan Huffman
3690ecc28f Add std::move to sendPacket calls 2015-07-07 16:24:11 -07:00
Stephen Birarda
631c745784 allow equal for piggyback check in OctreeSendThread 2015-07-07 16:21:14 -07:00
Stephen Birarda
6a76f858d8 close of PacketList not required to count last packet 2015-07-07 16:17:15 -07:00
Stephen Birarda
1f68ad892a replace PacketList usage with NLPacketList 2015-07-07 16:14:57 -07:00
Stephen Birarda
56880e8858 return fixes for NAK PacketLists 2015-07-07 15:33:03 -07:00
Stephen Birarda
ff18a05507 CR fixes for octree classes 2015-07-07 15:21:10 -07:00
Stephen Birarda
2944746629 add a TODO for reading NAK fix 2015-07-07 15:15:15 -07:00
Stephen Birarda
c8a03ebff8 cleanup NAK packets in OctreeInboundPacketProcessor 2015-07-07 15:14:27 -07:00
Stephen Birarda
adacf3fd89 CR fixes in AvatarMixer 2015-07-07 15:03:49 -07:00
Stephen Birarda
ffa6edc904 fix spaces created by xcode find/replace 2015-07-07 15:01:19 -07:00
Stephen Birarda
f6cd67f75e repairs to stats packet in AudioMixerClientData 2015-07-07 14:57:39 -07:00
Stephen Birarda
171ebf5437 fix for mix packet sizes in audio 2015-07-07 14:51:21 -07:00
Stephen Birarda
6760b048b6 fix for initialization of mute packet 2015-07-07 14:50:37 -07:00
Stephen Birarda
e7fee26d1a give specific packet size for audio env packet 2015-07-07 14:50:05 -07:00
Stephen Birarda
abfda21814 CR fixes in AssignmentClientMonitor 2015-07-07 14:47:36 -07:00
Stephen Birarda
e953b36f58 handle stats + data packet combination in OctreeSendThread 2015-07-07 12:56:20 -07:00
Stephen Birarda
01b1c46237 more networking API changes in octree classes 2015-07-07 12:31:22 -07:00
Stephen Birarda
fca23cc69b make SentPacketHistory use NLPacket 2015-07-07 12:14:40 -07:00
Stephen Birarda
74924bc5f1 initial changes to OctreeQueryNode for new APIs 2015-07-07 12:08:01 -07:00
Stephen Birarda
474b82e3bf fix nack packet sending in OctreeInboundPacketProcessor 2015-07-07 11:28:57 -07:00
Stephen Birarda
9a31b22243 use NLPacket and sendPacket for audio stream stats 2015-07-06 17:48:21 -07:00
Stephen Birarda
61c4e6d72e some network API reworking in AvatarMixer 2015-07-06 17:37:41 -07:00
Stephen Birarda
269bea65fb fix AssignmentClientMonitor and AudioMixer to use NLPacket 2015-07-06 17:20:08 -07:00
Stephen Birarda
37fd954066 remove used of PacketPayload in AudioMixer 2015-07-06 17:15:01 -07:00
Stephen Birarda
9a521fee47 change audio environment packet creation 2015-07-06 16:53:53 -07:00
Stephen Birarda
672c5a8414 use new packet creation for client audio 2015-07-06 16:49:48 -07:00
Stephen Birarda
5a57e9861c packet API changes in AssignmentClientMonitor 2015-07-06 16:38:33 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Stephen Birarda
b3c3e5a6c8 more PacketType to PacketType::Value replacements 2015-07-02 16:49:19 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
Seth Alves
246861221c rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready. 2015-07-01 20:17:21 -07:00
ZappoMan
24b4614703 add more detailed edit timing to entity server 2015-07-01 16:11:08 -07:00
ZappoMan
ce613d59fd add inbound edit packet queue depth to entity server 2015-07-01 14:46:37 -07:00
Seth Alves
5ab2c8d724 rename variable to be more descriptive 2015-07-01 12:24:50 -07:00
Seth Alves
e8a6acd65b responses to code review 2015-07-01 10:42:04 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Seth Alves
0970f010a4 provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are 2015-06-27 13:31:00 -07:00
Seth Alves
30be515a94 remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity 2015-06-27 08:53:27 -07:00
Seth Alves
005bd8bda5 merge from upstream 2015-06-26 12:33:35 -07:00
Stephen Birarda
a77cf4fb7f fix audio-mixer shutdown on UNIX/OS X 2015-06-25 16:34:38 -07:00
Seth Alves
f50ac9dcd5 remove debugging print 2015-06-22 13:12:05 -07:00
Seth Alves
5381e6e9bb entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion 2015-06-19 16:20:07 -07:00
Seth Alves
f9618ca2cb implicit cast 2015-06-18 10:07:12 -07:00
Seth Alves
7391aebf60 fix change that introduced interger division 2015-06-17 06:51:38 -07:00
Seth Alves
fdd5953e44 fix change that introduced interger division 2015-06-17 06:48:06 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Stephen Birarda
81460e48f4 fix for sticking windows audio-mixer 2015-06-11 17:25:27 -07:00
Seth Alves
32cc0eacfc improve a debug print 2015-05-22 15:21:26 -07:00
Seth Alves
53fe41ef4d improve a debug print 2015-05-22 15:11:56 -07:00
Seth Alves
945a84d24f adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum 2015-05-22 15:01:43 -07:00
Seth Alves
52ce26d80d Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-21 09:20:56 -07:00
Seth Alves
7ee2ff6777 Merge pull request #4922 from birarda/ac-ice-connect 
handle AC started before local assignment server
 2015-05-20 19:40:24 -07:00
Seth Alves
38edc27cbb Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 18:24:40 -07:00
Brad Davis
079a7f2600 Fix assert caused by calling glm::perspective with nonsensical values 2015-05-20 18:11:14 -07:00
Stephen Birarda
b6f458eaf1 Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect 2015-05-20 17:59:40 -07:00
Stephen Birarda
45daabc86f remove unused AssignmentClient shared mem var 2015-05-20 17:14:27 -07:00
Stephen Birarda
bea387af7d extra debug for failed local AS port read 2015-05-20 17:13:18 -07:00
Stephen Birarda
7373bb6817 contain QSharedMemory for local server port to reader 2015-05-20 17:11:08 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Brad Davis
c94b8b6e30 Merge branch 'master' into dk1 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-05-13 21:25:56 -07:00
Stephen Birarda
ca87d64dc7 fix for audio-mixer shutdown hang, removing spaces 2015-05-13 12:03:21 -07:00
Brad Davis
41d587bd2e Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"" 
This reverts commit 6e8c067bcb.

Conflicts:
	interface/src/Camera.h
 2015-05-12 14:47:44 -07:00
samcake
6e8c067bcb Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff" 2015-05-12 14:34:43 -07:00
Brad Davis
464925ecc7 Fixing the assignment client 2015-05-12 01:15:30 -07:00
Seth Alves
866a6fba9b Merge pull request #4823 from birarda/master 
repairs to AC stop and clean shutdown
 2015-05-11 18:11:52 -07:00
Stephen Birarda
a6ce721586 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-05-11 16:20:16 -07:00
Stephen Birarda
7b903d29e7 fix missed conflict on merge with upstream/master 2015-05-11 12:58:00 -07:00
Seth Alves
83748096ef max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree 2015-05-11 11:37:53 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Stephen Birarda
2dc866755d fix OS comments, remove test call from Agent 2015-05-11 09:56:10 -07:00
Stephen Birarda
ebeba81233 make sure an ACM asks for PID in log 2015-05-08 17:37:48 -07:00
Stephen Birarda
be03a65dc7 remember the pid of previous child processes 2015-05-08 17:30:22 -07:00
Stephen Birarda
7b91dbfe07 wait on all children simultaneously 2015-05-08 17:24:20 -07:00