{"push_id":743706515,"size":14,"distinct_size":14,"ref":"refs/heads/new_pyland","head":"eff8181ea9d2da37cd21deef8c4aead7301acc69","before":"3322d91743dd6dfd10787854fc80ad8d56f7fb63","commits":[{"sha":"ca7b762af0221d0875e3bec529c8540ba8b03a4a","author":{"email":"b87990cf7785a5d2b63e2503707aa9da85399d0c@gmail.com","name":"alexandaday"},"message":"Integrated editor successfully saves python script","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/ca7b762af0221d0875e3bec529c8540ba8b03a4a"},{"sha":"558b671cd2a859d384aec088e72feb1708c83f4e","author":{"email":"b87990cf7785a5d2b63e2503707aa9da85399d0c@gmail.com","name":"alexandaday"},"message":"Run/halt and speed buttons correctly work. Original move and cut reimplemented to keep old game version working","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/558b671cd2a859d384aec088e72feb1708c83f4e"},{"sha":"feb22635528bda74fe2c8d16abffc6e756c111e7","author":{"email":"b87990cf7785a5d2b63e2503707aa9da85399d0c@gmail.com","name":"alexandaday"},"message":"SDL correctly dislays and resizes","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/feb22635528bda74fe2c8d16abffc6e756c111e7"},{"sha":"7557423229dbba7826bfb7f7f766299174be6eca","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"removed annoying object from intro challnege","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/7557423229dbba7826bfb7f7f766299174be6eca"},{"sha":"a4d36315d83c70008017ee60a89f8454326be0dc","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"REmoved top blocker from introduction level complete!","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/a4d36315d83c70008017ee60a89f8454326be0dc"},{"sha":"84cf55ce929e997078f37af4642e3c2fec195716","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"Removed portal from level 5","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/84cf55ce929e997078f37af4642e3c2fec195716"},{"sha":"866bb412aa0a44d6942c4a7e96af2cb824412dcd","author":{"email":"b87990cf7785a5d2b63e2503707aa9da85399d0c@gmail.com","name":"alexandaday"},"message":"Fixed first level for new interface","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/866bb412aa0a44d6942c4a7e96af2cb824412dcd"},{"sha":"d6dea11a85b3ee266eb8ff077ec3c45b481adab7","author":{"email":"b87990cf7785a5d2b63e2503707aa9da85399d0c@gmail.com","name":"alexandaday"},"message":"Resolving merge conflicts","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/d6dea11a85b3ee266eb8ff077ec3c45b481adab7"},{"sha":"a3eb919ae2fe67c6c3536dde00ce6a9e7d5b7b04","author":{"email":"b87990cf7785a5d2b63e2503707aa9da85399d0c@gmail.com","name":"alexandaday"},"message":"Removed fifth level from main world level","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/a3eb919ae2fe67c6c3536dde00ce6a9e7d5b7b04"},{"sha":"d2c1656143477fcabce77b513c3d2ce775f260e7","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"Fixed segfault on ubuntu desktops","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/d2c1656143477fcabce77b513c3d2ce775f260e7"},{"sha":"c8c65090b525705e89abd1e9e663ff65e711c29c","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"Merge branch 'third_new_integrated_editor' of https://github.com/pyland/pyland into third_new_integrated_editor","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/c8c65090b525705e89abd1e9e663ff65e711c29c"},{"sha":"63c6694476d2f8ab4ee3084c0505b09f581e822f","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"Fixed Ubuntu errors and added helpful message to script 1.py :)","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/63c6694476d2f8ab4ee3084c0505b09f581e822f"},{"sha":"7dd3da52020e05e1938ba0365219d9480183384f","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"Merge branch 'third_new_integrated_editor' of https://github.com/pyland/pyland into pyland-third_new_integrated_editor\n\nConflicts:\n\tmaps/introduction.tmx\n\tmaps/start_screen.tmx\n\tsrc/challenges/introduction_challenge.cpp\n\tsrc/challenges/start_screen.cpp\n\tsrc/engine.cpp\n\tsrc/game_main.cpp\n\tsrc/game_main.hpp\n\tsrc/python_embed/api.cpp\n\tsrc/python_embed/scripts/bootstrapper.py\n\tsrc/qtgui/mainwindow.cpp\n\tsrc/qtgui/moc_mainwindow.cpp","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/7dd3da52020e05e1938ba0365219d9480183384f"},{"sha":"eff8181ea9d2da37cd21deef8c4aead7301acc69","author":{"email":"c01670ab57fdd8d8a7c9713947a01427f1b8e62a@cam.ac.uk","name":"Tom Read-Cutting"},"message":"Merge branch 'pyland-third_new_integrated_editor' into new_pyland","distinct":true,"url":"https://api.github.com/repos/Moosichu/pyland/commits/eff8181ea9d2da37cd21deef8c4aead7301acc69"}]}