ZappoMan
|
fbfd63c429
|
fix build to work if Qxmpp is not available
|
2014-07-28 15:17:33 -07:00 |
|
Stephen Birarda
|
84b86c17b7
|
use common settings retreival code to block before run in AudioMixer
|
2014-07-28 15:16:59 -07:00 |
|
Stephen Birarda
|
dbf41c8a42
|
allow domain-server to serve settings publicly, fix retry in DomainHandler
|
2014-07-28 14:56:26 -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
|
d0a1d732c9
|
updated preferences UI "samples" to "frames"
|
2014-07-28 14:18:22 -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 |
|
Stephen Birarda
|
6334116070
|
request domain settings after successful connection to domain
|
2014-07-28 12:07:19 -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 |
|
Stephen Birarda
|
707db4f5d8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
|
2014-07-28 11:10:38 -07:00 |
|
Atlante45
|
3c7375daad
|
Removed unused variable
|
2014-07-28 10:17:04 -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
|
45b4777e60
|
cleaned up QHash iterator code again
|
2014-07-28 09:47:40 -07:00 |
|
wangyix
|
c129db16cb
|
formatting fix, AudioRingBuffer no longer NodeData,
|
2014-07-28 09:40:44 -07:00 |
|
Brad Hefta-Gaub
|
f438ae2ddb
|
Merge pull request #3215 from Atlante45/master
Fix the double entries in models' browsers
|
2014-07-28 08:51:49 -07:00 |
|
Brad Hefta-Gaub
|
8b43ddc426
|
Merge pull request #3212 from birarda/select-library
standardization of hints used to find external libraries
|
2014-07-28 08:51:15 -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 |
|
Philip Rosedale
|
b2f6b0c5da
|
Merge pull request #3213 from Atlante45/editVoxels_zFighting
Edit voxels z fighting
|
2014-07-28 08:37:37 -07:00 |
|
Andrew Meadows
|
dd515f6bb9
|
fix bad variable name
|
2014-07-28 07:06:36 -07:00 |
|
wangyix
|
438606d567
|
_consecutiveNotMixedCount++ moved back into if(starveOnFail)
|
2014-07-27 11:23:47 -07:00 |
|
wangyix
|
cf649c8365
|
Revert "removed unused var"
This reverts commit fa500dc7fd .
|
2014-07-25 18:20:16 -07:00 |
|
Andrzej Kapolka
|
4f5448f529
|
Basic rendering working again.
|
2014-07-25 18:19:50 -07:00 |
|
wangyix
|
fa500dc7fd
|
removed unused var
|
2014-07-25 17:38:36 -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
|
e6f913edb1
|
dead injected streams are now periodically removed in AudioMixer
|
2014-07-25 16:32:08 -07:00 |
|
Atlante45
|
b5dd9141a3
|
Fix the double entries in models' browsers
|
2014-07-25 16:12:40 -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
|
b8b1df5799
|
MuscleConstraints for ragdoll; velocity for verlet points
|
2014-07-25 15:24:44 -07:00 |
|
Andrew Meadows
|
c8405d192d
|
create MuscleConstraint for driving ragdolls
|
2014-07-25 15:24:14 -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
|
f5dbc54b1c
|
Merge pull request #3208 from binaryking/19701
Code Review for Job #19701
|
2014-07-25 12:09:14 -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 |
|
Atlante45
|
f7c675f3e6
|
CR missing index++
|
2014-07-25 11:35:25 -07:00 |
|
barnold1953
|
e25ea64b9b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript
|
2014-07-25 11:11:40 -07:00 |
|
Atlante45
|
7d64246d43
|
Made zFightingAdjust a ratio to the distance (currently 4%)
|
2014-07-25 11:00:03 -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 |
|
wangyix
|
822ba4da48
|
cleaned up code more, dancer.js audio not working
|
2014-07-25 10:21:38 -07:00 |
|
AndrewMeadows
|
73ec862474
|
Merge pull request #3207 from PhilipRosedale/master
Velocity filter head position for less jitter in camera
|
2014-07-25 09:50:21 -07:00 |
|