Brad Hefta-Gaub
|
d4d4069f11
|
Merge pull request #3225 from birarda/master
cmake file cleanup to suppress warnings on cmake 3.0
|
2014-07-30 19:20:18 -07:00 |
|
Brad Hefta-Gaub
|
faa25af0e2
|
Merge pull request #3228 from Barnold1953/dancerScript
Procedural Animation
|
2014-07-30 19:19:10 -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
|
7281eca5a4
|
fixed inj crash; added statcDesired to MixedAudioStream
|
2014-07-30 17:20:05 -07:00 |
|
wangyix
|
24be668d36
|
added check before pushAudioToOutput to prevent starvecount buildup
|
2014-07-30 15:47:49 -07:00 |
|
wangyix
|
daeb2a898d
|
added staticDesiredJitterBufferFrames feature; AudioMixer crashing
moved some callbacks from Application::updateAvatar() to
Application::update()
|
2014-07-30 15:35:40 -07:00 |
|
barnold1953
|
66c1aba7f7
|
Animation improvements, exposed roll/yaw head control.
|
2014-07-30 15:23:03 -07:00 |
|
barnold1953
|
c4a7c2783c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript
|
2014-07-30 15:21:49 -07:00 |
|
Stephen Birarda
|
2796f71419
|
library cleanup to suppress warnings on cmake 3.0
|
2014-07-30 15:06:15 -07:00 |
|
wangyix
|
af5eedb50e
|
fixed sequenceNumberStats sender changed msgs
|
2014-07-30 11:39:29 -07:00 |
|
wangyix
|
5b0662f1d0
|
fixed setToStarved() behavior of InboundAudioStream
|
2014-07-30 10:51:50 -07:00 |
|
wangyix
|
656131b7ee
|
made frames available avg window 2s; added missing _silentFramesDropped update
|
2014-07-30 10:24:24 -07:00 |
|
wangyix
|
ecfd5c2757
|
default max frames over desired changed to 10
|
2014-07-29 17:37:59 -07:00 |
|
wangyix
|
d49970d010
|
maxFramesOverDesired added; settable from domain page and preferences
|
2014-07-29 15:57:32 -07:00 |
|
wangyix
|
bb2adb2721
|
minor refactoring
|
2014-07-29 14:02:18 -07:00 |
|
wangyix
|
71c23eac1e
|
added TimeWeightedAvg to InboundAudioStream
_maxFramesOverDesired hardcoded right now
|
2014-07-29 13:51:46 -07:00 |
|
Atlante45
|
75dfb87c8e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation
|
2014-07-29 13:47:24 -07:00 |
|
wangyix
|
ccedb1bd20
|
forgot some code in checkBuffersBeforeFrameSend
corrected updateLastPopOutputTrailingLoudness behavior to match what the
old code did.
|
2014-07-29 10:40:01 -07:00 |
|
Philip Rosedale
|
1ba8922f0b
|
Merge pull request #3218 from ey6es/metavoxels
Various metavoxel improvements relating to threading and VBO-based rendering.
|
2014-07-29 09:59:55 -07:00 |
|
wangyix
|
aead7a6823
|
removed get pointer methods from AudioRingBUffer
|
2014-07-28 22:48:29 -07:00 |
|
barnold1953
|
5c47e9013c
|
Working procedural walk animation with two keyframes
|
2014-07-28 18:36:25 -07:00 |
|
Atlante45
|
03031c4c04
|
Outdated link
|
2014-07-28 16:36:12 -07:00 |
|
Andrzej Kapolka
|
3ac4bb6ddd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-28 16:24:43 -07:00 |
|
Andrzej Kapolka
|
e05884d4a3
|
Simpler rendering.
|
2014-07-28 16:18:16 -07:00 |
|
wangyix
|
7e59723522
|
removed +1 for philip's jitter frames calculation
|
2014-07-28 14:24:58 -07:00 |
|
wangyix
|
d221f69767
|
clamp overridden desired jitter buffer frames value
|
2014-07-28 14:22:04 -07:00 |
|
wangyix
|
97054d668b
|
fixed header macros
|
2014-07-28 14:15:14 -07:00 |
|
wangyix
|
ed9bfdc503
|
these didn't commit for some reason
|
2014-07-28 14:08:45 -07:00 |
|
wangyix
|
145b7f8a0e
|
got Preferences jitter buffer frames override working
|
2014-07-28 14:05:17 -07:00 |
|
wangyix
|
6fc5c74c0b
|
renamed ringbuffer variables to audiostream
|
2014-07-28 13:08:53 -07:00 |
|
wangyix
|
32dbc6cbdb
|
renamed audioringbuffer classes to audiostream
|
2014-07-28 11:52:05 -07:00 |
|
wangyix
|
9bbd055404
|
added stdev method of jitter calc to InboundAudioStream
|
2014-07-28 11:41:08 -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
|
c129db16cb
|
formatting fix, AudioRingBuffer no longer NodeData,
|
2014-07-28 09:40:44 -07:00 |
|
Philip Rosedale
|
acecc17001
|
Merge pull request #3214 from AndrewMeadows/ragdoll
Ragdoll Part 6: muscle constraints for driving Ragdoll and also damped velocity integration for verlet simulation
|
2014-07-28 08:40:21 -07:00 |
|
wangyix
|
438606d567
|
_consecutiveNotMixedCount++ moved back into if(starveOnFail)
|
2014-07-27 11:23:47 -07:00 |
|
Andrzej Kapolka
|
57ca606491
|
Various kinds of progress towards generic rendering.
|
2014-07-25 16:59:48 -07:00 |
|
Atlante45
|
1849ec8e07
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels_zFighting
Conflicts:
examples/editVoxels.js
|
2014-07-25 16:39:39 -07:00 |
|
wangyix
|
78031622db
|
removed MixedAudioRingBuffer class files
|
2014-07-25 16:06:56 -07:00 |
|
wangyix
|
e17556384d
|
added code to clear agent audiostream frames to prevent buildup
|
2014-07-25 15:51:34 -07:00 |
|
Andrew Meadows
|
d3ba00770f
|
merge upstream/master into andrew/ragdoll
|
2014-07-25 15:34:32 -07:00 |
|
Andrew Meadows
|
60612f6397
|
implement VerletPoint::integrateForward()
|
2014-07-25 15:23:12 -07:00 |
|
Andrew Meadows
|
b2c2cfec79
|
implement base Ragdoll::stepRagdollForward()
|
2014-07-25 15:22:25 -07:00 |
|
wangyix
|
fd9d7baa06
|
updated Agent with audiostream; added initial packets discard to audiostream
|
2014-07-25 15:14:10 -07:00 |
|
wangyix
|
f7e043f52d
|
cleaned up code
|
2014-07-25 14:52:39 -07:00 |
|
wangyix
|
a9d26b3934
|
fixed repeat-popping in audiomixer
|
2014-07-25 12:58:10 -07:00 |
|
Clément Brisset
|
53b345d4cd
|
Merge pull request #3209 from AndrewMeadows/ragdoll
Ragdoll Part 5: send visible transforms when using ragdoll
|
2014-07-25 11:50:15 -07:00 |
|
barnold1953
|
e25ea64b9b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript
|
2014-07-25 11:11:40 -07:00 |
|
Atlante45
|
72a31ec8fc
|
Removed magic number to use DEFAULT_NEAR/FAR_CLIP
|
2014-07-25 10:56:44 -07:00 |
|
Atlante45
|
c5ad856e65
|
Changed DEFAULT_FAR_CLIP to TREE_SCALE
|
2014-07-25 10:55:42 -07:00 |
|