Stephen Birarda
9ddebc8d13
resolve conflicts on merge with upstream/master
2015-11-20 15:29:44 -08:00
Clément Brisset
5d75fcbfce
Merge pull request #6430 from birarda/unique_linked_data
...
use a unique_ptr for linkedData in Node
2015-11-20 15:01:41 -08:00
Brad Hefta-Gaub
b5d764814c
Merge pull request #6450 from birarda/agent-script-fail
...
fix for agent script download fail
2015-11-20 13:29:10 -08:00
Leonardo Murillo
d17bf28bce
Merge branch 'master' of github.com:highfidelity/hifi into stack-manager
2015-11-20 15:20:08 -06:00
Leonardo Murillo
e17d0b2af3
Bundling and consolidating deployment package
2015-11-20 15:10:56 -06:00
Stephen Birarda
b34934b849
resolve conflicts on merge with upstream/master
2015-11-20 11:52:53 -08:00
Stephen Birarda
cf204ad5b0
cleanup executeScript comment in Agent
2015-11-20 11:44:58 -08:00
Stephen Birarda
aa836aa4b5
add a script request timeout
2015-11-20 11:44:04 -08:00
Stephen Birarda
3b40119992
use Agent session UUID to request script
2015-11-20 11:35:24 -08:00
Brad Hefta-Gaub
7441e20f58
cleanup
2015-11-20 11:20:36 -08:00
Brad Hefta-Gaub
4bbfcb6092
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
2015-11-20 10:30:38 -08:00
Brad Hefta-Gaub
e530aa6545
don't assert on sender mismatch
2015-11-20 09:58:28 -08:00
Brad Hefta-Gaub
abf169ebd9
fix senderID in messages, dry up code
2015-11-20 09:03:21 -08:00
Stephen Birarda
8f5212acac
use destroy instead of accidental set
2015-11-19 17:26:10 -08:00
Ryan Huffman
07d21514c5
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-19 10:47:37 -08:00
Brad Hefta-Gaub
e318537af4
Merge pull request #6425 from birarda/handshake-ds-settings
...
fix case where servers could run without settings
2015-11-19 10:10:28 -08:00
Seth Alves
98073de0b8
Merge pull request #6426 from ZappoMan/entitiesFileDownload
...
implement support to download the persist file from entity server status page
2015-11-19 09:47:10 -08:00
Stephen Birarda
271387f96e
use a unique_ptr for linkedData in Node
2015-11-18 18:03:31 -08:00
samcake
74beeefe06
Merge pull request #6420 from jherico/dargo
...
Make recording and playback work in interface, playback in agent
2015-11-18 17:52:09 -08:00
Brad Hefta-Gaub
456da661ff
implement support to download the persist file from entity server status page
2015-11-18 17:30:07 -08:00
Brad Davis
98cc7408b1
Fixing issues found in AC playback test
2015-11-18 17:17:20 -08:00
Ryan Huffman
2a416ebc61
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
2015-11-18 16:52:23 -08:00
Stephen Birarda
3773995bb7
remove true return for readAdditionalConfiguration
2015-11-18 15:41:27 -08:00
Stephen Birarda
cb708859fb
resolve conflicts on merge with upstream master
2015-11-18 15:34:56 -08:00
Stephen Birarda
3ba0c9d042
resolve conflicts on merge with upstream master
2015-11-18 15:29:39 -08:00
Stephen Birarda
20485b817c
use safer domain-server settings request in entity-server
2015-11-18 15:27:57 -08:00
Stephen Birarda
eafc11e054
use safer domain settings request in AvatarMixer
2015-11-18 15:18:16 -08:00
Stephen Birarda
f2ecce6043
use safer domain settings request in audio-mixer
2015-11-18 15:13:29 -08:00
Brad Davis
5b8047ded4
Make recording and playback work in interface, playback in agent
2015-11-18 14:04:45 -08:00
Brad Hefta-Gaub
35677d3a48
Merge pull request #6418 from birarda/test-ds-settings-fail
...
move keepalive pings transparently to NL
2015-11-18 11:12:16 -08:00
Stephen Birarda
d90c073102
leverage NL keep alive pings in Agent
2015-11-18 10:25:18 -08:00
Brad Davis
2636e43fab
Merge pull request #6413 from samcake/controllers
...
Recording: Moving the Recording js interface to the Script engine
2015-11-18 10:22:55 -08:00
samcake
368f19b4e2
Merging with todays upstream and checking
2015-11-17 18:58:10 -08:00
Stephen Birarda
2355ba70ca
just remove messages-mixer settings grabbing all together
2015-11-17 18:55:09 -08:00
Stephen Birarda
c21fbc9a46
fix for messages-mixer bail early on empty settings
2015-11-17 18:53:23 -08:00
samcake
d2f3b48637
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-17 17:36:38 -08:00
Stephen Birarda
5dc48dc9dc
resolve conflicts on merge with upstream/master
2015-11-17 17:04:12 -08:00
Stephen Birarda
8e4d7c69ce
handle AudioInjectorManager for scripted ACs
2015-11-17 17:01:11 -08:00
Brad Hefta-Gaub
6dfcc53c27
properly handle removing subscribers from channels when the subscriber node disconnects
2015-11-17 14:19:13 -08:00
Brad Hefta-Gaub
32bf81ef0d
move MessagesClient to agent
2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub
5b9791d800
add message received signal
2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub
e7a8df306c
fix warnings
2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub
1c2c37ff44
more cleanup work
2015-11-17 11:10:12 -08:00
Brad Hefta-Gaub
034debc483
cleanup
2015-11-17 10:59:53 -08:00
Brad Hefta-Gaub
1f7c70a0d1
implement proper sending
2015-11-17 10:28:50 -08:00
Brad Hefta-Gaub
6b61ec569c
more work on channels
2015-11-17 09:47:50 -08:00
Sam Gateau
5b92929833
Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client
2015-11-17 09:32:22 -08:00
ZappoMan
f712fae4d2
more hacking
2015-11-17 08:56:21 -08:00
Brad Hefta-Gaub
5f04e4a167
more work
2015-11-16 19:29:54 -08:00
samcake
8553033d59
Refactoring the mess for the Agent
2015-11-16 19:27:28 -08:00
Brad Hefta-Gaub
1e0b66a68f
more work
2015-11-16 19:23:39 -08:00
Brad Hefta-Gaub
12f206e2f0
more work on messages
2015-11-16 17:00:03 -08:00
Stephen Birarda
aa77c4894c
add an AudioInjectorManager for more efficient threading
2015-11-16 16:04:10 -08:00
Brad Hefta-Gaub
d42a1a721f
first cut at messages-mixer
2015-11-16 15:26:17 -08:00
Stephen Birarda
3fa0bcbcd9
ping the AssetClient from the agent
2015-11-16 10:38:59 -08:00
Stephen Birarda
5908f2d398
put Agent AssetClient on sep thread, cleanup
2015-11-16 10:38:45 -08:00
Stephen Birarda
d941be8d0b
allow assignment client to use AssetClient for ATP downloads
2015-11-16 10:38:33 -08:00
Stephen Birarda
8dcf245b74
Merge pull request #6395 from hyperlogic/tony/avatar-mixer-identity-fixes
...
AvatarMixer: remove redundant identity packet send
2015-11-16 10:35:42 -08:00
Anthony J. Thibault
7aefc5c9f7
AvatarMixer: remove redundant identity packet send
...
Removed AvatarClientData::checkAndSetHasReceivedFirstPackets boolean.
This is handled by the AvatarClientData::checkAndSetHasReceivedFirstPacketsFrom
set.
2015-11-16 10:14:28 -08:00
Clément Brisset
b795b66b35
Merge pull request #6365 from sethalves/rework-visual-physics-debug
...
grab fix + physics logging/debug changes
2015-11-16 09:06:05 -08:00
Seth Alves
89ed3751ae
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-14 14:00:20 -08:00
Anthony J. Thibault
245150333b
Fix for missing avatars on entry
...
This should fix the issue where a persons avatar was occasionally not visible to others
for a long period of time. This was due to several factors:
1) When a new avatar was added to the simulation that identity packet was not broadcast to
other avatars on the server. This would rely on random logic to send the identity eventually.
This is fixed in this PR, by sending identity packets to all other clients when a new clients
arrive.
2) The random identity logic was not being executed if the sequence number check caused an update
to be skipped. This means the probability of sending a random packet was reduced significantly,
especially for clients that were loading geometry on entry. This was fixed by doing the random
check before sequence number check.
3) The 1/300 probably used in the check was too low, this was only a 63% chance of sending a identity
packet within 5 seconds. This was fixed by changing the probability to 1/187, which is a 80% chance
to send an identity packet within 5 seconds.
4) The randFloat() implementation slightly reduced the identity packet probability due to quantization errors.
This has been replaced by a C++ std random number generator.
2015-11-13 18:08:18 -08:00
Stephen Birarda
e263453acb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-13 14:48:26 -08:00
Brad Hefta-Gaub
b6b5a5b1c2
add comment
2015-11-12 18:28:08 -08:00
Brad Hefta-Gaub
ecaa50c0ff
fix for infinite loop in erase entities special packet
2015-11-12 18:25:18 -08:00
Brad Hefta-Gaub
83e7eb58b9
add special packets and nack packets to outbound stats
2015-11-12 16:36:06 -08:00
Seth Alves
a78b1619be
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 14:20:23 -08:00
Brad Hefta-Gaub
14a6e1fb6b
fix mac compiler error
2015-11-12 13:24:25 -08:00
Brad Hefta-Gaub
66a2b38f50
switch various status to use thread safe atomics
2015-11-12 13:09:51 -08:00
Stephen Birarda
ef778c554c
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-12 10:40:51 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
Brad Hefta-Gaub
80e15fb77d
reduce client to server to client entity edit latency
2015-11-11 17:03:21 -08:00
Seth Alves
be86748200
oops
2015-11-11 16:38:28 -08:00
Seth Alves
cffe4551dd
merge from upstream
2015-11-11 16:15:07 -08:00
Brad Hefta-Gaub
2f903a9513
CR feedback and some cleanup
2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub
bdfe304f7a
remove some logging
2015-11-11 14:08:15 -08:00
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
Atlante45
6a53021818
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:23:31 -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
Atlante45
55c6706f76
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-06 13:31:39 -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
Ryan Huffman
f4531759be
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-02 12:27:08 -08:00
Ryan Huffman
7f4a8e9d7d
Merge branch 'master' of github.com:Atlante45/hifi into baseball
2015-11-02 12:25:51 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -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
Brad Davis
49e7d42c2c
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-30 10:07:40 -07:00
Stephen Birarda
3fa4f7138a
add more sounds to the crowd, ping AssetServer from Agent
2015-10-27 10:58:31 -07:00
black plastick
d34fc35544
added AvatarList.avatarSessionChanged(sessionUUID, oldUUID) for AC scripts.
2015-10-27 08:11:20 -04:00
Stephen Birarda
f275d2678d
ping the AssetClient from the agent
2015-10-26 16:06:12 -07:00
Stephen Birarda
6080654d7e
zero out the pre-mix samples for each stream
2015-10-26 15:48:05 -07: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
ca60ce59f1
put Agent AssetClient on sep thread, cleanup
2015-10-26 12:06:28 -07:00
Seth Alves
d86d69aeba
keep track of children. use local position and orientation on the wire.
2015-10-22 15:36:03 -07:00
Seth Alves
264b658132
hook up entities and avatars to SpatialParentFinder
2015-10-22 11:05:48 -07:00
Stephen Birarda
014e62e25a
allow assignment client to use AssetClient for ATP downloads
2015-10-20 17:11:37 -07:00
Brad Davis
5bac1aae2d
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-16 17:23:30 -07:00
Ryan Huffman
9ddcfdf94d
Cleanup PacketReceier and ReceivedMessage
2015-10-16 09:21:10 -07: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
Ryan Huffman
7682ab00e3
Add ReceivedMessage and receive progress
2015-10-15 14:09:53 -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
Brad Davis
80c962a4cc
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-15 12:27:53 -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
Brad Davis
10df0f2d8c
Fix broken assignment-client build
2015-10-14 17:07:10 -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
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -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
