Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-27 11:29:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
34715 commits 74 branches 59 tags 1.2 GiB
Commit graph

1596 commits

Author SHA1 Message Date
Brad Hefta-Gaub
866116d285 more debugging 2015-11-11 12:13:47 -08:00
Brad Hefta-Gaub
006a1d60c8 keep some additional erase entities history and send to viewers 2015-11-10 15:31:51 -08:00
Seth Alves
5e4f30b2bb improve terse entity logging. change how action data sending is triggered 2015-11-10 13:58:09 -08:00
Howard Stearns
619746676b Fix ScriptAvatar (ac agent), and provide a simple working example assignment client script. 2015-11-06 15:31:03 -08:00
Howard Stearns
aa1289bd7c Update agent's outgoing avatar data packet with sequenceNumber as is now used in interface's MyAvatar. 2015-11-05 15:53:46 -08:00
Anthony J. Thibault
f50e1a0977 Fix for rare crash in LogHandler::flushRepeatedMessages() 
This can happen when LogHandler::flushRepetedMessages is called on
the main thread, while the application is printing messages on
a separate thread.  The access to the _lastRepeatedMessage QHash was
not guarded.

I've added two mutexes to guard access to both the repeatedMessage
hashes/regexes and the onlyOnceMessages/regexes.  This will unfortunately
incur a performance hit for frequent debug logging, but that's better
then crashing.

Also, I've added the ability to print threadIDs as well as Process ids.
This is helpful when debugging multi-threaded access to shared variables.
 2015-10-30 17:18:37 -07:00
black plastick
d34fc35544 added AvatarList.avatarSessionChanged(sessionUUID, oldUUID) for AC scripts. 2015-10-27 08:11:20 -04:00
black plastick
f5d12ee2c6 Added AvatarList script events for assigment client scripts: 
AvatarList.avatarAddedEvent(sessionUUID);
    AvatarList.avatarRemovedEvent(sessionUUID);
 2015-10-26 17:46:08 -04:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat 
Add some additional stats for debugging edit lags
 2015-10-15 16:00:29 -07:00
Brad Hefta-Gaub
3718149157 include inbound queue PPS stats in server stats page 2015-10-15 15:49:12 -07:00
Brad Hefta-Gaub
e1570e3197 include inbound queue PPS stats in server stats page 2015-10-15 15:31:52 -07:00
Brad Hefta-Gaub
82a211174b added packet recieved,lost,recovered stats to detailed server stats page 2015-10-15 15:23:12 -07:00
Andrew Meadows
3d17c57910 Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes 
Groundwork for hold action changes
 2015-10-15 13:30:02 -07:00
Andrew Meadows
2ae62de84e Merge pull request #6026 from birarda/qt-polling-env 
set bearer poll timeout env for wlan scan in Qt 5.5
 2015-10-15 09:58:32 -07:00
Seth Alves
9a2aa9a337 locking 2015-10-14 13:40:20 -07:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Seth Alves
2ecb7e8d29 fix bug that was making action deletes fail 2015-10-13 16:19:12 -07:00
Ryan Huffman
f1babb7fa0 Fix bug in OctreeInboundPacketProcessor where node can be null 2015-10-09 09:21:36 -07:00
Stephen Birarda
1cd76bb937 fix for registration of meta types in Socket 2015-10-08 18:17:24 -07:00
Stephen Birarda
7987595dcd set the bearer poll timeout for wlan scan in Qt 5.5 2015-10-08 11:32:10 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
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