{"push_id":1117856129,"size":40,"distinct_size":1,"ref":"refs/heads/whotsits_stuff","head":"c6ba7622e4f24b75d949943b99047ba1d2931122","before":"3e23ff873aefdede00d9ec0ca6a6d247115b9137","commits":[{"sha":"d39ed624368605889a4bf6dddbee9d4680053585","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Alex's-Branch","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/d39ed624368605889a4bf6dddbee9d4680053585"},{"sha":"867878a737bafaac144cf14ab485dac0e3d82032","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Shiplifetime changes","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/867878a737bafaac144cf14ab485dac0e3d82032"},{"sha":"31417eeda274c77517338cdb49a31605babf5cfa","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Merge remote-tracking branch 'refs/remotes/origin/Alex's-Branch'","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/31417eeda274c77517338cdb49a31605babf5cfa"},{"sha":"e28a83807818ca34e4d208072bd455cf50b35fdf","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Items (WIP) Need to fix itemBase","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/e28a83807818ca34e4d208072bd455cf50b35fdf"},{"sha":"1667ac0e971222ef275478cd04cf951501261670","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"altered ItemBase but we shouldn't use this one.","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/1667ac0e971222ef275478cd04cf951501261670"},{"sha":"c06b5c74039fc572611d8bc72ed8ad0798d4b4e5","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Updated ItemBase to be more compatible with element","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/c06b5c74039fc572611d8bc72ed8ad0798d4b4e5"},{"sha":"b2b869ece19ba1f175c2cbbc82febd0a5c86051f","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Added four basic parts","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/b2b869ece19ba1f175c2cbbc82febd0a5c86051f"},{"sha":"314e2e2fbe7702100e9a6e69b709c99ff60cbc70","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Standardised durability levels low, mid, high.","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/314e2e2fbe7702100e9a6e69b709c99ff60cbc70"},{"sha":"423228c10b613fcbd4406701d2d64dac2babaf0c","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Updated to take in sources","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/423228c10b613fcbd4406701d2d64dac2babaf0c"},{"sha":"8fa017bfc49c5ea5e99bb087ec22cd6c9993d34c","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Merge remote-tracking branch 'refs/remotes/origin/itemBase' into items\n\n# Conflicts:\n#\tItemBase.js","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/8fa017bfc49c5ea5e99bb087ec22cd6c9993d34c"},{"sha":"58b5d4fed470637b773931f460fe96d212515d96","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Updated itemBase","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/58b5d4fed470637b773931f460fe96d212515d96"},{"sha":"36ccff0dfe81031e6ac1dfa2576924e79871b4b3","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Merge remote-tracking branch 'refs/remotes/origin/itemBase'","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/36ccff0dfe81031e6ac1dfa2576924e79871b4b3"},{"sha":"817b23fcc4fd0c3c2ed7b6ac743feda9a076cfa4","author":{"email":"5739ed97aedc21757e38670a7a79582360eb0a5d@gmail.com","name":"Whotsit"},"message":"Merge remote-tracking branch 'refs/remotes/origin/whotsits_stuff'","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/817b23fcc4fd0c3c2ed7b6ac743feda9a076cfa4"},{"sha":"0a847ff430530b49e3d3cd6b6fe11f49c0ce32b6","author":{"email":"5739ed97aedc21757e38670a7a79582360eb0a5d@gmail.com","name":"Whotsit"},"message":"Rename","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/0a847ff430530b49e3d3cd6b6fe11f49c0ce32b6"},{"sha":"19ee875bf6c16b17a780fefcc7e814e6c6358aae","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Added URL, not sure if it works yet","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/19ee875bf6c16b17a780fefcc7e814e6c6358aae"},{"sha":"2f8bb864048a091076ae39c33c61d1dbeac3be68","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"Changed game name","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/2f8bb864048a091076ae39c33c61d1dbeac3be68"},{"sha":"567eea175b0dedfb8a6939316190c98e13bffd3a","author":{"email":"9e00efde58ee674578d2218f739d1d2fd31771aa@ucsc.edu","name":"Alexander Mao"},"message":"pictures","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/567eea175b0dedfb8a6939316190c98e13bffd3a"},{"sha":"b96204a5c2808689180563c8e67e200db1c8d384","author":{"email":"d6b2ca4b04b1e95cfca2c022655add0dca353b93@gmail.com","name":"hcconnor"},"message":"cleaned out comments","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/b96204a5c2808689180563c8e67e200db1c8d384"},{"sha":"dcb76a9443fef0e8f999f3611c9bac4a8d657ed8","author":{"email":"d6b2ca4b04b1e95cfca2c022655add0dca353b93@gmail.com","name":"hcconnor"},"message":"Merge branch 'master' into making_drag_and_drop\n\n# Conflicts:\n#\tgame.js","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/dcb76a9443fef0e8f999f3611c9bac4a8d657ed8"},{"sha":"f92f24ca11ce6b0ea7b28e0eb13efc1ee7ffd885","author":{"email":"d6b2ca4b04b1e95cfca2c022655add0dca353b93@gmail.com","name":"hcconnor"},"message":"Revert \"Merge branch 'master' into making_drag_and_drop\"\n\nThis reverts commit dcb76a9443fef0e8f999f3611c9bac4a8d657ed8, reversing\nchanges made to b96204a5c2808689180563c8e67e200db1c8d384.","distinct":false,"url":"https://api.github.com/repos/hcconnor/Caffeinated-turtles/commits/f92f24ca11ce6b0ea7b28e0eb13efc1ee7ffd885"}]}