{"push_id":967652097,"size":18,"distinct_size":1,"ref":"refs/heads/master","head":"20afd9b93ff5d071603a583f7efd609b5d28c064","before":"38fac5f772689413cc3fd15b7f602db6f0b2befb","commits":[{"sha":"0b053d184f292f520c92877213db7d1ea21a9592","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Created populate AreaEffects class","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/0b053d184f292f520c92877213db7d1ea21a9592"},{"sha":"a61818dbc6cddf56eaadc3528036c39815e88247","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Merge conflicts","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/a61818dbc6cddf56eaadc3528036c39815e88247"},{"sha":"3f74bfc03a519d237a3327d0065f63b8c1d1ce0b","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Merge branch 'master' of github.com:IronicCats/Iteration1 into occp\n\n# Conflicts:\n#\tPlayer test.txt","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/3f74bfc03a519d237a3327d0065f63b8c1d1ce0b"},{"sha":"2b71f011f9a0192d7f109f72976cdce9663bb904","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Player error","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/2b71f011f9a0192d7f109f72976cdce9663bb904"},{"sha":"55d76737fa8b54e6bc794a677ae2cc6bd6753f6a","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Merge branch 'master' of github.com:IronicCats/Iteration1 into occp","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/55d76737fa8b54e6bc794a677ae2cc6bd6753f6a"},{"sha":"7456503ec0d9478e5c81de61075f66057974bfc2","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Player txt nonsense","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/7456503ec0d9478e5c81de61075f66057974bfc2"},{"sha":"5d669690f0357aabe442674a26f39d75f0e77c79","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Adding AreaEffects to map","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/5d669690f0357aabe442674a26f39d75f0e77c79"},{"sha":"25522811f602257f1fc1d834bfddf4b5ffff933a","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Player txt","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/25522811f602257f1fc1d834bfddf4b5ffff933a"},{"sha":"413f4844e491d08401028743d02a6d072c32624b","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Added several area effects to the map.","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/413f4844e491d08401028743d02a6d072c32624b"},{"sha":"658ec123e3a1d46502e65258a633d8cb9ac4f1e1","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Fixed merge conflicts","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/658ec123e3a1d46502e65258a633d8cb9ac4f1e1"},{"sha":"aa5d04a118e8bc143847070816d4232da248452d","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Fix merge conflicts","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/aa5d04a118e8bc143847070816d4232da248452d"},{"sha":"b526a33df44620f180c9fc8eac6c4e96ff168c67","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Merge branch 'master' of github.com:IronicCats/Iteration1 into occp","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/b526a33df44620f180c9fc8eac6c4e96ff168c67"},{"sha":"32ef3cac88af2a4026f1d794222dbe23ed9b19ec","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Changed decal locations so they aren't on the same tiles as items","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/32ef3cac88af2a4026f1d794222dbe23ed9b19ec"},{"sha":"6f4c4980b1627627f547faa1bc8e4b2710d5b1f5","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Made the stats of the entity change with the occupation","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/6f4c4980b1627627f547faa1bc8e4b2710d5b1f5"},{"sha":"3090efb20186dc17598cb57a941e5bd0163d2491","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"You can go back to the main menu from the loading menu.","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/3090efb20186dc17598cb57a941e5bd0163d2491"},{"sha":"7e377503b4bf6da06d3af3aee668825adf9ef5b8","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Merge branch 'master' of github.com:IronicCats/Iteration1 into occp","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/7e377503b4bf6da06d3af3aee668825adf9ef5b8"},{"sha":"34d81e4826829193a88ae852b236f76d795fd181","author":{"email":"1d73e5c657ef06a93a7a42901c0beb78d7860af9@gmail.com","name":"m-mazumder"},"message":"Player","distinct":false,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/34d81e4826829193a88ae852b236f76d795fd181"},{"sha":"20afd9b93ff5d071603a583f7efd609b5d28c064","author":{"email":"f30ca652c53fe2d8bb6bb0881ce623047d593048@gmail.com","name":"Joshua Kegley"},"message":"Merge pull request #80 from IronicCats/occp\n\nOccp","distinct":true,"url":"https://api.github.com/repos/IronicCats/Iteration1/commits/20afd9b93ff5d071603a583f7efd609b5d28c064"}]}