{"push_id":3076362676,"size":20,"distinct_size":1,"ref":"refs/heads/master","head":"10b28967e2a9fb657ee61efb0d31a069ac831043","before":"da6073e5095c95db2d55a2a2152ab4cb5da2817a","commits":[{"sha":"bed728316fd72839e32f2c23b79bc489de43d619","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Added particle effects to heal module","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/bed728316fd72839e32f2c23b79bc489de43d619"},{"sha":"e832bf8e9528f3c0ca6cccab956a1507632052cb","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Updated Heal particle effects\nChanged how modules are handled and instatiated","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/e832bf8e9528f3c0ca6cccab956a1507632052cb"},{"sha":"6d462bc5a2a145de5a4625432b715d0c6c71d96c","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Added delay between attack and effect on targeted unit\nAdded effects to LongRange","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/6d462bc5a2a145de5a4625432b715d0c6c71d96c"},{"sha":"2cc48cf77537d7dc7fea2d55ddd465461f03e559","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Saved scene","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/2cc48cf77537d7dc7fea2d55ddd465461f03e559"},{"sha":"b1ad645fa9ccaf87c0a0df11aafb1b022669838c","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Finished adding effects to modules","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/b1ad645fa9ccaf87c0a0df11aafb1b022669838c"},{"sha":"710d226fd31528655b5f89c22cd0328a3cf7cf74","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Updated the frigate templates with approprate hardpoints and hardpoint positions","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/710d226fd31528655b5f89c22cd0328a3cf7cf74"},{"sha":"e17079c1b89862c1774d2a3f3470593e4f25e800","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Updated Map1 to use new unit and module prefabs","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/e17079c1b89862c1774d2a3f3470593e4f25e800"},{"sha":"88cb0bd50c1512e38ac62aa271362f9326039dce","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Updated Map2 to use new unit and module prefabs","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/88cb0bd50c1512e38ac62aa271362f9326039dce"},{"sha":"eaedf86fd74dba878169d0487d26de0c8d5dd7d2","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Adjusted light","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/eaedf86fd74dba878169d0487d26de0c8d5dd7d2"},{"sha":"dc97a3d4495b234ec075b9dc23057ce02aa81116","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"reverted map 2","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/dc97a3d4495b234ec075b9dc23057ce02aa81116"},{"sha":"9a2f1a39bc9ac35288d4aa5f23e2f6089889c083","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"reverted map3","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/9a2f1a39bc9ac35288d4aa5f23e2f6089889c083"},{"sha":"cf1661960ba3a219e6478df73d50f9821691b11f","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Resolve battlemanager merge conflict","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/cf1661960ba3a219e6478df73d50f9821691b11f"},{"sha":"247dba93e59f6970eb942e03a668c0a8c537b8da","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Resolve battlemanager conflict part deux","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/247dba93e59f6970eb942e03a668c0a8c537b8da"},{"sha":"2cf3c3e7a676091198789aac16932a87cdeafc50","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"BM conflict part tre","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/2cf3c3e7a676091198789aac16932a87cdeafc50"},{"sha":"639b840983eb6ba34760f26e462a802311d86668","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Final conflict fix... hopefully","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/639b840983eb6ba34760f26e462a802311d86668"},{"sha":"715a7e8fa1db3cb4c96f18a1369c9e44f94189e9","author":{"name":"Clinton Phillos","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Merge branch 'master' into add_particle_effects_to_modules","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/715a7e8fa1db3cb4c96f18a1369c9e44f94189e9"},{"sha":"fb1d796f267fb7bf3a812ba900f9680ce1955f0d","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Added Vox Models for all units and modules to project","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/fb1d796f267fb7bf3a812ba900f9680ce1955f0d"},{"sha":"b275ede3fe4bfdcb022cc6b635a3a2620345ef5a","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Added new models for Fighter and added positions for modules","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/b275ede3fe4bfdcb022cc6b635a3a2620345ef5a"},{"sha":"4c09fc4dac99e4f01c8fafcbf86895bcdd6689ec","author":{"name":"perplexedotter","email":"27dad8d95c53a25586349f8e02e1d4b0ccb95129@gmail.com"},"message":"Merge branch 'add_particle_effects_to_modules' of https://github.com/perplexedotter/CapstoneProject into add_particle_effects_to_modules","distinct":false,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/4c09fc4dac99e4f01c8fafcbf86895bcdd6689ec"},{"sha":"10b28967e2a9fb657ee61efb0d31a069ac831043","author":{"name":"pgrimes88","email":"1e6ae525c373cc54bd3522a127481c36ebf43fa3@users.noreply.github.com"},"message":"Merge pull request #63 from perplexedotter/add_particle_effects_to_modules\n\nAdd particle effects to modules and update module instantiation","distinct":true,"url":"https://api.github.com/repos/perplexedotter/CapstoneProject/commits/10b28967e2a9fb657ee61efb0d31a069ac831043"}]}
{"actor":{"display_login":"pgrimes88"}}