{"push_id":684221186,"size":7,"distinct_size":1,"ref":"refs/heads/master","head":"3dca347a7b6d379a9ec4239d2e87b8e54aaa2a89","before":"6560a8a70d69ab3bd3882ac1a4546b014638597f","commits":[{"sha":"850ebffe8d50710d434b432be4f4f72d2b1f4ca6","author":{"email":"565b3d592a12754567c8d0020fe31ad6cc9fe5bf@gmail.com","name":"Wesley"},"message":"Added arduino communication\n\nfissa","distinct":false,"url":"https://api.github.com/repos/Jannickvb/Wonderen-1001-nacht/commits/850ebffe8d50710d434b432be4f4f72d2b1f4ca6"},{"sha":"05a9ab1f1e7c67a62630688c58aa0b59bc8644fe","author":{"email":"565b3d592a12754567c8d0020fe31ad6cc9fe5bf@gmail.com","name":"Wesley"},"message":"update","distinct":false,"url":"https://api.github.com/repos/Jannickvb/Wonderen-1001-nacht/commits/05a9ab1f1e7c67a62630688c58aa0b59bc8644fe"},{"sha":"4f7047f0d74ed12c04f33f04781d3471d7303570","author":{"email":"119e914ce7afd6e3ad68f10b2395937ca9d22cca@hotmail.com","name":"Supermaniac101"},"message":"Changed some textures\n\nSorry for the bullshit","distinct":false,"url":"https://api.github.com/repos/Jannickvb/Wonderen-1001-nacht/commits/4f7047f0d74ed12c04f33f04781d3471d7303570"},{"sha":"23b3ef8d91014ef59c53ba6bf9015b632f306bc2","author":{"email":"565b3d592a12754567c8d0020fe31ad6cc9fe5bf@gmail.com","name":"xrgman"},"message":"Update feest","distinct":false,"url":"https://api.github.com/repos/Jannickvb/Wonderen-1001-nacht/commits/23b3ef8d91014ef59c53ba6bf9015b632f306bc2"},{"sha":"1df3554dbb1a275c727c94bfa80ec36441548ab8","author":{"email":"565b3d592a12754567c8d0020fe31ad6cc9fe5bf@gmail.com","name":"xrgman"},"message":"Added pictures","distinct":false,"url":"https://api.github.com/repos/Jannickvb/Wonderen-1001-nacht/commits/1df3554dbb1a275c727c94bfa80ec36441548ab8"},{"sha":"bf81e4294a7814348ce931f4c2db7626603f0e57","author":{"email":"119e914ce7afd6e3ad68f10b2395937ca9d22cca@hotmail.com","name":"Supermaniac101"},"message":"Added foilage, working quite good\n\nLelelelelelel","distinct":false,"url":"https://api.github.com/repos/Jannickvb/Wonderen-1001-nacht/commits/bf81e4294a7814348ce931f4c2db7626603f0e57"},{"sha":"3dca347a7b6d379a9ec4239d2e87b8e54aaa2a89","author":{"email":"ebff6f0d4aabe3cacef2d3a01bea77935be04a93@gmail.com","name":"Aareschluchtje"},"message":"Merge remote-tracking branch 'origin/Wesley'\n\nConflicts:\n\t.classpath\n\tbin/control/ArduinoHandler.class\n\tbin/control/ControlManager.class\n\tbin/control/GameStateManager.class\n\tbin/control/ImageHandler.class\n\tbin/control/InputHandler.class\n\tbin/control/WiiMoteHandler.class\n\tbin/jna-3.1.0.jar\n\tbin/model/entities/Entity.class\n\tbin/model/entities/Player.class\n\tbin/model/gamestates/GameState.class\n\tbin/model/gamestates/MenuState.class\n\tbin/model/gamestates/PlayState.class\n\tbin/platform-3.5.2.jar\n\tbin/view/GameFrame.class\n\tbin/view/GamePanel$1.class\n\tbin/view/GamePanel$2.class\n\tbin/view/GamePanel.class\n\tbin/view/Main$1.class\n\tbin/view/Main.class\n\tbin/vlcj-3.0.1.jar\n\tbin/wiiusej.jar\n\tjna-3.1.0.jar\n\tlibs/jna-3.1.0.jar\n\tlibs/platform-3.5.2.jar\n\tlibs/vlcj-3.0.1.jar\n\tlibs/wiiusej.jar\n\tplatform-3.5.2.jar\n\tresources/images/spells/circle.png\n\tresources/images/spells/triangle.png\n\tsrc/control/ArduinoHandler.java\n\tsrc/control/ControlManager.java\n\tsrc/control/GameStateManager.java\n\tsrc/control/ImageHandler.java\n\tsrc/control/InputHandler.java\n\tsrc/control/MusicHandler.java\n\tsrc/control/VideoHandler.java\n\tsrc/control/WiiMoteHandler.java\n\tsrc/model/entities/Entity.java\n\tsrc/model/entities/Player.java\n\tsrc/model/entities/Rock.java\n\tsrc/model/gamestates/BoatGameState.java\n\tsrc/model/gamestates/BossFightState.java\n\tsrc/model/gamestates/IntroMovState.java\n\tsrc/model/gamestates/PlayState.java\n\tsrc/model/gamestates/TutorialState.java\n\tsrc/view/GameFrame.java\n\tsrc/view/GamePanel.java\n\tvlcj-3.0.1.jar\n\twiiusej.jar","distinct":true,"url":"https://api.github.com/repos/Jannickvb/Wonderen-1001-nacht/commits/3dca347a7b6d379a9ec4239d2e87b8e54aaa2a89"}]}