{"action":"created","comment":{"url":"https://api.github.com/repos/highfidelity/hifi/pulls/comments/33643834","id":33643834,"diff_hunk":"@@ -272,14 +269,16 @@ void PhysicsEngine::doOwnershipInfection(const btCollisionObject* objectA, const\n     if (b && ((a && a->getSimulatorID() == _sessionID && !objectA->isStaticObject()) || (objectA == characterObject))) {\n         // NOTE: we might own the simulation of a kinematic object (A) \n         // but we don't claim ownership of kinematic objects (B) based on collisions here.\n-        if (!objectB->isStaticOrKinematicObject()) {\n-            b->bump();\n+        if (!objectB->isStaticOrKinematicObject() && b->getSimulatorID() != _sessionID) {\n+            quint8 priority = a ? a->getSimulationPriority() : PERSONAL_SIMULATION_PRIORITY;\n+            b->bump(priority);\n         }\n     } else if (a && ((b && b->getSimulatorID() == _sessionID && !objectB->isStaticObject()) || (objectB == characterObject))) {\n         // SIMILARLY: we might own the simulation of a kinematic object (B) \n         // but we don't claim ownership of kinematic objects (A) based on collisions here.\n-        if (!objectA->isStaticOrKinematicObject()) {\n-            a->bump();\n+        if (!objectA->isStaticOrKinematicObject() && a->getSimulatorID() != _sessionID) {","path":"libraries/physics/src/PhysicsEngine.cpp","position":34,"original_position":34,"commit_id":"6e7973f5b936fb901967f2fc3eafe764837b8e0c","original_commit_id":"a300dec1f7c9b472eae5479b4d0f6bbfaaca0e69","user":{"login":"sethalves","id":1137072,"avatar_url":"https://avatars.githubusercontent.com/u/1137072?v=3","gravatar_id":"","url":"https://api.github.com/users/sethalves","html_url":"https://github.com/sethalves","followers_url":"https://api.github.com/users/sethalves/followers","following_url":"https://api.github.com/users/sethalves/following{/other_user}","gists_url":"https://api.github.com/users/sethalves/gists{/gist_id}","starred_url":"https://api.github.com/users/sethalves/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sethalves/subscriptions","organizations_url":"https://api.github.com/users/sethalves/orgs","repos_url":"https://api.github.com/users/sethalves/repos","events_url":"https://api.github.com/users/sethalves/events{/privacy}","received_events_url":"https://api.github.com/users/sethalves/received_events","type":"User","site_admin":false},"body":"These have been named like this for a while.  I'd rather leave this code alone, for this PR.","created_at":"2015-07-01T02:29:48Z","updated_at":"2015-07-01T02:29:48Z","html_url":"https://github.com/highfidelity/hifi/pull/5232#discussion_r33643834","pull_request_url":"https://api.github.com/repos/highfidelity/hifi/pulls/5232","_links":{"self":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/comments/33643834"},"html":{"href":"https://github.com/highfidelity/hifi/pull/5232#discussion_r33643834"},"pull_request":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/5232"}}},"pull_request":{"url":"https://api.github.com/repos/highfidelity/hifi/pulls/5232","id":38793931,"html_url":"https://github.com/highfidelity/hifi/pull/5232","diff_url":"https://github.com/highfidelity/hifi/pull/5232.diff","patch_url":"https://github.com/highfidelity/hifi/pull/5232.patch","issue_url":"https://api.github.com/repos/highfidelity/hifi/issues/5232","number":5232,"state":"open","locked":false,"title":"Do Not Merge -- Actions over wire and improved simulation ownership","user":{"login":"sethalves","id":1137072,"avatar_url":"https://avatars.githubusercontent.com/u/1137072?v=3","gravatar_id":"","url":"https://api.github.com/users/sethalves","html_url":"https://github.com/sethalves","followers_url":"https://api.github.com/users/sethalves/followers","following_url":"https://api.github.com/users/sethalves/following{/other_user}","gists_url":"https://api.github.com/users/sethalves/gists{/gist_id}","starred_url":"https://api.github.com/users/sethalves/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sethalves/subscriptions","organizations_url":"https://api.github.com/users/sethalves/orgs","repos_url":"https://api.github.com/users/sethalves/repos","events_url":"https://api.github.com/users/sethalves/events{/privacy}","received_events_url":"https://api.github.com/users/sethalves/received_events","type":"User","site_admin":false},"body":"Actions are callbacks registered with bullet.  Bullet will call the code provided by an action every simulation step.  These actions are exposed to the scripting and network layer with glue code.  Because actions are sent over the network, different interfaces watching the same scene can do a good job of estimating the true (time-variant) position of an action-affected entity.","created_at":"2015-06-29T16:51:25Z","updated_at":"2015-07-01T02:29:49Z","closed_at":null,"merged_at":null,"merge_commit_sha":"9c1a50a673bf23c4c76999a9cab3f3e78339fc10","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/highfidelity/hifi/pulls/5232/commits","review_comments_url":"https://api.github.com/repos/highfidelity/hifi/pulls/5232/comments","review_comment_url":"https://api.github.com/repos/highfidelity/hifi/pulls/comments{/number}","comments_url":"https://api.github.com/repos/highfidelity/hifi/issues/5232/comments","statuses_url":"https://api.github.com/repos/highfidelity/hifi/statuses/6e7973f5b936fb901967f2fc3eafe764837b8e0c","head":{"label":"sethalves:actions-over-wire-and-sim-ownership","ref":"actions-over-wire-and-sim-ownership","sha":"6e7973f5b936fb901967f2fc3eafe764837b8e0c","user":{"login":"sethalves","id":1137072,"avatar_url":"https://avatars.githubusercontent.com/u/1137072?v=3","gravatar_id":"","url":"https://api.github.com/users/sethalves","html_url":"https://github.com/sethalves","followers_url":"https://api.github.com/users/sethalves/followers","following_url":"https://api.github.com/users/sethalves/following{/other_user}","gists_url":"https://api.github.com/users/sethalves/gists{/gist_id}","starred_url":"https://api.github.com/users/sethalves/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sethalves/subscriptions","organizations_url":"https://api.github.com/users/sethalves/orgs","repos_url":"https://api.github.com/users/sethalves/repos","events_url":"https://api.github.com/users/sethalves/events{/privacy}","received_events_url":"https://api.github.com/users/sethalves/received_events","type":"User","site_admin":false},"repo":{"id":30046830,"name":"hifi","full_name":"sethalves/hifi","owner":{"login":"sethalves","id":1137072,"avatar_url":"https://avatars.githubusercontent.com/u/1137072?v=3","gravatar_id":"","url":"https://api.github.com/users/sethalves","html_url":"https://github.com/sethalves","followers_url":"https://api.github.com/users/sethalves/followers","following_url":"https://api.github.com/users/sethalves/following{/other_user}","gists_url":"https://api.github.com/users/sethalves/gists{/gist_id}","starred_url":"https://api.github.com/users/sethalves/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sethalves/subscriptions","organizations_url":"https://api.github.com/users/sethalves/orgs","repos_url":"https://api.github.com/users/sethalves/repos","events_url":"https://api.github.com/users/sethalves/events{/privacy}","received_events_url":"https://api.github.com/users/sethalves/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/sethalves/hifi","description":"Open, decentralized virtual worlds using sensors to control avatars and dynamically assigned devices as servers.  San Francisco based startup, we are hiring: http://highfidelity.io/jobs  Documentation at http://docs.highfidelity.io  Contribute by reporting bugs & doing jobs on http://worklist.net","fork":true,"url":"https://api.github.com/repos/sethalves/hifi","forks_url":"https://api.github.com/repos/sethalves/hifi/forks","keys_url":"https://api.github.com/repos/sethalves/hifi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sethalves/hifi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sethalves/hifi/teams","hooks_url":"https://api.github.com/repos/sethalves/hifi/hooks","issue_events_url":"https://api.github.com/repos/sethalves/hifi/issues/events{/number}","events_url":"https://api.github.com/repos/sethalves/hifi/events","assignees_url":"https://api.github.com/repos/sethalves/hifi/assignees{/user}","branches_url":"https://api.github.com/repos/sethalves/hifi/branches{/branch}","tags_url":"https://api.github.com/repos/sethalves/hifi/tags","blobs_url":"https://api.github.com/repos/sethalves/hifi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sethalves/hifi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sethalves/hifi/git/refs{/sha}","trees_url":"https://api.github.com/repos/sethalves/hifi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sethalves/hifi/statuses/{sha}","languages_url":"https://api.github.com/repos/sethalves/hifi/languages","stargazers_url":"https://api.github.com/repos/sethalves/hifi/stargazers","contributors_url":"https://api.github.com/repos/sethalves/hifi/contributors","subscribers_url":"https://api.github.com/repos/sethalves/hifi/subscribers","subscription_url":"https://api.github.com/repos/sethalves/hifi/subscription","commits_url":"https://api.github.com/repos/sethalves/hifi/commits{/sha}","git_commits_url":"https://api.github.com/repos/sethalves/hifi/git/commits{/sha}","comments_url":"https://api.github.com/repos/sethalves/hifi/comments{/number}","issue_comment_url":"https://api.github.com/repos/sethalves/hifi/issues/comments{/number}","contents_url":"https://api.github.com/repos/sethalves/hifi/contents/{+path}","compare_url":"https://api.github.com/repos/sethalves/hifi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sethalves/hifi/merges","archive_url":"https://api.github.com/repos/sethalves/hifi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sethalves/hifi/downloads","issues_url":"https://api.github.com/repos/sethalves/hifi/issues{/number}","pulls_url":"https://api.github.com/repos/sethalves/hifi/pulls{/number}","milestones_url":"https://api.github.com/repos/sethalves/hifi/milestones{/number}","notifications_url":"https://api.github.com/repos/sethalves/hifi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sethalves/hifi/labels{/name}","releases_url":"https://api.github.com/repos/sethalves/hifi/releases{/id}","created_at":"2015-01-29T23:37:31Z","updated_at":"2015-05-07T23:30:44Z","pushed_at":"2015-07-01T02:28:24Z","git_url":"git://github.com/sethalves/hifi.git","ssh_url":"git@github.com:sethalves/hifi.git","clone_url":"https://github.com/sethalves/hifi.git","svn_url":"https://github.com/sethalves/hifi","homepage":"","size":162224,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"highfidelity:master","ref":"master","sha":"09f32f68393a162d6138f5cb36611f4be294ddd5","user":{"login":"highfidelity","id":1565370,"avatar_url":"https://avatars.githubusercontent.com/u/1565370?v=3","gravatar_id":"","url":"https://api.github.com/users/highfidelity","html_url":"https://github.com/highfidelity","followers_url":"https://api.github.com/users/highfidelity/followers","following_url":"https://api.github.com/users/highfidelity/following{/other_user}","gists_url":"https://api.github.com/users/highfidelity/gists{/gist_id}","starred_url":"https://api.github.com/users/highfidelity/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/highfidelity/subscriptions","organizations_url":"https://api.github.com/users/highfidelity/orgs","repos_url":"https://api.github.com/users/highfidelity/repos","events_url":"https://api.github.com/users/highfidelity/events{/privacy}","received_events_url":"https://api.github.com/users/highfidelity/received_events","type":"Organization","site_admin":false},"repo":{"id":5372872,"name":"hifi","full_name":"highfidelity/hifi","owner":{"login":"highfidelity","id":1565370,"avatar_url":"https://avatars.githubusercontent.com/u/1565370?v=3","gravatar_id":"","url":"https://api.github.com/users/highfidelity","html_url":"https://github.com/highfidelity","followers_url":"https://api.github.com/users/highfidelity/followers","following_url":"https://api.github.com/users/highfidelity/following{/other_user}","gists_url":"https://api.github.com/users/highfidelity/gists{/gist_id}","starred_url":"https://api.github.com/users/highfidelity/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/highfidelity/subscriptions","organizations_url":"https://api.github.com/users/highfidelity/orgs","repos_url":"https://api.github.com/users/highfidelity/repos","events_url":"https://api.github.com/users/highfidelity/events{/privacy}","received_events_url":"https://api.github.com/users/highfidelity/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/highfidelity/hifi","description":"Open source software for shared virtual worlds using HMDs and dynamically assigned devices as servers.  San Francisco based startup, we are hiring: http://highfidelity.com/jobs  Documentation at http://docs.highfidelity.com  Contribute by reporting bugs & doing jobs on http://worklist.net","fork":false,"url":"https://api.github.com/repos/highfidelity/hifi","forks_url":"https://api.github.com/repos/highfidelity/hifi/forks","keys_url":"https://api.github.com/repos/highfidelity/hifi/keys{/key_id}","collaborators_url":"https://api.github.com/repos/highfidelity/hifi/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/highfidelity/hifi/teams","hooks_url":"https://api.github.com/repos/highfidelity/hifi/hooks","issue_events_url":"https://api.github.com/repos/highfidelity/hifi/issues/events{/number}","events_url":"https://api.github.com/repos/highfidelity/hifi/events","assignees_url":"https://api.github.com/repos/highfidelity/hifi/assignees{/user}","branches_url":"https://api.github.com/repos/highfidelity/hifi/branches{/branch}","tags_url":"https://api.github.com/repos/highfidelity/hifi/tags","blobs_url":"https://api.github.com/repos/highfidelity/hifi/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/highfidelity/hifi/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/highfidelity/hifi/git/refs{/sha}","trees_url":"https://api.github.com/repos/highfidelity/hifi/git/trees{/sha}","statuses_url":"https://api.github.com/repos/highfidelity/hifi/statuses/{sha}","languages_url":"https://api.github.com/repos/highfidelity/hifi/languages","stargazers_url":"https://api.github.com/repos/highfidelity/hifi/stargazers","contributors_url":"https://api.github.com/repos/highfidelity/hifi/contributors","subscribers_url":"https://api.github.com/repos/highfidelity/hifi/subscribers","subscription_url":"https://api.github.com/repos/highfidelity/hifi/subscription","commits_url":"https://api.github.com/repos/highfidelity/hifi/commits{/sha}","git_commits_url":"https://api.github.com/repos/highfidelity/hifi/git/commits{/sha}","comments_url":"https://api.github.com/repos/highfidelity/hifi/comments{/number}","issue_comment_url":"https://api.github.com/repos/highfidelity/hifi/issues/comments{/number}","contents_url":"https://api.github.com/repos/highfidelity/hifi/contents/{+path}","compare_url":"https://api.github.com/repos/highfidelity/hifi/compare/{base}...{head}","merges_url":"https://api.github.com/repos/highfidelity/hifi/merges","archive_url":"https://api.github.com/repos/highfidelity/hifi/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/highfidelity/hifi/downloads","issues_url":"https://api.github.com/repos/highfidelity/hifi/issues{/number}","pulls_url":"https://api.github.com/repos/highfidelity/hifi/pulls{/number}","milestones_url":"https://api.github.com/repos/highfidelity/hifi/milestones{/number}","notifications_url":"https://api.github.com/repos/highfidelity/hifi/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/highfidelity/hifi/labels{/name}","releases_url":"https://api.github.com/repos/highfidelity/hifi/releases{/id}","created_at":"2012-08-10T18:26:22Z","updated_at":"2015-06-26T04:40:25Z","pushed_at":"2015-07-01T02:28:26Z","git_url":"git://github.com/highfidelity/hifi.git","ssh_url":"git@github.com:highfidelity/hifi.git","clone_url":"https://github.com/highfidelity/hifi.git","svn_url":"https://github.com/highfidelity/hifi","homepage":"","size":218530,"stargazers_count":282,"watchers_count":282,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":159,"mirror_url":null,"open_issues_count":61,"forks":159,"open_issues":61,"watchers":282,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/5232"},"html":{"href":"https://github.com/highfidelity/hifi/pull/5232"},"issue":{"href":"https://api.github.com/repos/highfidelity/hifi/issues/5232"},"comments":{"href":"https://api.github.com/repos/highfidelity/hifi/issues/5232/comments"},"review_comments":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/5232/comments"},"review_comment":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/highfidelity/hifi/pulls/5232/commits"},"statuses":{"href":"https://api.github.com/repos/highfidelity/hifi/statuses/6e7973f5b936fb901967f2fc3eafe764837b8e0c"}}}}