{"push_id":820834508,"size":13,"distinct_size":13,"ref":"refs/heads/master","head":"26c40adecb80a9c3bfe3277323b6f8ab3919990a","before":"9f0721c08be4e39e49b2f2c7b86fedfc8256dc1e","commits":[{"sha":"e93326e43fd460d9fed302f91f6d8ba94eceed4a","author":{"email":"9233b6f5388d6867a2a7be14d8b4ba53c86cfde2@highfidelity.io","name":"Brad Hefta-Gaub"},"message":"Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/e93326e43fd460d9fed302f91f6d8ba94eceed4a"},{"sha":"90049f6a5fafea67f3bc1ba7a36c50614e0b64c0","author":{"email":"9233b6f5388d6867a2a7be14d8b4ba53c86cfde2@highfidelity.io","name":"Brad Hefta-Gaub"},"message":"Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/90049f6a5fafea67f3bc1ba7a36c50614e0b64c0"},{"sha":"02a24712caa119ba7822698d44149e8f10b5f149","author":{"email":"9233b6f5388d6867a2a7be14d8b4ba53c86cfde2@highfidelity.io","name":"Brad Hefta-Gaub"},"message":"fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/02a24712caa119ba7822698d44149e8f10b5f149"},{"sha":"b479dd0a12e12d16fe6f0b55ab866209e769fae0","author":{"email":"9233b6f5388d6867a2a7be14d8b4ba53c86cfde2@highfidelity.io","name":"Brad Hefta-Gaub"},"message":"Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/b479dd0a12e12d16fe6f0b55ab866209e769fae0"},{"sha":"bb10d8a7d5d7deaa6295e5f54016415647076384","author":{"email":"9233b6f5388d6867a2a7be14d8b4ba53c86cfde2@highfidelity.io","name":"Brad Hefta-Gaub"},"message":"more work on rationalizing particle properties","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/bb10d8a7d5d7deaa6295e5f54016415647076384"},{"sha":"39f2241eacc812507e06eb792c8adca27607cf38","author":{"email":"9233b6f5388d6867a2a7be14d8b4ba53c86cfde2@highfidelity.io","name":"Brad Hefta-Gaub"},"message":"fix coding standard issue","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/39f2241eacc812507e06eb792c8adca27607cf38"},{"sha":"b7f52ea542ac3f456dab3f9a8877c15e0a76100b","author":{"email":"107b90bcd8f5b3fd3723c5d367a3d5a789902245","name":"ericrius1"},"message":"Moved entity reset switch, fixed some style issues","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/b7f52ea542ac3f456dab3f9a8877c15e0a76100b"},{"sha":"3db148f3dcbd5882877dc924a793f03414783f70","author":{"email":"fedd79a83dfa97328cc5ff1d02bc1ad5c4f0834f@gmail.com","name":"Seth Alves"},"message":"fix obj model meshes","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/3db148f3dcbd5882877dc924a793f03414783f70"},{"sha":"a8d162248176d49b5490d4cf782cbecdc1b4deff","author":{"email":"9233b6f5388d6867a2a7be14d8b4ba53c86cfde2@highfidelity.io","name":"Brad Hefta-Gaub"},"message":"CR feedback","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/a8d162248176d49b5490d4cf782cbecdc1b4deff"},{"sha":"f1410269909e31fccc5d7c1ab545b0350e027289","author":{"email":"9233b6f5388d6867a2a7be14d8b4ba53c86cfde2@highfidelity.io","name":"Brad Hefta-Gaub"},"message":"CR feedback","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/f1410269909e31fccc5d7c1ab545b0350e027289"},{"sha":"8e2ce379e12ec673f329d816ab0bee34b8422964","author":{"email":"f1e07d7fbbe6e559a5da0a24e0d5707b928e0fd7@gmail.com","name":"Clément Brisset"},"message":"Merge pull request #6024 from ericrius1/entityResetTweaks\n\nMoved entity reset switch, fixed some style issues","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/8e2ce379e12ec673f329d816ab0bee34b8422964"},{"sha":"01d39bd614663e40f5ef94755f4139722dc476f3","author":{"email":"f16bed56189e249fe4ca8ed10a1ecae60e8ceac0@highfidelity.io","name":"samcake"},"message":"Merge pull request #6025 from sethalves/fix-obj-model-meshes","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/01d39bd614663e40f5ef94755f4139722dc476f3"},{"sha":"26c40adecb80a9c3bfe3277323b6f8ab3919990a","author":{"email":"d8a25819cb4f08d4d5dff3ead547f861221d5785@gmail.com","name":"Ryan Huffman"},"message":"Merge pull request #6023 from ZappoMan/animationGroupSettings\n\nFixes to isEmitting for ParticleEffects","distinct":true,"url":"https://api.github.com/repos/ctrlaltdavid/hifi/commits/26c40adecb80a9c3bfe3277323b6f8ab3919990a"}]}