David Kelly
c8850a8b8e
PR feedback
...
AgentAvatarTimer now in its own files. The thread still is created
the same way, and started only when you are an avatar, but now I
remember to stop it when you no longer are one. Audio is still at
100Hz, but avatar messages go at 60Hz as before. Unsure it matters,
but easy to do. Looking at that buzz now.
2016-10-12 12:44:24 -07:00
David Kelly
ef844cbd00
Cleanup artifacts
...
Seems playAvatarSound could be called from a thread other than
the Agent's thread. So, artifacts happen when that pointer changes
while a 'tick' is happening. Also cleaned up code a bit, got rid
of some hard-coded stuff I had in just for dev purposes.
2016-10-11 09:33:55 -07:00
David Kelly
fa9c3951c7
Merge branch 'master' into dk/codecInAgentAvatar
2016-10-10 19:51:56 -07:00
David Kelly
b58c36cb12
Rolling my own 100hz timer
...
Starting with the simplest possible thing - just sleep for 10000
microseconds. Can make it adaptive if need be.
2016-10-10 17:57:04 -07:00
David Kelly
b4c064a538
Hack in a 100hz timer
...
sounds crappy, more to do, just push to not lose anything.
<squash this>
2016-10-07 13:20:08 -07:00
David Kelly
ab6ccac631
Merge pull request #8741 from howard-stearns/kill-agents
...
kill agents in avatar mixer when they stop being avatars
2016-10-07 09:16:49 -07:00
David Kelly
95aa18f66d
Some cleanup
...
unnecessary stuff removed, added some cleanup code.
2016-10-06 16:18:22 -07:00
Chris Collins
8310a9fe8a
Merge pull request #8730 from huffman/feat/script-req-retry
...
Add retrying of script requests
2016-10-06 16:09:04 -07:00
David Kelly
a0c731a0c6
Initial attempt
...
Kinda works, but sounds 'scratchy'. Surely I've done something
lame.
2016-10-06 14:57:40 -07:00
howard-stearns
dc7a9f253c
kill agents in avatar mixer when they stop being avatars
2016-10-05 13:06:11 -07:00
Zach Pomerantz
5af95c6062
store channels on audio stream
2016-10-05 12:04:24 -07:00
Ryan Huffman
9dfa3e4a17
Move ScriptCache from AssignmentClient to Agent
2016-10-04 16:43:14 -07:00
Zach Pomerantz
e2ff738fc3
strip unused audio settings
...
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
2016-09-21 17:35:27 -07:00
Brad Hefta-Gaub
376756d413
include the codec name in the agent avatar audio stream
2016-08-25 09:58:36 -07:00
Stephen Birarda
aa226739d3
remove billboard code from Agent
2016-05-12 16:41:44 -07:00
Zach Pomerantz
173d2a590c
Use sleep_until for ScriptEngine
2016-05-06 19:30:37 -07:00
Stephen Birarda
d7450b8178
release pending ATP script request for active AssetServer
2016-04-13 14:25:23 -07:00
Stephen Birarda
76af3efe73
fix for active socket check on ATP script download
2016-04-11 17:59:27 -07:00
Stephen Birarda
bf3324fc6b
hold download of ATP script if Asset Server isn't ready
2016-04-08 15:28:12 -07:00
Stephen Birarda
1df0dce971
use ResourceRequest in Agent to handle ATP scripts
2016-04-08 14:38:26 -07:00
Atlante45
6d1b7f1d37
Wrap sound script object to hold a strong ref
2016-04-06 13:04:18 -07:00
Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub
7483b8546b
remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it
2016-03-17 17:05:35 -07:00
Atlante45
6a4b93a4e7
Proper fix for DiskCacheInfo
2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d
Move all resource requests to the same thread
2016-03-01 12:00:43 -08:00
Ryan Huffman
eff02d3e3a
Fix Agents bidding on simulation ownership
2016-02-02 10:47:51 -08:00
Seth Alves
b9fc368857
Merge pull request #6633 from huffman/agent-spatial-finder
...
Add AssignmentParentFinder to Agent
2015-12-14 09:35:27 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Ryan Huffman
66ed8dc053
Add AssignmentParentFinder to Agent
2015-12-11 14:51:14 -08:00
Ryan Huffman
4c8b7aa800
Fix EntityErase packets not being handled on agents
2015-12-10 16:26:16 -08:00
Leonardo Murillo
25494ec867
Merge pull request #6562 from Atlante45/baseball
...
Baseball
2015-12-07 14:11:21 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Ryan Huffman
ce882a9c11
Replace QSharedPointer ctor with ::create
2015-12-03 09:43:36 -08:00
Atlante45
083205916f
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-30 18:25:53 -08:00
Clément Brisset
e168966b87
Merge pull request #6409 from birarda/injector-hybrid
...
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -08:00
Ryan Huffman
1b0413f8e3
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-30 10:23:40 -08:00
Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
Ryan Huffman
dac491ef41
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-24 09:59:22 -08:00
Stephen Birarda
7f7d05fc42
fix double initialization of AssetClient in Agent
2015-11-24 10:46:35 -06:00
Stephen Birarda
0997d3dcae
resolve conflicts on merge with upstream/master
2015-11-23 16:15:15 -06:00
samcake
25654824a2
Copy pasting the code that Stephen did and also adding the AssetServer to the list of dependent nodes for the agent
2015-11-23 12:32:27 -08:00
samcake
301f0ba145
Trying to instenciate the AssetCLient in the Agent
2015-11-23 11:48:02 -08:00
Stephen Birarda
b24b095c90
add a missing space in Agent
2015-11-20 16:09:41 -08:00
Brad Hefta-Gaub
f56d2fba7f
allow playbackAgents to auto-register
2015-11-20 16:00:43 -08:00
Stephen Birarda
9ddebc8d13
resolve conflicts on merge with upstream/master
2015-11-20 15:29:44 -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
