{"push_id":755614116,"size":17,"distinct_size":17,"ref":"refs/heads/new_pyland","head":"466e3030c1b5530d0bbc2aa6798b70ed5079c907","before":"5181f0a57c4ad130a9058eff9019d436762ad782","commits":[{"sha":"4ae364b20355bfa286c64597adf8c20facbf0f55","author":{"email":"ea73c377bbc77d1a40298b0831958daed7d809eb@cam.ac.uk","name":"sams25"},"message":"Merge pull request #41 from pyland/new_pyland\n\nUpdating my version","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/4ae364b20355bfa286c64597adf8c20facbf0f55"},{"sha":"e7d1b1a1abd77595aed0893a520423de98246ecb","author":{"email":"ea73c377bbc77d1a40298b0831958daed7d809eb@cam.ac.uk","name":"sams25"},"message":"Adding pause functionality -try1","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/e7d1b1a1abd77595aed0893a520423de98246ecb"},{"sha":"57f2d1114cad87b1b03ff64366cba7122ad48697","author":{"email":"ea73c377bbc77d1a40298b0831958daed7d809eb@cam.ac.uk","name":"sams25"},"message":"Merge branch 'new_pyland' of http://github.com/sams25/pyland into new_pyland\n\nConflicts:\n\tsrc/core/gui_main.cpp","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/57f2d1114cad87b1b03ff64366cba7122ad48697"},{"sha":"aace2c3997c883ddc38dda9c60b60e9be15f52c3","author":{"email":"ea73c377bbc77d1a40298b0831958daed7d809eb@cam.ac.uk","name":"sams25"},"message":"Got pause to work from the pause button","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/aace2c3997c883ddc38dda9c60b60e9be15f52c3"},{"sha":"31b4a71fadbc858f151d1ccbfc80a41401dfc03b","author":{"email":"ea73c377bbc77d1a40298b0831958daed7d809eb@cam.ac.uk","name":"sams25"},"message":"Trying to get animation frames to work","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/31b4a71fadbc858f151d1ccbfc80a41401dfc03b"},{"sha":"5a6d67543ced0a7e300a2df62847fec615cd0c95","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"Added more and more features (teleporting! :))","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/5a6d67543ced0a7e300a2df62847fec615cd0c95"},{"sha":"eca2e9610907f47e36ed0e0f4ddb59e55311b867","author":{"email":"ea73c377bbc77d1a40298b0831958daed7d809eb@cam.ac.uk","name":"sams25"},"message":"Adding map_object","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/eca2e9610907f47e36ed0e0f4ddb59e55311b867"},{"sha":"8c9f658e50f58de46170736da8381ced1d15c083","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"Fixed segfault by passing correct file_location info to entity","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/8c9f658e50f58de46170736da8381ced1d15c083"},{"sha":"8b1885b8ba55d4dfe8f1f6e94303f154a3252288","author":{"email":"ea73c377bbc77d1a40298b0831958daed7d809eb@cam.ac.uk","name":"sams25"},"message":"Got Animation to work slightly better","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/8b1885b8ba55d4dfe8f1f6e94303f154a3252288"},{"sha":"5700287c3cbe7213bf6d7656a3bb6d332fc2b247","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"Added basic functionality for talking to people","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/5700287c3cbe7213bf6d7656a3bb6d332fc2b247"},{"sha":"bb34f253dd5db957f045b311f5fcf125111cb4e7","author":{"email":"ea73c377bbc77d1a40298b0831958daed7d809eb@cam.ac.uk","name":"sams25"},"message":"Adding new animation stuff","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/bb34f253dd5db957f045b311f5fcf125111cb4e7"},{"sha":"9afbab05924b69297310a6cf5e1150fdd005cd25","author":{"email":"8fec711e25ec5b069b8f210972095b7d8089db09@gmail.com","name":"Moosichu"},"message":"Made it so that you can tap to change direction","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/9afbab05924b69297310a6cf5e1150fdd005cd25"},{"sha":"99a1df5153a8ecc37dca239881366527dafc99d4","author":{"email":"8fec711e25ec5b069b8f210972095b7d8089db09@gmail.com","name":"Moosichu"},"message":"Merge branch 'new_pyland' of https://github.com/alexandaday/pyland into new_pyland\n\nConflicts:\n\tgame/levels/test_world/yingischallenged/main/scripts/start.py","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/99a1df5153a8ecc37dca239881366527dafc99d4"},{"sha":"2b3f90e0de5f879358cc4d8a5a023b1845f9973c","author":{"email":"b87990cf7785a5d2b63e2503707aa9da85399d0c@gmail.com","name":"alexandaday"},"message":"Gui main with resolved conflicts","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/2b3f90e0de5f879358cc4d8a5a023b1845f9973c"},{"sha":"35c4807c4fca4d5674e2a8e5c776108b17235243","author":{"email":"8fec711e25ec5b069b8f210972095b7d8089db09@gmail.com","name":"Moosichu"},"message":"Merge branch 'new_pyland' of https://github.com/alexandaday/pyland into new_pyland\n\nConflicts:\n\tgame/levels/test_world/yingischallenged/main/scripts/start.py","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/35c4807c4fca4d5674e2a8e5c776108b17235243"},{"sha":"885cdce3ffb22f2c5e7f78b67a0245d402e0990c","author":{"email":"8fec711e25ec5b069b8f210972095b7d8089db09@gmail.com","name":"Moosichu"},"message":"Merge branch 'new_animations' of https://github.com/sams25/pyland into new_pyland\n\nConflicts:\n\tgame/player_scripts/1.py\n\tsrc/core/event_manager.cpp\n\tsrc/core/gui_main.cpp\n\tsrc/core/gui_main.hpp\n\tsrc/python_embed/entity.cpp","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/885cdce3ffb22f2c5e7f78b67a0245d402e0990c"},{"sha":"466e3030c1b5530d0bbc2aa6798b70ed5079c907","author":{"email":"8fec711e25ec5b069b8f210972095b7d8089db09@gmail.com","name":"Moosichu"},"message":"Fixed some bugs in merge, animations workgit add -A :/git add -A :/git add -A :/git add -A :/git add -A :/ :D :D :D","distinct":true,"url":"https://api.github.com/repos/pyland/pyland/commits/466e3030c1b5530d0bbc2aa6798b70ed5079c907"}]}