birarda
|
519e4c5383
|
Merge pull request #498 from birarda/synthesis
unlink STK from targets while not being used
|
2013-06-06 11:58:13 -07:00 |
|
Stephen Birarda
|
233ce67379
|
don't link STK library while not being used
|
2013-06-06 11:57:38 -07:00 |
|
ZappoMan
|
3fda876c91
|
Merge pull request #497 from birarda/synthesis
remove the CPU hog that is FreeVerb for now
|
2013-06-06 11:55:57 -07:00 |
|
Stephen Birarda
|
ecd03d7b4b
|
replace magic number 1 with sizeof
|
2013-06-06 11:54:44 -07:00 |
|
Stephen Birarda
|
115c39dbcf
|
bring PHASE_DELAY_AT_90 constant above algorithim that uses it
|
2013-06-06 11:48:20 -07:00 |
|
Stephen Birarda
|
53fece29fa
|
remove redundant calculation
|
2013-06-06 11:47:17 -07:00 |
|
Stephen Birarda
|
19ab1816bb
|
remove the CPU hogging FreeVerb effect
|
2013-06-06 11:45:33 -07:00 |
|
Stephen Birarda
|
b444933810
|
Merge branch 'master' of github.com:worklist/hifi into synthesis
|
2013-06-06 11:33:23 -07:00 |
|
Andrzej Kapolka
|
51c5f9de8d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-06 11:29:03 -07:00 |
|
Philip Rosedale
|
3b149265d7
|
Merge pull request #495 from ZappoMan/recursive_voxel_delete
Fixes to delete voxel and color/add voxel to allow for unwinding color reaveraging
|
2013-06-06 11:17:57 -07:00 |
|
Andrzej Kapolka
|
b13f22be26
|
Forgot to update the default pose position.
|
2013-06-06 11:14:57 -07:00 |
|
Stephen Birarda
|
8e4ef406ca
|
Revert "uncomment the FreeVerb code"
This reverts commit 7232544626 .
|
2013-06-06 11:11:57 -07:00 |
|
Andrzej Kapolka
|
56b4c04a18
|
Adjusted head base/top transforms.
|
2013-06-06 11:09:09 -07:00 |
|
Stephen Birarda
|
7232544626
|
uncomment the FreeVerb code
|
2013-06-06 11:04:40 -07:00 |
|
ZappoMan
|
79f487ac68
|
Merge branch 'master' of https://github.com/worklist/hifi into recursive_voxel_delete
|
2013-06-06 11:02:06 -07:00 |
|
Stephen Birarda
|
b60230b29c
|
Merge branch 'master' of github.com:worklist/hifi into synthesis
|
2013-06-06 11:01:16 -07:00 |
|
Stephen Birarda
|
83f7b2943c
|
comment out the FreeVerb effect to check mixer performance
|
2013-06-06 10:59:03 -07:00 |
|
ZappoMan
|
ae3db89f63
|
added method for general subtree change bookkeeping
|
2013-06-06 10:55:11 -07:00 |
|
Andrzej Kapolka
|
d9d6891cc8
|
Use the head rotation to adjust the position, too.
|
2013-06-06 10:54:28 -07:00 |
|
Andrzej Kapolka
|
27717bfcd4
|
Removed unused variables.
|
2013-06-06 10:48:35 -07:00 |
|
Andrzej Kapolka
|
2cc640b6f6
|
Set head bone rotation from head orientation.
|
2013-06-06 10:26:26 -07:00 |
|
Andrzej Kapolka
|
c1bccb04d1
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-06 10:21:10 -07:00 |
|
Philip Rosedale
|
0f4e6a447e
|
Merge pull request #493 from birarda/echo
add back audio echo option
|
2013-06-06 10:20:12 -07:00 |
|
Andrzej Kapolka
|
e0189c9834
|
Build fix, render body as balls if we don't have an avatar.
|
2013-06-06 10:17:57 -07:00 |
|
Stephen Birarda
|
f52b110b5c
|
conditional cleanup in Agent to re-fire PRB
|
2013-06-06 10:13:08 -07:00 |
|
Andrzej Kapolka
|
80847b3884
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-06 10:10:07 -07:00 |
|
Andrzej Kapolka
|
7af42a1896
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/Avatar.cpp
|
2013-06-06 10:09:48 -07:00 |
|
birarda
|
d563031185
|
Merge pull request #491 from PhilipRosedale/master
Sensor fusion for more stable gyros, camera tightness 0 option
|
2013-06-06 10:08:48 -07:00 |
|
Andrzej Kapolka
|
4cac35293a
|
Refer to body balls parents, not joint parents.
|
2013-06-06 10:08:15 -07:00 |
|
Philip Rosedale
|
b08fe8f915
|
merge fixes
|
2013-06-06 10:07:50 -07:00 |
|
Stephen Birarda
|
ce1d1edd11
|
add missing cstring include for memcpy
|
2013-06-06 09:54:28 -07:00 |
|
Philip Rosedale
|
61d4ac2675
|
Fixes per code review.
|
2013-06-06 09:52:39 -07:00 |
|
Stephen Birarda
|
719af3b9e6
|
Merge branch 'master' of github.com:worklist/hifi into echo
|
2013-06-06 09:52:33 -07:00 |
|
ZappoMan
|
15e09adfc4
|
Merge pull request #492 from birarda/synthesis
add STK library and a distance based reverb effect
|
2013-06-06 09:51:58 -07:00 |
|
Stephen Birarda
|
dd7c1fab2e
|
more spacing fixes in Avatar.cpp
|
2013-06-06 09:51:32 -07:00 |
|
Stephen Birarda
|
6a7434651a
|
spacing fix in Avatar.cpp
|
2013-06-06 09:42:25 -07:00 |
|
ZappoMan
|
66ebb7d01c
|
Made readCodeColorBufferToTree() use self contained recursion so we can
implement color averaging properly
|
2013-06-06 01:39:40 -07:00 |
|
ZappoMan
|
57aff0af64
|
fixed bug in recursive delete that caused animation ghosts
|
2013-06-06 01:00:12 -07:00 |
|
Philip Rosedale
|
53e7ef439c
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-05 23:53:19 -07:00 |
|
Philip Rosedale
|
24dcd14371
|
Added sensor fusion for more stable gyro roll, pitch.
|
2013-06-05 23:53:01 -07:00 |
|
Philip Rosedale
|
1b20b016dd
|
Fixed acceleration checking bug that was limiting angular rotation, changed mouselook to work correctly/stable.
|
2013-06-05 20:04:30 -07:00 |
|
Stephen Birarda
|
2cb9b609f4
|
resolve conflicts on merge with upstream master
|
2013-06-05 18:28:02 -07:00 |
|
Stephen Birarda
|
30d6c7f68a
|
Merge remote-tracking branch 'upstream/master' into synthesis
|
2013-06-05 18:26:12 -07:00 |
|
Philip Rosedale
|
1f0e321980
|
removed Oculus Manager from camera object, using _tightness = 0.0 to shutoff camera movement smoothing
|
2013-06-05 17:54:14 -07:00 |
|
Stephen Birarda
|
378f3deb1a
|
constantize some more of the effect mix calculations
|
2013-06-05 17:37:07 -07:00 |
|
Andrzej Kapolka
|
fcf3def87c
|
Merge pull request #490 from PhilipRosedale/master
Added render choice for balls versus voxel avatars
|
2013-06-05 17:34:19 -07:00 |
|
Stephen Birarda
|
5bbf96d946
|
allow avatar agents to ask for audio loopback
|
2013-06-05 17:31:52 -07:00 |
|
Philip Rosedale
|
97be04716e
|
Added render menu choice to switch between voxel and ball avatar rendering.
|
2013-06-05 17:24:53 -07:00 |
|
Stephen Birarda
|
e5a1fa4dec
|
Merge branch 'master' of github.com:worklist/hifi into synthesis
|
2013-06-05 17:03:53 -07:00 |
|
Stephen Birarda
|
fe7749c397
|
remove a blank line
|
2013-06-05 16:55:13 -07:00 |
|