{"push_id":687561257,"size":22,"distinct_size":1,"ref":"refs/heads/master","head":"1c1fda6c44928eda7a697aa236768260145ef384","before":"66f806707742ccb277bcb050eed9ee29b6a7c7ac","commits":[{"sha":"fa434d253291fe7fa3fdcd541ef63326088c5f33","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"basic framework for Powerup class","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/fa434d253291fe7fa3fdcd541ef63326088c5f33"},{"sha":"a718554d61222c875546c42c53cc0f5c86743fae","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"powerup constructor, method to check if powerup has been caught, halfway on fall method for draw()","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/a718554d61222c875546c42c53cc0f5c86743fae"},{"sha":"dc886e41e11718748a1e9a8a55413aedc3df1b1f","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"finished falling method","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/dc886e41e11718748a1e9a8a55413aedc3df1b1f"},{"sha":"88f97715155ab9f9801ed58766383a94251abb98","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"powerup methods finished and placed in draw() (bug with boolean caught not being false after powerup is triggered/not triggering fall needs to be fixed)","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/88f97715155ab9f9801ed58766383a94251abb98"},{"sha":"b74f97b7b376fcbb7c080bc17e38ce7806045024","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"fixed bug by implementing an array list of powerups","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/b74f97b7b376fcbb7c080bc17e38ce7806045024"},{"sha":"5ce59deca22c835467d4b693ce5f6f190bcef61f","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"diamond shape, catchGot fixed","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/5ce59deca22c835467d4b693ce5f6f190bcef61f"},{"sha":"50812ce1f553a76ad7b70fd45863255af02a3155","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"reset powerups array list on level up, death, and game over","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/50812ce1f553a76ad7b70fd45863255af02a3155"},{"sha":"acc0a12e048afaf264a7eef0f537ecb30b086f6b","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"if block for powerups with working multiball and lives","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/acc0a12e048afaf264a7eef0f537ecb30b086f6b"},{"sha":"f2bf2d40dfd00864b08db7efb8ce6006f93b46a3","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"new multiball -- it explodes!","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/f2bf2d40dfd00864b08db7efb8ce6006f93b46a3"},{"sha":"5535efceb9d36a67c67032e17eb78e05d0b4c930","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"gravity (untested)","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/5535efceb9d36a67c67032e17eb78e05d0b4c930"},{"sha":"8efa1fdc279ed76881a0b68e68562649e56ca495","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"catch powerup can catch the ball (just need to get it to launch it again)","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/8efa1fdc279ed76881a0b68e68562649e56ca495"},{"sha":"c8b5afd6877871d885cd0ac6e8a65e04538845c1","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"some minor bug fixes (big issue with catch still not fixed)","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/c8b5afd6877871d885cd0ac6e8a65e04538845c1"},{"sha":"107d4a9ecd1897e16a917f9da82e8bc0ea84457c","author":{"email":"ab4138bf7b1fad8dedde02f5905e651354f67715@gmail.com","name":"Randolph Higgins"},"message":"updated gravity","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/107d4a9ecd1897e16a917f9da82e8bc0ea84457c"},{"sha":"326029cd155ff17a7f041b80614d993c1e916ff7","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"merging","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/326029cd155ff17a7f041b80614d993c1e916ff7"},{"sha":"c5f007b83a23f74e7a4a03e13a7762d9b0d1c6ef","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"Merge branch 'powerups' of https://github.com/Randy60/FinalProject2 into powerups\n\nConflicts:\n\tBasic/Basic.pde","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/c5f007b83a23f74e7a4a03e13a7762d9b0d1c6ef"},{"sha":"d2d7fe3c4cabfab7e2717f5c7d54b3260581861f","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"new catch system","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/d2d7fe3c4cabfab7e2717f5c7d54b3260581861f"},{"sha":"792abcdbcb5da6749a5ad3be88303d6d3a3c4fa7","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"merging","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/792abcdbcb5da6749a5ad3be88303d6d3a3c4fa7"},{"sha":"209b22a506bfe48f0c35f23807260f0fbc22a2e5","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"Merge branch 'powerups' of https://github.com/Randy60/FinalProject2 into powerups\n\nConflicts:\n\tBasic/Ball.pde","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/209b22a506bfe48f0c35f23807260f0fbc22a2e5"},{"sha":"6724a578b208d79b6314f865078fe2b602b46ead","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"finished catch powerup","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/6724a578b208d79b6314f865078fe2b602b46ead"},{"sha":"efe6cecfb98eb37e4a54185c2f366158067f8116","author":{"email":"97018a2e9d3c270e00f4bc99f555b2b2a141f86f@gmail.com","name":"Nino Dickersin"},"message":"wide powerup finished","distinct":false,"url":"https://api.github.com/repos/Randy60/FinalProject2/commits/efe6cecfb98eb37e4a54185c2f366158067f8116"}]}