Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 23:20:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35227 commits 72 branches 59 tags 1.2 GiB
Commit graph

1625 commits

Author SHA1 Message Date
Stephen Birarda
0db88ba572 fix a typo in comment 2015-10-06 15:06:28 -07:00
Stephen Birarda
4c695b179a remove out of order assert in avatar-mixer 2015-10-06 15:04:48 -07:00
Stephen Birarda
593153deec add receive rate and inbound kbps to av stats 2015-10-06 14:58:51 -07:00
Stephen Birarda
9bc95a0fc1 fix override warnings in assignment-client 2015-10-05 15:17:10 -07:00
Anthony J. Thibault
fc7b6dee84 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
Anthony J. Thibault
fa864d29f9 Merge branch 'master' into transmit-joint-translation 2015-10-01 16:55:24 -07:00
Howard Stearns
73e81d1da5 Merge pull request #5966 from ZappoMan/fixScriptStopAgentCrash 
real fix for crashing avatar agents
 2015-09-30 17:45:41 -07:00
Brad Hefta-Gaub
c01077a0d7 real fix 2015-09-30 17:30:34 -07:00
Ryan Huffman
23b057cbb2 Merge pull request #5961 from ZappoMan/fixScriptStopAgentCrash 
possible fix for crashing agents acting like avatars
 2015-09-30 16:24:41 -07:00
Brad Hefta-Gaub
42d9045770 possible fix for crashing agents acting like avatars 2015-09-30 16:02:33 -07:00
Ryan Huffman
2dc0d68f0f Merge pull request #5960 from ZappoMan/fixScriptStopAgentCrash 
fix possible crash in agent
 2015-09-30 15:49:06 -07:00
Brad Hefta-Gaub
34dc8bdbcb fix possible crash in agent 2015-09-30 15:34:35 -07:00
Ryan Huffman
0063eee4a0 Fix issue with nackPacketList being accessed after being moved 2015-09-30 15:02:45 -07:00
Seth Alves
50dd8eba45 Relay joint translations across network. Apply animation's root-joint translation to avatar. 2015-09-26 11:40:39 -07:00
Stephen Birarda
229e73f88c protect the agent from null timers in avatar stop 2015-09-16 11:52:05 -07:00
Stephen Birarda
bca00db4a8 use unique_ptr for Agent ScriptEngine 2015-09-16 11:48:15 -07:00
Stephen Birarda
5df7ce7424 fix for missing jurisdiction listener in Agent 2015-09-16 11:43:54 -07:00
Brad Hefta-Gaub
0aed08a006 more robust handling of readConfiguration 2015-09-15 16:52:15 -07:00
Brad Hefta-Gaub
4a24a3767b couple of entity server corner cases 2015-09-15 16:17:05 -07:00
Brad Hefta-Gaub
22b979a663 couple of entity server corner cases 2015-09-15 16:02:22 -07:00
Brad Hefta-Gaub
bdae3e420b fix crash in AC 2015-09-15 11:24:04 -07:00
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029 more work on script engine 2015-09-14 20:59:10 -07:00
Stephen Birarda
d189fb932f Merge pull request #5785 from Atlante45/protocol 
Update AssetServer stats with units
 2015-09-14 11:18:23 -07:00
Atlante45
1f46b90f9c Remove constexpr for windows 2015-09-14 18:39:31 +02:00
Brad Hefta-Gaub
56118e4204 migrate Agent to use standard APIs of ScriptEngine 2015-09-11 22:12:42 -07:00
Brad Hefta-Gaub
54c56a92f1 move agent specific code out of ScriptEngine 2015-09-11 21:56:00 -07:00
Brad Hefta-Gaub
f85cb2c888 first cut at cleaning up ScriptEngine class 2015-09-11 19:12:09 -07:00
Brad Davis
9b81842850 Merge branch 'master' into homer 
Conflicts:
	assignment-client/src/octree/OctreeSendThread.cpp
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/EntityTreeElement.h
	libraries/entities/src/EntityTreeHeadlessViewer.cpp
	libraries/entities/src/RecurseOctreeToMapOperator.cpp
	libraries/octree/src/Octree.h
	libraries/physics/src/EntityMotionState.cpp
 2015-09-11 16:31:18 -07:00
Brad Davis
e458eb7ae9 Merge pull request #5734 from sethalves/octree-shared-pointers 
octree uses shared pointers
 2015-09-11 16:00:04 -07:00
Atlante45
8ee56b59c9 Update AssetServer stats with units 
Also removed array for better layout
 2015-09-11 22:33:58 +02:00
Brad Davis
244795b629 Merge branch 'homer' into temp 
Conflicts:
	interface/src/Application.cpp
 2015-09-11 11:21:29 -07:00
Seth Alves
0e63147be2 Merge pull request #5776 from birarda/ac-pid-zero 
make sure AC process ID is valid before acting on the process
 2015-09-11 10:00:08 -07:00
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
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
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
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
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
Atlante45
62c76d0332 registerListenerForTypes optimisations 2015-08-20 14:56:35 +02: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