Commit graph

34700 commits

Author SHA1 Message Date
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
Stephen Birarda
ea38c4cc49 don't allow domain check-ins while shutting down 2015-11-12 18:04:15 -08:00
Stephen Birarda
d932ba74fd remove the avatar kill packet from Interface 2015-11-12 17:58:12 -08:00
samcake
1fd37b51a2 trying to get somewhere.... 2015-11-12 17:54:35 -08:00
Stephen Birarda
6b2987eef8 handle domain server node removal in NodeList 2015-11-12 17:47:51 -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
Stephen Birarda
e52e9be44c re-broadcast disconnects from domain-server 2015-11-12 17:23:39 -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
Stephen Birarda
1c9396d66e handle disconnect request in domain-server 2015-11-12 15:43:03 -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
Stephen Birarda
8bdb81d832 send disconnect packet from node when leaving domain 2015-11-12 15:03:19 -08:00
Stephen Birarda
0a64242160 cleanup string grabbing for PacketType enum 2015-11-12 14:43:25 -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
Stephen Birarda
288ee0e9e8 add a NodeDisconnect packet 2015-11-12 11:39:32 -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
James B. Pollack
39f44115be Merge pull request #6373 from Atlante45/rotationBetween
Rotation between
2015-11-12 09:25:56 -08:00
Brad Hefta-Gaub
eefe26d96a fix crash in Model::deleteGeometry when _rig is not initialized 2015-11-12 09:24:49 -08:00
samcake
b9a0d0b843 Merge pull request #6363 from jherico/rec3
Recording avatar data refactor
2015-11-12 00:58:46 -08:00
Brad Davis
f521be10fe Avatar recording work in progress 2015-11-12 00:33:38 -08:00
Zach Pomerantz
33851baa3f Add directionality to examples/growth
*There is a bug in here, but it may be in Interface.*
The sphere entities have a lifetime of 60s.
The first time the script is run, each click fires one clickReleaseOnEntity event.
If the entities expire (lifetime is reached), and the script is rerun a second time,
each click will fire two clickReleaseOnEntity events.
If this is repeated (waiting for expiration each time), then
the N-th repetition will fire N clickReleaseOnEntity events.
Note that each entity, across runs, has a unique uuid, as expected.
2015-11-11 22:32:45 -08:00
Seth Alves
83d5c9cf4a arrange status icons in two rows of 4 each 2015-11-11 18:54:07 -08:00
Atlante45
954391ae3e Fix models resizing
When models are MUCH bigger one one axis than the others
and we modify the scale only of one of those small axis,
it wouldn't propagate because the change was relatively
too small conpared to the size of the model
2015-11-11 18:33:26 -08:00
Seth Alves
315b5e9da2 Merge pull request #6372 from ZappoMan/rightClickMenu
Tweaks to "click"
2015-11-11 17:27:50 -08:00