{"push_id":3103392579,"size":17,"distinct_size":1,"ref":"refs/heads/development","head":"7bf141687d2881898165aa724a3204c503d14ee9","before":"94c70ef8b80c7637b274d4f06154c015ab5cf67d","commits":[{"sha":"c2d7a34b3f5734df3d59f49fd1c63f56283190aa","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Initial shop scene creation","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/c2d7a34b3f5734df3d59f49fd1c63f56283190aa"},{"sha":"15e78e01324dcc94c7a46c2d5a6d9a3bd2113445","author":{"name":"Lee Lunn","email":"4ec0efe1f124912f214ef789d232669790047c12@dal.ca"},"message":"Merge branch 'development' into feature-shop_scene\n\n# Conflicts:\n#\tBright Tides/Assets/Prefabs/MapGeneration.meta\n#\tBright Tides/Assets/Prefabs/MapGeneration/MapGenerator.prefab.meta\n#\tBright Tides/Assets/Resources/Items.meta\n#\tBright Tides/Assets/Resources/Items/Ammunition.asset.meta\n#\tBright Tides/Assets/Resources/Projectiles.meta\n#\tBright Tides/Assets/Resources/Projectiles/CannonBall.prefab.meta\n#\tBright Tides/Assets/Scenes/Resources/MainMenu.asset\n#\tBright Tides/Assets/Scripts/Entities.meta\n#\tBright Tides/Assets/Scripts/Scriptables/Item.cs","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/15e78e01324dcc94c7a46c2d5a6d9a3bd2113445"},{"sha":"95cd54611a1aa7ef778a974ad40a203a9642cfa4","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Update ShopMenu.unity\n\nAdded shop scene title and proceed button.","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/95cd54611a1aa7ef778a974ad40a203a9642cfa4"},{"sha":"3f38197225293163d33b4447c4e196dca8d695ff","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Minor Shop Changes","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/3f38197225293163d33b4447c4e196dca8d695ff"},{"sha":"0ff00f2604914a0f9c2f89f1aede28a27d510db7","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Testing shop buttons","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/0ff00f2604914a0f9c2f89f1aede28a27d510db7"},{"sha":"464bdd3c823361a3cfe19f62eb37efacc67bd3e0","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Merge branch 'development' into feature-shop_scene","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/464bdd3c823361a3cfe19f62eb37efacc67bd3e0"},{"sha":"7513554806c76f66e4442ea48ab16719cc2f60bb","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Added item types","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/7513554806c76f66e4442ea48ab16719cc2f60bb"},{"sha":"c925c1d47bea8947046dc7e9fd557e105b4c5d3c","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Added maxhealth and begun handling for item purchases","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/c925c1d47bea8947046dc7e9fd557e105b4c5d3c"},{"sha":"2a7b22bdb69bcf2b73ed0a3372ede38a7d8b7e1d","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Minor fixes","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/2a7b22bdb69bcf2b73ed0a3372ede38a7d8b7e1d"},{"sha":"e8cc850979bf67c572084fb9c6b56a1fadb30f81","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Merge branch 'development' into feature-shop_scene","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/e8cc850979bf67c572084fb9c6b56a1fadb30f81"},{"sha":"5860033c9eaba3ce6ff4620abaec8c13af13c8a1","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Added item types and full item purchase handling","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/5860033c9eaba3ce6ff4620abaec8c13af13c8a1"},{"sha":"b8f178a2c809e34cd83b63dab404cf4fe2937e39","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Minor fixes","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/b8f178a2c809e34cd83b63dab404cf4fe2937e39"},{"sha":"72a46f0f31cadc62e425227b019727c6efc4f960","author":{"name":"Elliott","email":"8f66b3ba0236e87a542c3ec86245ba5ccf091ca0@gmail.com"},"message":"Shop scene transition for testing now working","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/72a46f0f31cadc62e425227b019727c6efc4f960"},{"sha":"2dba80adee84d748738c9b250e8e16a9868963b9","author":{"name":"Lee Lunn","email":"4ec0efe1f124912f214ef789d232669790047c12@dal.ca"},"message":"Tweaks to show shop loading / unloading logic","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/2dba80adee84d748738c9b250e8e16a9868963b9"},{"sha":"3a5917acfa24371edf68e07599859cde76d52c7d","author":{"name":"Lee Lunn","email":"4ec0efe1f124912f214ef789d232669790047c12@dal.ca"},"message":"Merge branch 'development' into feature-shop_scene","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/3a5917acfa24371edf68e07599859cde76d52c7d"},{"sha":"cd5009576fb29acaea656d718321f33b4ded6db4","author":{"name":"Lee Lunn","email":"4ec0efe1f124912f214ef789d232669790047c12@dal.ca"},"message":"Put enemy spawns back","distinct":false,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/cd5009576fb29acaea656d718321f33b4ded6db4"},{"sha":"7bf141687d2881898165aa724a3204c503d14ee9","author":{"name":"Lee Lunn","email":"c23940d0be42151fa85ec49023f3b80afd851b18@users.noreply.github.com"},"message":"Merge pull request #14 from CSCI4168-JEL/feature-shop_scene\n\nShop scene","distinct":true,"url":"https://api.github.com/repos/CSCI4168-JEL/gamedev-brighttides/commits/7bf141687d2881898165aa724a3204c503d14ee9"}]}
{"actor":{"display_login":"llunn"}}