Atlante45
|
792f779bbf
|
Hooked up MyAvatar to playbacks
|
2014-08-12 16:16:01 -07:00 |
|
Atlante45
|
18ff497443
|
Added all relevant curves to RecordingFrames
|
2014-08-12 16:11:53 -07:00 |
|
Atlante45
|
96ee9e3f75
|
Work on Recording structure
|
2014-08-11 13:54:36 -07:00 |
|
Atlante45
|
33d646d92d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature
|
2014-08-11 10:43:49 -07:00 |
|
Stephen Birarda
|
cadfaab770
|
fix order now that I know my ABCs
|
2014-08-11 09:58:21 -07:00 |
|
Stephen Birarda
|
2469d958d6
|
include CoreFoundation for Audio.cpp defaultAudioDeviceForMode
|
2014-08-11 09:57:13 -07:00 |
|
AndrewMeadows
|
e5c2a099b8
|
Merge pull request #3268 from birarda/take-out-the-trash
cmake (in)sanity
|
2014-08-11 09:15:38 -07:00 |
|
Atlante45
|
5b4a3bd5f5
|
Recording ground work
|
2014-08-08 14:26:16 -07:00 |
|
Atlante45
|
9abfb0f503
|
Added Recorder suite
|
2014-08-08 14:25:55 -07:00 |
|
Stephen Birarda
|
d5b1bee13c
|
resolve conflicts on merge with upstream master
|
2014-08-08 13:48:32 -07:00 |
|
Stephen Birarda
|
2badf9ab1a
|
don't quote linked ZLIB and OpenSSL libs for interface
|
2014-08-08 13:42:07 -07:00 |
|
Stephen Birarda
|
a99b19d28a
|
make Qt5 and ZLIB required finds, add OpenSSL to interface
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
b1310c065c
|
remove TARGET_NAME from cmake macros where it is not required
|
2014-08-08 13:17:54 -07:00 |
|
Stephen Birarda
|
e4d01d269c
|
use shared dependency linking macro in hifi projects
|
2014-08-08 13:17:54 -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 |
|
Stephen Birarda
|
1a71d655b9
|
more cmake cleanup to remove ROOT_DIR passing
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
87cf262b9e
|
get to successful cmake after library link macro changes
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
31488e72fe
|
repairs for interface build to succeed
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
892e30c5e1
|
get past assignment-client build after cmake auditing
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
9a50532b1f
|
bubble up sub dependencies to link_hifi_library
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
45afce48f7
|
remember old session UUID in AvatarHashMap to work around ghosting
|
2014-08-08 13:14:03 -07:00 |
|
Andrew Meadows
|
05318acc7f
|
don't make shapes for joints with zero radius
|
2014-08-08 08:37:28 -07:00 |
|
Andrew Meadows
|
bcb0cb2c3c
|
fix bug: variable should be float rather than int
|
2014-08-08 08:26:25 -07:00 |
|
Andrew Meadows
|
5de762361a
|
remove cleanup of Model::_jointStates tree
the cleanup causes crashes and broken models
|
2014-08-08 08:20:42 -07:00 |
|
Andrew Meadows
|
9a55252587
|
remove extraneous roots from Model::_jointStates
|
2014-08-07 17:02:28 -07:00 |
|
Andrew Meadows
|
bb33266635
|
merge upstream/master into andrew/ragdoll
|
2014-08-07 14:37:10 -07:00 |
|
Andrew Meadows
|
94da63006c
|
VerletPoint::_mass is now private
We set the mass of other avatars artificially high
so they are less movable.
|
2014-08-07 14:35:32 -07:00 |
|
Andrew Meadows
|
0f784a9cc5
|
add other ragdolls to simulation
|
2014-08-07 13:09:05 -07:00 |
|
Andrew Meadows
|
87350ad2d0
|
ragdoll simulation now in model-relative frame
(same rotation as world-frame, but translated to MyAvatar origin)
|
2014-08-07 11:45:06 -07:00 |
|
Andrew Meadows
|
db1d6c8b49
|
MyAvatar's ragdoll is the main simulation ragdoll
|
2014-08-07 09:23:05 -07:00 |
|
AndrewMeadows
|
2653b33b67
|
Merge pull request #3257 from Atlante45/referentials
Referentials
|
2014-08-06 14:12:18 -07:00 |
|
Atlante45
|
de8c7fb204
|
Fix avatar not fading out
|
2014-08-06 12:14:36 -07:00 |
|
Andrew Meadows
|
cb8c0792b2
|
make main ragdoll and entity special
also addded some logic (unused) to add ragdolls of other avatars
|
2014-08-06 10:43:56 -07:00 |
|
Atlante45
|
fe8839b4b8
|
CR
|
2014-08-06 10:40:55 -07:00 |
|
Atlante45
|
110b034bcb
|
Changed updates locations
|
2014-08-05 18:41:48 -07:00 |
|
Atlante45
|
293c2e94ad
|
Correct member initialisation
|
2014-08-05 18:17:49 -07:00 |
|
Atlante45
|
2e7d34a886
|
typing error
|
2014-08-05 17:08:23 -07:00 |
|
Atlante45
|
b360b6c55d
|
PR cleanup + JS API
|
2014-08-05 17:07:03 -07:00 |
|
Andrzej Kapolka
|
0dbad7d0dd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-05 16:49:22 -07:00 |
|
Andrzej Kapolka
|
4696832ec6
|
Compute heightfield normals from adjacent values in vertex shader.
|
2014-08-05 15:13:50 -07:00 |
|
Brad Hefta-Gaub
|
b940d082f3
|
Merge pull request #3254 from wangyix/pull_mode_audio_output
Audio output switched to pull mode
|
2014-08-05 13:04:40 -07:00 |
|
wangyix
|
212316aed6
|
moved connect to Audio constructor
|
2014-08-05 12:14:10 -07:00 |
|
Atlante45
|
39a74cbc28
|
Few modifications to how avatars update their positions
|
2014-08-05 12:03:53 -07:00 |
|
Atlante45
|
283beab05d
|
ModelReferential copy constructor
|
2014-08-05 12:03:16 -07:00 |
|
wangyix
|
84c517c073
|
tweaked starve behavior of InboundAudioStream
|
2014-08-05 11:57:34 -07:00 |
|
Andrzej Kapolka
|
c42fc15999
|
Use back face culling on the heightfields.
|
2014-08-05 11:13:15 -07:00 |
|
Andrzej Kapolka
|
964dc4e954
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-05 11:03:00 -07:00 |
|
wangyix
|
77dad6fe65
|
change to fix Mac linker error
|
2014-08-05 11:00:27 -07:00 |
|
wangyix
|
779e7631a1
|
magic number 100 changed in Audio.cpp
|
2014-08-05 10:27:16 -07:00 |
|
wangyix
|
1eaf175a92
|
removed disable audio output overflow check menu option
|
2014-08-05 10:21:53 -07:00 |
|