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 |
|
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 |
|
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 |
|
wangyix
|
748c9e2065
|
numAudioSamples now calculated to be device samples instead of network samples
|
2014-08-05 10:13:34 -07:00 |
|
Philip Rosedale
|
4d0474483d
|
Merge pull request #3253 from AndrewMeadows/ragdoll
Ragdoll Part 8: improved contact points
|
2014-08-04 21:33:31 -07:00 |
|
Andrzej Kapolka
|
173e8af126
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-04 18:31:08 -07:00 |
|
Brad Hefta-Gaub
|
d662c0f414
|
Merge pull request #3248 from Atlante45/dde_face_tracker
Dde face tracker
|
2014-08-04 18:27:15 -07:00 |
|
wangyix
|
332e75453e
|
Merge remote-tracking branch 'upstream/master' into pull_mode_audio_output
|
2014-08-04 17:58:31 -07:00 |
|
wangyix
|
2b8b15e32d
|
made audioscope easier to see
|
2014-08-04 17:56:14 -07:00 |
|
Atlante45
|
f0af2f022e
|
Pack/Unpack asymetry fix + added forgotten consts
|
2014-08-04 17:53:21 -07:00 |
|
wangyix
|
c42af55f2f
|
Merge branch 'inbound_audio_stream' into pull_mode_audio_output
|
2014-08-04 17:41:03 -07:00 |
|
Andrew Meadows
|
39d3deee90
|
merge upstream/master into andrew/ragdoll
|
2014-08-04 17:37:28 -07:00 |
|
wangyix
|
ed3240fbad
|
minor change to _audioOutput->setBufferSize()
|
2014-08-04 17:31:14 -07:00 |
|
wangyix
|
4355ca8328
|
minor member rename
|
2014-08-04 17:24:18 -07:00 |
|
wangyix
|
3fe4c29848
|
removed heap alloc of receivedSamples; cleaned up code
|
2014-08-04 17:14:26 -07:00 |
|
Andrzej Kapolka
|
f8afdba922
|
Allow configurable block sizes, merging children with different resolutions.
|
2014-08-04 16:56:30 -07:00 |
|
wangyix
|
4d7d6f1e25
|
changed downstream re-sampling to occur right after parsing packet
|
2014-08-04 16:23:17 -07:00 |
|
Atlante45
|
d9dde06c14
|
Various tweaks to referentials
|
2014-08-04 14:59:15 -07:00 |
|
Philip Rosedale
|
d552b7ca97
|
Merge pull request #3246 from wangyix/inbound_audio_stream
Improved SequenceNumberStats handling of out-of-sync seq nums
|
2014-08-04 14:30:45 -07:00 |
|
Andrzej Kapolka
|
b1d6977112
|
Added simple "erase heightfield" tool.
|
2014-08-04 12:58:01 -07:00 |
|
Atlante45
|
15cbfa0715
|
Merge branch 'master' of https://github.com/highfidelity/hifi into referentials
|
2014-08-04 12:45:57 -07:00 |
|
Atlante45
|
d1a1311979
|
Mode DDE tweaks
|
2014-08-04 12:44:23 -07:00 |
|
Atlante45
|
0a42968197
|
DDE tweaks
|
2014-08-04 12:40:12 -07:00 |
|
Atlante45
|
1a27b4b645
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dde_face_tracker
|
2014-08-04 12:24:44 -07:00 |
|
Andrzej Kapolka
|
9ba091f0a1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-04 11:44:24 -07:00 |
|
Andrzej Kapolka
|
46d4172157
|
Filter terrain, points, spanners by frustum intersection.
|
2014-08-04 11:41:56 -07:00 |
|