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
|
0378fb3049
|
break glm helpers out of SharedUtil
|
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
|
2bb37f2d64
|
more Qt module dependencies sorted out for libraries
|
2014-08-08 13:17:53 -07:00 |
|
Stephen Birarda
|
1059e9a635
|
add back more required Qt modules
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
b5c8a4d2c6
|
fix requirement of networking in audio library
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
fa26957b23
|
more CMakeLists cleanup for sub-dependencies
|
2014-08-08 13:17:52 -07:00 |
|
Stephen Birarda
|
33e5826842
|
remove animation server, bubble up qt modules
|
2014-08-08 13:17:52 -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
|
fe8839b4b8
|
CR
|
2014-08-06 10:40:55 -07:00 |
|
Atlante45
|
110b034bcb
|
Changed updates locations
|
2014-08-05 18:41:48 -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
|
96302ca271
|
Provide for custom expansion according to attribute, tweak spanner attribute.
|
2014-08-05 14:10:39 -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 |
|
Atlante45
|
39a74cbc28
|
Few modifications to how avatars update their positions
|
2014-08-05 12:03:53 -07:00 |
|
Atlante45
|
9999c88d84
|
Added Referential getters + fixed stupid unpacking bug
|
2014-08-05 12:01:47 -07:00 |
|
wangyix
|
84c517c073
|
tweaked starve behavior of InboundAudioStream
|
2014-08-05 11:57:34 -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
|
748c9e2065
|
numAudioSamples now calculated to be device samples instead of network samples
|
2014-08-05 10:13:34 -07:00 |
|
Andrew Meadows
|
a1fccdb177
|
remove dangling shape pointers from PhysicsSimulation
|
2014-08-05 08:32:14 -07:00 |
|
Andrzej Kapolka
|
173e8af126
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-08-04 18:31:08 -07:00 |
|
wangyix
|
332e75453e
|
Merge remote-tracking branch 'upstream/master' into pull_mode_audio_output
|
2014-08-04 17:58:31 -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 |
|
Andrew Meadows
|
f126ce299a
|
ContactPoint = set of assymetric distance consraints
|
2014-08-04 17:34:24 -07:00 |
|
Andrew Meadows
|
4beee3fecf
|
add Shape::getVerletPoints()
|
2014-08-04 17:33:24 -07:00 |
|
Andrew Meadows
|
d1b2ba4a43
|
fix bug: false positive capsuleCapsule() collision
for capsules with parallel axes and negative pojection of
center-to-center separation
also replace fabs() with fabsf()
|
2014-08-04 17:30:23 -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 |
|
Leonardo Murillo
|
384e62f1b1
|
Merge pull request #3250 from birarda/master
add basic DS navbar, add support for basic auth
|
2014-08-04 16:55:51 -06:00 |
|
Stephen Birarda
|
9fc545001c
|
look for a config.json file by default in resources
|
2014-08-04 15:40:45 -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 |
|
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 |
|
wangyix
|
d394c203b6
|
improved re-sync handling of SequenceNumberStats
removed "duplicate" category since it's not 100% accurate
|
2014-08-04 11:09:20 -07:00 |
|
Philip Rosedale
|
69558dc574
|
Merge pull request #3245 from wangyix/inbound_audio_stream
Improved SequenceNumberStats
|
2014-08-04 07:49:31 -07:00 |
|
Philip Rosedale
|
321b8de898
|
Merge pull request #3230 from Barnold1953/rockPaperScissors
Rock Paper Scissors CA script
|
2014-08-03 13:03:11 -07:00 |
|
barnold1953
|
5829e3ad1e
|
Forgot to save header
|
2014-08-02 16:03:13 -07:00 |
|
barnold1953
|
bd1fbaaf76
|
Made static mutex into member variable
|
2014-08-02 16:02:08 -07:00 |
|
wangyix
|
99df05f770
|
forgot member in reset()
|
2014-08-01 16:54:29 -07:00 |
|
wangyix
|
1d74ae8197
|
code cleanup
|
2014-08-01 16:49:21 -07:00 |
|