Commit graph

15406 commits

Author SHA1 Message Date
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
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
Atlante45
9999c88d84 Added Referential getters + fixed stupid unpacking bug 2014-08-05 12:01:47 -07:00
Atlante45
f0af2f022e Pack/Unpack asymetry fix + added forgotten consts 2014-08-04 17:53:21 -07:00
Atlante45
d9dde06c14 Various tweaks to referentials 2014-08-04 14:59:15 -07:00
Atlante45
15cbfa0715 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-04 12:45:57 -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
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
Atlante45
aaf043de60 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-01 16:17:16 -07:00
wangyix
f9ec7b6c18 redesiged SequenceNumberStats child instance handling 2014-08-01 16:13:52 -07:00
ZappoMan
66d45d3544 tweak format of report 2014-08-01 15:25:03 -07:00
ZappoMan
cb02ac16b6 tweak format of report 2014-08-01 15:23:52 -07:00
ZappoMan
ce46e8b812 tweak format of report 2014-08-01 15:14:43 -07:00
ZappoMan
34ca5ded72 add reporting interval 2014-08-01 15:09:11 -07:00
Brad Hefta-Gaub
398424b44a Merge pull request #3243 from ZappoMan/jittertesttool
fix 30 second averages
2014-08-01 14:59:18 -07:00
ZappoMan
60899d2a00 oops 2014-08-01 14:55:14 -07:00
Philip Rosedale
ea40943206 Merge pull request #3242 from ZappoMan/jittertesttool
added a simple udp send/receive jitter test tool
2014-08-01 14:40:13 -07:00
ZappoMan
ca4bca7042 more windows headaches memset instead of bzero 2014-08-01 14:11:24 -07:00
ZappoMan
36f635ed8d change stats to display difference between gap and expected gap 2014-08-01 14:07:14 -07:00
ZappoMan
8db66e4322 use our ported version of usecTimestampNow cause windows sucks 2014-08-01 13:58:38 -07:00
Ryan Huffman
d01d605b40 Add ModelItemProperties::copyFromNewModelItem 2014-08-01 13:52:00 -07:00
ZappoMan
48b73e3f0e windows build 2014-08-01 13:42:37 -07:00
ZappoMan
e0946838f3 windows build 2014-08-01 13:34:01 -07:00
ZappoMan
ad4dd9404d windows build 2014-08-01 13:26:56 -07:00
ZappoMan
ddfdfc9242 windows build 2014-08-01 13:21:46 -07:00
ZappoMan
8c14f948f2 handle first packet stats better 2014-08-01 13:15:57 -07:00
ZappoMan
8359ebb82f use c std version of usecTimestampNow() 2014-08-01 13:12:37 -07:00
Ryan Huffman
b98ee351a5 Remove unused ModelTree::getModelAt 2014-08-01 13:04:03 -07:00
Ryan Huffman
355cf07443 Fix style issue 2014-08-01 13:03:10 -07:00
ZappoMan
68074cb22a added a simple udp send/receive jitter test tool 2014-08-01 12:59:10 -07:00
Philip Rosedale
b38edd0022 Merge pull request #3241 from AndrewMeadows/ragdoll
Ragdoll Part 7: introduction of ContactConstraint
2014-08-01 12:13:48 -07:00
wangyix
eba07b03e2 recursive SequenceNumberStats; untested 2014-08-01 12:00:41 -07:00
Atlante45
00e4e20bcb Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-01 11:22:42 -07:00
Andrew Meadows
3305f5edf9 merge upstream/master into andrew/ragdoll 2014-08-01 11:13:18 -07:00
Andrew Meadows
789eeed760 limit action of ContactConstraint to penetration 2014-08-01 11:11:41 -07:00