wangyix
|
db0fbcab97
|
merge with upstream
|
2014-08-13 11:09:55 -07:00 |
|
wangyix
|
1f011bfe9d
|
repetition-with-fade option added, not implemented
|
2014-08-11 11:22:37 -07:00 |
|
wangyix
|
0dfe0b1f2a
|
merged with master
|
2014-08-08 13:32:27 -07:00 |
|
Stephen Birarda
|
17df6484d4
|
remove ssize_t and replace with size_t or int where appropriate
|
2014-08-08 13:17:53 -07:00 |
|
wangyix
|
1153a76ab1
|
new option knobs added, no new behavior yet
|
2014-08-07 16:37:36 -07:00 |
|
Brad Hefta-Gaub
|
d6e6cfd585
|
Merge pull request #3216 from wangyix/inbound_audio_stream
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
|
2014-07-30 18:00:17 -07:00 |
|
wangyix
|
8d6896a1da
|
forgot an arg in Agent.cpp
|
2014-07-30 17:26:58 -07:00 |
|
wangyix
|
7281eca5a4
|
fixed inj crash; added statcDesired to MixedAudioStream
|
2014-07-30 17:20:05 -07:00 |
|
wangyix
|
d49970d010
|
maxFramesOverDesired added; settable from domain page and preferences
|
2014-07-29 15:57:32 -07:00 |
|
wangyix
|
a3b44a6a73
|
downstream silent packets seem to be working
|
2014-07-29 10:08:55 -07:00 |
|
wangyix
|
6fc5c74c0b
|
renamed ringbuffer variables to audiostream
|
2014-07-28 13:08:53 -07:00 |
|
Atlante45
|
844e5d7e47
|
Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
|
2014-07-28 10:11:39 -07:00 |
|
wangyix
|
e17556384d
|
added code to clear agent audiostream frames to prevent buildup
|
2014-07-25 15:51:34 -07:00 |
|
wangyix
|
fd9d7baa06
|
updated Agent with audiostream; added initial packets discard to audiostream
|
2014-07-25 15:14:10 -07:00 |
|
barnold1953
|
aba031a125
|
Proper blendshape JS api.
|
2014-07-23 16:25:45 -07:00 |
|
barnold1953
|
6aa9e6b736
|
Revert "Ability to modify AC avatar blendshapes from JS"
This reverts commit 512034fd7c .
|
2014-07-23 15:54:40 -07:00 |
|
barnold1953
|
512034fd7c
|
Ability to modify AC avatar blendshapes from JS
|
2014-07-23 15:23:27 -07:00 |
|
Atlante45
|
95c98203a9
|
Replaced the Avatar in Agent by a scriptable avatar.
|
2014-07-23 14:00:49 -07:00 |
|
Atlante45
|
a225df63f6
|
Removed deprecated moveToThread()
|
2014-07-07 11:40:03 -07:00 |
|
Atlante45
|
b0e83c32ff
|
Hopeful fix to ACs crash
|
2014-07-03 18:17:01 -07:00 |
|
Atlante45
|
8e1b8334a1
|
Fixed invokeMethod unable to find method + fixed children in different thread
|
2014-07-03 14:46:17 -07:00 |
|
Atlante45
|
1ac38c9884
|
Switched call to setCache to invokeMethod
|
2014-07-02 14:31:19 -07:00 |
|
Atlante45
|
231557a12c
|
Switched Agent to NetworkAccessManager
|
2014-07-01 17:35:34 -07:00 |
|
wangyix
|
c789f3c6b9
|
merge with upstream
|
2014-06-30 14:13:34 -07:00 |
|
wangyix
|
4587828a3a
|
removed debug prints
|
2014-06-27 16:48:21 -07:00 |
|
wangyix
|
0ae58bd7f9
|
added senderUUID arg to seq stats
|
2014-06-27 15:39:11 -07:00 |
|
wangyix
|
ff438a2434
|
added seq stats for Agent,
fixed AudioInjector to do << (quint16)0 instead of
skipRawData(sizeof(quint16) to correctly allocate space for seq number;
added debug prints;
|
2014-06-27 11:23:50 -07:00 |
|
Stephen Birarda
|
95d266b305
|
initial setup of settings request from domain-server
|
2014-06-26 16:55:22 -07:00 |
|
wangyix
|
cb48825561
|
added seq number to all Audio types, untested
|
2014-06-26 16:52:23 -07:00 |
|
Stephen Birarda
|
f4292fd29c
|
handle serving of scripts at temp unique UUIDs
|
2014-05-23 12:33:39 -07:00 |
|
ZappoMan
|
fa20e8ff95
|
fix the agent support for scripting models
|
2014-05-14 13:17:10 -07:00 |
|
Stephen Birarda
|
aa2931d9bb
|
resolve conflicts on merge with upstream/master
|
2014-05-02 10:39:17 -07:00 |
|
ZappoMan
|
715e6b8e60
|
debugging model editing
|
2014-05-02 09:10:30 -07:00 |
|
Stephen Birarda
|
2f0e311a99
|
return OAuth URL to interface clients when OAuth enabled
|
2014-05-01 10:19:05 -07:00 |
|
ZappoMan
|
aac42058ac
|
first cut at modelserver
|
2014-04-30 09:25:52 -07:00 |
|
Stephen Birarda
|
6adfb91e93
|
rename AvatarHash to AvatarList
|
2014-04-18 09:40:35 -07:00 |
|
Stephen Birarda
|
77202af20d
|
add debug for erase from AvatarHashMap, repair check for display name
|
2014-04-17 18:05:22 -07:00 |
|
Stephen Birarda
|
75f35c5858
|
optionally add an AvatarHashMap instance to the ScriptEngine
|
2014-04-17 17:55:16 -07:00 |
|
Stephen Birarda
|
f8106e5063
|
add an AvatarHashMap to the Agent
|
2014-04-17 17:49:55 -07:00 |
|
Andrzej Kapolka
|
6251b6b819
|
Merge fix.
|
2014-04-17 13:55:16 -07:00 |
|
Andrzej Kapolka
|
599b472cf7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animate
Conflicts:
assignment-client/src/Agent.cpp
|
2014-04-17 13:51:32 -07:00 |
|
Stephen Birarda
|
a137dd0362
|
grab URL for script from payload if it exists
|
2014-04-17 10:18:42 -07:00 |
|
Andrzej Kapolka
|
0f69bbe23f
|
More work on animation loading.
|
2014-04-16 20:39:55 -07:00 |
|
Stephen Birarda
|
1c861fbecb
|
resolve conflicts on merge with upstream master
|
2014-04-09 15:36:15 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Stephen Birarda
|
62041d91a8
|
rename NodeList DomainInfo to DomainHandler
|
2014-04-01 13:09:35 -07:00 |
|
Stephen Birarda
|
21eef6c15e
|
make sure VoxelServer and ParticleServer are in Agent interest list
|
2014-03-27 13:10:03 -07:00 |
|
Stephen Birarda
|
28f962ea2b
|
fix for AudioMixer kill and re-add and no sound load in bot
|
2014-03-26 13:19:20 -07:00 |
|
Stephen Birarda
|
e2b230445f
|
add a method to Agent for last read frame loudness
|
2014-03-26 10:28:59 -07:00 |
|
Stephen Birarda
|
ba338cb7bc
|
at minimum send packet rate stats for ThreadedAssignment subclasses
|
2014-03-24 16:06:25 -07:00 |
|