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

282 commits

Author SHA1 Message Date
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
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
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 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
cb708859fb resolve conflicts on merge with upstream master 2015-11-18 15:34:56 -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
samcake
368f19b4e2 Merging with todays upstream and checking 2015-11-17 18:58:10 -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