Commit graph

15486 commits

Author SHA1 Message Date
Andrew Meadows
4beee3fecf add Shape::getVerletPoints() 2014-08-04 17:33:24 -07:00
wangyix
ed3240fbad minor change to _audioOutput->setBufferSize() 2014-08-04 17:31:14 -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
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
Stephen Birarda
7254b3a06e Merge pull request #3252 from birarda/master
another small html change in domain-server
2014-08-04 16:24:14 -07:00
Stephen Birarda
4f0218090c have the domain-server brand in navbar link back to home 2014-08-04 16:23:28 -07:00
wangyix
4d7d6f1e25 changed downstream re-sampling to occur right after parsing packet 2014-08-04 16:23:17 -07:00
Stephen Birarda
ca93dbef83 Merge pull request #3251 from birarda/master
make assignment link a dropdown in domain-server webpage
2014-08-04 16:02:58 -07:00
Stephen Birarda
4407ea4480 make assignment selector a dropdown 2014-08-04 16:02:13 -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
Stephen Birarda
6febca3533 add missing domain-server javascript file 2014-08-04 15:37:06 -07:00
Stephen Birarda
c786ee5c26 dynamically change active link in domain-server navbar 2014-08-04 15:27:34 -07:00
Stephen Birarda
10c94023f1 handle basic authentication for domain-server admin 2014-08-04 15:25:14 -07:00
Atlante45
d9dde06c14 Various tweaks to referentials 2014-08-04 14:59:15 -07:00
Stephen Birarda
2c1277ef37 remove voxel settings from domain-server settings until ready to go 2014-08-04 14:47:17 -07:00
Stephen Birarda
40375b8c81 add a navbar to domain-server web page 2014-08-04 14:46:33 -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
Philip Rosedale
6b1b1aaf17 Merge pull request #3249 from ey6es/metavoxels
Cull heightfield/points/spanners against frustum, added simple "erase heightfield" tool.
2014-08-04 14:28:48 -07:00
Andrzej Kapolka
f33c51378b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-04 12:58:19 -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
Clément Brisset
a5f8a23d7c Merge pull request #3247 from Atlante45/edit_models_on_off
turn off editModels by default
2014-08-04 12:14:15 -07:00
Atlante45
74edf6557f turn off editModels by default 2014-08-04 12:05:31 -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
Atlante45
1d2cf3536b Coefficients tweaks 2014-08-04 11:20:18 -07:00
wangyix
ad3bbc59f2 added bot_procedural back in 2014-08-04 11:15:42 -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
Atlante45
c80cd0d71d connected blendshapes 2014-08-04 11:04:14 -07:00
Atlante45
cac3983778 Added a few blendshapes 2014-08-04 11:03:58 -07:00
Atlante45
8d1438a44c Plugged in dde face tracker 2014-08-04 10:28:52 -07:00
Atlante45
bbb52fc4aa Added dde face tracker class 2014-08-04 10:28:29 -07:00
Atlante45
38741aed73 Fixed wrong header guard 2014-08-04 10:27:29 -07:00
Philip Rosedale
5a51950771 Merge pull request #3239 from lzuwei/add_cara_face_tracker
Reduce Jerks in head rotation when using Cara Face Tracker
2014-08-04 07:55:33 -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
wangyix
fc670d9edb minor threshold change 2014-08-01 16:44:01 -07:00
Brad Hefta-Gaub
e9286e5700 Merge pull request #3238 from ctrlaltdavid/19824
Code Review for Job #19824
2014-08-01 16:35:16 -07:00
Brad Hefta-Gaub
211bed946f Merge pull request #3232 from huffman/19783
Code Review for Job #19783
2014-08-01 16:34:50 -07:00
Brad Hefta-Gaub
d86f6c42b2 Merge pull request #3244 from ZappoMan/jittertesttool
updated formatting added reporting interval to quiet the noise
2014-08-01 16:32:20 -07:00