Commit graph

34542 commits

Author SHA1 Message Date
Stephen Birarda
8dcf245b74 Merge pull request #6395 from hyperlogic/tony/avatar-mixer-identity-fixes
AvatarMixer: remove redundant identity packet send
2015-11-16 10:35:42 -08:00
Stephen Birarda
789290f540 Merge pull request #6370 from Atlante45/locker
QTryRead/WriteLocker
2015-11-16 10:22:45 -08:00
Anthony J. Thibault
7aefc5c9f7 AvatarMixer: remove redundant identity packet send
Removed AvatarClientData::checkAndSetHasReceivedFirstPackets boolean.
This is handled by the AvatarClientData::checkAndSetHasReceivedFirstPacketsFrom
set.
2015-11-16 10:14:28 -08:00
Clément Brisset
b795b66b35 Merge pull request #6365 from sethalves/rework-visual-physics-debug
grab fix + physics logging/debug changes
2015-11-16 09:06:05 -08:00
Philip Rosedale
8e6c860a24 Merge pull request #6393 from hyperlogic/tony/avatar-mixer-identity-fixes
Fix for missing avatars on entry
2015-11-14 20:23:34 -08:00
Seth Alves
89ed3751ae Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-14 14:00:20 -08:00
Anthony J. Thibault
245150333b Fix for missing avatars on entry
This should fix the issue where a persons avatar was occasionally not visible to others
for a long period of time.  This was due to several factors:

1) When a new avatar was added to the simulation that identity packet was not broadcast to
other avatars on the server. This would rely on random logic to send the identity eventually.
This is fixed in this PR, by sending identity packets to all other clients when a new clients
arrive.

2) The random identity logic was not being executed if the sequence number check caused an update
to be skipped.  This means the probability of sending a random packet was reduced significantly,
especially for clients that were loading geometry on entry.  This was fixed by doing the random
check before sequence number check.

3) The 1/300 probably used in the check was too low, this was only a 63% chance of sending a identity
packet within 5 seconds.  This was fixed by changing the probability to 1/187, which is a 80% chance
to send an identity packet within 5 seconds.

4) The randFloat() implementation slightly reduced the identity packet probability due to quantization errors.
This has been replaced by a C++ std random number generator.
2015-11-13 18:08:18 -08:00
Brad Davis
7a34d4f567 Merge pull request #6387 from samcake/controllers
Recording : Updating the recorder.js and a few fixes
2015-11-13 17:56:57 -08:00
samcake
89e5db11a0 More fixes 2015-11-13 17:41:41 -08:00
samcake
8c21ac144e Fixing review comments 2015-11-13 16:45:19 -08:00
samcake
64e2cc7b2a Merge pull request #6385 from EdgarPironti/record_branch
Fixes to Master recording for ACs
2015-11-13 15:48:22 -08:00
EdgarPironti
a80871a7a8 Fixes 2015-11-13 15:00:38 -08:00
EdgarPironti
eb0d91fc7e Fixes to Master recording for ACs 2015-11-13 15:00:38 -08:00
Seth Alves
3b6b56f316 formatting 2015-11-13 14:26:43 -08:00
Seth Alves
3746920655 allow action updates from others when we are the simulation owner 2015-11-13 13:56:30 -08:00
Seth Alves
919ea5f1a0 send action updates even if we aren't the simulation owner 2015-11-13 12:37:07 -08:00
Seth Alves
1d0a2ddd3d grab debugging script 2015-11-13 11:15:57 -08:00
Stephen Birarda
429a4d51d5 Merge pull request #6375 from Atlante45/resize
Fix models resizing
2015-11-13 10:23:05 -08:00
Stephen Birarda
dff88722f3 Merge pull request #6384 from ZappoMan/serverStats
fix for infinite loop in erase entities special packet
2015-11-13 10:21:10 -08:00
Seth Alves
6ec5b12081 send to network when an action is deleted, also 2015-11-13 09:52:35 -08:00
Seth Alves
3f7f5a2bbd send to network when an action is deleted, also 2015-11-13 09:49:31 -08:00
Seth Alves
5acbb74362 send to network when an action is deleted, also 2015-11-13 09:45:06 -08:00
samcake
f43738e75a Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-13 09:42:33 -08:00
Seth Alves
7979fb38cf don't always send actiondata along with other physics related properties 2015-11-13 09:25:17 -08:00
Sam Gateau
89d120ab3d Few fixes to make the recorder.js run 2015-11-12 22:24:11 -08:00
Seth Alves
dbaea5770a include action data in properties suppressed by non-simulation ownership 2015-11-12 18:28:26 -08:00
Brad Hefta-Gaub
b6b5a5b1c2 add comment 2015-11-12 18:28:08 -08:00
Brad Hefta-Gaub
ecaa50c0ff fix for infinite loop in erase entities special packet 2015-11-12 18:25:18 -08:00
samcake
1fd37b51a2 trying to get somewhere.... 2015-11-12 17:54:35 -08:00
Seth Alves
ed8a604e13 adjust how the decision to send action changes over the wire is made 2015-11-12 17:36:45 -08:00
Seth Alves
756b382a75 adjust how the decision to send action changes over the wire is made 2015-11-12 17:12:20 -08:00
Stephen Birarda
b165d1ae3a Merge pull request #6382 from ZappoMan/serverStats
add special packets and nack packets to outbound stats
2015-11-12 16:45:36 -08:00
Brad Hefta-Gaub
83e7eb58b9 add special packets and nack packets to outbound stats 2015-11-12 16:36:06 -08:00
Seth Alves
6f83f32ecc adjust how the decision to send action changes over the wire is made 2015-11-12 16:27:54 -08:00
Seth Alves
d7be1699a7 adjust how the decision to send action changes over the wire is made 2015-11-12 15:27:10 -08:00
Seth Alves
a78b1619be Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-12 14:20:23 -08:00
Seth Alves
a8cd891e48 adjust how the decision to send action changes over the wire is made 2015-11-12 14:19:23 -08:00
Clément Brisset
9d3235a966 Merge pull request #6378 from ZappoMan/serverStats
switch various status to use thread safe atomics
2015-11-12 14:01:46 -08:00
Brad Hefta-Gaub
da651ac475 fix mac compiler error 2015-11-12 13:47:27 -08:00
Brad Hefta-Gaub
8bfb368a61 fix mac compiler error 2015-11-12 13:32:43 -08:00
Brad Hefta-Gaub
33110eda30 fix mac compiler error 2015-11-12 13:25:50 -08:00
Brad Hefta-Gaub
14a6e1fb6b fix mac compiler error 2015-11-12 13:24:25 -08:00
Brad Hefta-Gaub
66a2b38f50 switch various status to use thread safe atomics 2015-11-12 13:09:51 -08:00
samcake
da8270d50b Merge pull request #6377 from jherico/rec3
Cleaning up clip and transform
2015-11-12 11:50:10 -08:00
Brad Davis
ee1545f649 Cleaning up clip and transform 2015-11-12 11:48:47 -08:00
Seth Alves
2e635bd936 cleanups 2015-11-12 11:14:25 -08:00
Seth Alves
a366633f84 cleanups 2015-11-12 11:03:44 -08:00
Seth Alves
93da3ed5bd if our simulation-bid priority matches the remote one, don't bid. 2015-11-12 11:03:34 -08:00
Seth Alves
3519dd248b Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-12 09:53:11 -08:00
samcake
319f9fc30e Merge pull request #6376 from ZappoMan/fixModelCrash
fix crash in Model::deleteGeometry when _rig is not initialized
2015-11-12 09:37:30 -08:00