{"push_id":723877569,"size":12,"distinct_size":12,"ref":"refs/heads/master","head":"f87e3a932cc6c93d511ba2682d4ef95615456502","before":"bd5b75f7f9ae933f85cc237f3a79820249b4d87f","commits":[{"sha":"ce5947043e84cedaacf933e59f3d4ef55c276e76","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"created initial hotkeys submenu for pause menu","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/ce5947043e84cedaacf933e59f3d4ef55c276e76"},{"sha":"da3b15320a9d9a7d9cf6a7098adeb8610e56d16b","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"Initial form of hotkeys gui","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/da3b15320a9d9a7d9cf6a7098adeb8610e56d16b"},{"sha":"6f8b8c3aa3b44ba44579eccb0fff496fe72aa0ea","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"fixed main so it is up to date with master","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/6f8b8c3aa3b44ba44579eccb0fff496fe72aa0ea"},{"sha":"4d1a13ed9317eaacae507676a1fde525b1326ad5","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"added a hotkey class and changed most functions to use it.  I am unable to wrap it for python though, so you can't actually set any hotkeys.  This problem will be fixed in future commits.","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/4d1a13ed9317eaacae507676a1fde525b1326ad5"},{"sha":"c5dedf274e1bceb06d97e32ff3c10c92969cdd42","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"completed all functionality for keybindings gui","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/c5dedf274e1bceb06d97e32ff3c10c92969cdd42"},{"sha":"fe58c206968b20d038a000107757cf4f5b98d1f1","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"Merged in changes from Master 2015-04-02","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/fe58c206968b20d038a000107757cf4f5b98d1f1"},{"sha":"c6745f71046a80f44be98e7e4a8e3bd8c294aaee","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"fixed crash on key press","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/c6745f71046a80f44be98e7e4a8e3bd8c294aaee"},{"sha":"734270c330c0809ab9653d6c1f72810aa628c404","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"updated error message when changing hotkeys and cleaned up code","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/734270c330c0809ab9653d6c1f72810aa628c404"},{"sha":"da02ccf13b8387daa94311ce780a3189a3248cd0","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"fixed bug with double clicking on menu items","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/da02ccf13b8387daa94311ce780a3189a3248cd0"},{"sha":"8bd853472cd3b0462a22c071e7b425e4fcd9a29c","author":{"email":"ccb4a969c2e4c5d46228e7133d6586e5f0c3a832@gmail.com","name":"Exairnous"},"message":"Merge branch 'master' into keybindings-gui\n\nConflicts:\n\tapps/freeablo/fagui/guimanager.cpp\n\tresources/gui/pausemenu.rml\n\tresources/python/menu.py","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/8bd853472cd3b0462a22c071e7b425e4fcd9a29c"},{"sha":"d82e3bed2d76c90b43e0fadaf80024cba864b283","author":{"email":"f5ba034cbfaed4205be24ccd8b96f074573c1f3a@wheybags.com","name":"Tom Mason"},"message":"Merge pull request #110 from Exairnous/keybindings-gui\n\nKeybindings gui","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/d82e3bed2d76c90b43e0fadaf80024cba864b283"},{"sha":"f87e3a932cc6c93d511ba2682d4ef95615456502","author":{"email":"c75f728d6842e2ec53d57b4fe24ca40ad7e7db13@tcd.ie","name":"Colm Vize"},"message":"Merge branch 'master' of https://github.com/wheybags/freeablo","distinct":true,"url":"https://api.github.com/repos/mloccy/freeablo/commits/f87e3a932cc6c93d511ba2682d4ef95615456502"}]}