{"push_id":552320108,"size":1000,"distinct_size":1109,"ref":"refs/heads/master","head":"cddd2aa2f2fb50735515f492eefe79f1499cef3c","before":"b1ff5e3ebc0fa3f557b205f77a378f6c2cb61944","commits":[{"sha":"3c67400e13d9d399604257c7678b422155248c55","author":{"email":"02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@highfidelity.io","name":"Andrew Meadows"},"message":"namechange CustomMotionState to ObjectMotionState","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/3c67400e13d9d399604257c7678b422155248c55"},{"sha":"fb7a5e64cf480f0b25effbc5eaf2d2f2cc11ec61","author":{"email":"02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@highfidelity.io","name":"Andrew Meadows"},"message":"fix file path in header text: physcis --> shared","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/fb7a5e64cf480f0b25effbc5eaf2d2f2cc11ec61"},{"sha":"85e7c6166b2e6542f6ad83ff0f7ea2cf4645d636","author":{"email":"02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@highfidelity.io","name":"Andrew Meadows"},"message":"support for spherical entities","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/85e7c6166b2e6542f6ad83ff0f7ea2cf4645d636"},{"sha":"5c3e90f64fe1a6c933a5cc265b755ba4750bbcea","author":{"email":"4015b57a143aec5156fd1444a017a32137a3fd0f@birarda.com","name":"Stephen Birarda"},"message":"resolve conflicts on merge with upstream master","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/5c3e90f64fe1a6c933a5cc265b755ba4750bbcea"},{"sha":"d6c97be78e2fdd2f7c899f9bdd8406b2b421f10a","author":{"email":"02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@highfidelity.io","name":"Andrew Meadows"},"message":"using an infinite plane for the ground","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/d6c97be78e2fdd2f7c899f9bdd8406b2b421f10a"},{"sha":"b630372cdcffdec8527a855440eee6207969be73","author":{"email":"f16bed56189e249fe4ca8ed10a1ecae60e8ceac0@highfidelity.io","name":"dev"},"message":"Merge branch 'tot' of https://github.com/samcake/hifi into temp0","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/b630372cdcffdec8527a855440eee6207969be73"},{"sha":"08373f8b1ebc6fbd7777375ffbf7d8d3028e2a51","author":{"email":"e4037e135a6f633314405a919f2212211d4d745e@gmail.com","name":"Andrzej Kapolka"},"message":"Fix for message upload stats.","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/08373f8b1ebc6fbd7777375ffbf7d8d3028e2a51"},{"sha":"c96be3fe3d9dfd3ff0834fdcd1adb1aecc0aa5bf","author":{"email":"e4037e135a6f633314405a919f2212211d4d745e@gmail.com","name":"Andrzej Kapolka"},"message":"Removed unused functions, stubbing out \"stack\" layer.","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/c96be3fe3d9dfd3ff0834fdcd1adb1aecc0aa5bf"},{"sha":"ecd5797fe3b7b44442da3d4f962a4de5508ccf31","author":{"email":"e4037e135a6f633314405a919f2212211d4d745e@gmail.com","name":"Andrzej Kapolka"},"message":"Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/ecd5797fe3b7b44442da3d4f962a4de5508ccf31"},{"sha":"d2e2583ce02cb7cb48fbb8819048ade923008e6f","author":{"email":"e4037e135a6f633314405a919f2212211d4d745e@gmail.com","name":"Andrzej Kapolka"},"message":"Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/d2e2583ce02cb7cb48fbb8819048ade923008e6f"},{"sha":"a94372efc789ad2a9b55e89a82748c1adbfa1325","author":{"email":"e4037e135a6f633314405a919f2212211d4d745e@gmail.com","name":"Andrzej Kapolka"},"message":"Working on stack data implementation.","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/a94372efc789ad2a9b55e89a82748c1adbfa1325"},{"sha":"98afd7c3c250c155176aacd69381d84b7f4ff99d","author":{"email":"e4037e135a6f633314405a919f2212211d4d745e@gmail.com","name":"Andrzej Kapolka"},"message":"Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/98afd7c3c250c155176aacd69381d84b7f4ff99d"},{"sha":"a519775cb3d10adf8f9021357890fbf2c5d7476a","author":{"email":"02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@highfidelity.io","name":"Andrew Meadows"},"message":"unecessary EntitySimulation::entityChanged() calls","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/a519775cb3d10adf8f9021357890fbf2c5d7476a"},{"sha":"d4c72ab203f306079b52e4c86c5d6c29d4b02045","author":{"email":"02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@highfidelity.io","name":"Andrew Meadows"},"message":"handle case where EntityItem's script has changed","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/d4c72ab203f306079b52e4c86c5d6c29d4b02045"},{"sha":"b0cc3a85097dffd3ea13099481820cef9d34e2cf","author":{"email":"02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@highfidelity.io","name":"Andrew Meadows"},"message":"add logic for when to update moving entity","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/b0cc3a85097dffd3ea13099481820cef9d34e2cf"},{"sha":"87c789ea765136410c0bcbc8f1c56732bda6d271","author":{"email":"e4037e135a6f633314405a919f2212211d4d745e@gmail.com","name":"Andrzej Kapolka"},"message":"Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/87c789ea765136410c0bcbc8f1c56732bda6d271"},{"sha":"8ab315b61ec5404049614b24c5f2799739ca086c","author":{"email":"e4037e135a6f633314405a919f2212211d4d745e@gmail.com","name":"Andrzej Kapolka"},"message":"Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/8ab315b61ec5404049614b24c5f2799739ca086c"},{"sha":"3fd2f12a73fa77610177a395c1e75af592dcb638","author":{"email":"02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@highfidelity.io","name":"Andrew Meadows"},"message":"merge upstream/master into andrew/inertia\n\nConflicts:\n\tlibraries/entities/src/EntityItem.cpp\n\tlibraries/entities/src/EntityItem.h\n\tlibraries/entities/src/EntitySimulation.h\n\tlibraries/entities/src/EntityTree.cpp\n\tlibraries/entities/src/EntityTreeElement.cpp\n\tlibraries/entities/src/SimpleEntitySimulation.cpp\n\tlibraries/entities/src/SimpleEntitySimulation.h\n\tlibraries/entities/src/SphereEntityItem.cpp","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/3fd2f12a73fa77610177a395c1e75af592dcb638"},{"sha":"663b9c393ed0fea62e2280793ad147cfd03c5deb","author":{"email":"fbca2f8e729b3319a1cf85b0f8b5251a496614d5@konamoxt.com","name":"ZappoMan"},"message":"add debugging","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/663b9c393ed0fea62e2280793ad147cfd03c5deb"},{"sha":"699e632e68485bb50c1f7a2e44bc36d6f2261dc8","author":{"email":"02e0a999c50b1f88df7a8f5a04e1b76b35ea6a88@highfidelity.io","name":"Andrew Meadows"},"message":"remove EntityItem::SimulationState after bad merge","distinct":true,"url":"https://api.github.com/repos/murillodigital/hifi/commits/699e632e68485bb50c1f7a2e44bc36d6f2261dc8"}]}