{"push_id":1092140182,"size":38,"distinct_size":3,"ref":"refs/heads/Brad's","head":"bfd92284f40ff36f2a7c5abb9c17a4e0e9b3faba","before":"45efda94459d5d589d70f5bac0a43e5fef1d5ba8","commits":[{"sha":"e4f760827c2dcd4ce45f7846900d457f0a9d357a","author":{"email":"143a284775bcb51332832882ec3442103bb886f8@hotmail.com","name":"dmzimmerman13"},"message":"Dave's Branch","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/e4f760827c2dcd4ce45f7846900d457f0a9d357a"},{"sha":"c0e2b27a5a3685c584d1c3035c9fab2ca2e6432d","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"initial homeButton commit","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/c0e2b27a5a3685c584d1c3035c9fab2ca2e6432d"},{"sha":"e67cac3134f60093124d5e8fd1f3a11efc8cb4f6","author":{"email":"143a284775bcb51332832882ec3442103bb886f8@hotmail.com","name":"dmzimmerman13"},"message":"Merge remote-tracking branch 'origin/AddingMap' into BranchesOfDave","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/e67cac3134f60093124d5e8fd1f3a11efc8cb4f6"},{"sha":"e3713a6b0121311aabfba8a93e803d9afc27fb73","author":{"email":"143a284775bcb51332832882ec3442103bb886f8@hotmail.com","name":"dmzimmerman13"},"message":"Test Commit. Changed location of Launch Button","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/e3713a6b0121311aabfba8a93e803d9afc27fb73"},{"sha":"c150fd4fb43f047613e104906ad44f6994783068","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"3 home buttons working","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/c150fd4fb43f047613e104906ad44f6994783068"},{"sha":"f6dfb0d89b2fcfca4602ab80eab00c4d493c1919","author":{"email":"143a284775bcb51332832882ec3442103bb886f8@hotmail.com","name":"dmzimmerman13"},"message":"Merge remote-tracking branch 'origin/homeButton' into BranchesOfDave","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/f6dfb0d89b2fcfca4602ab80eab00c4d493c1919"},{"sha":"313a3dca6df493ed9fb698354d18b0c70f89c67d","author":{"email":"143a284775bcb51332832882ec3442103bb886f8@hotmail.com","name":"dmzimmerman13"},"message":"Merge remote-tracking branch 'origin/Brad's' into BranchesOfDave","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/313a3dca6df493ed9fb698354d18b0c70f89c67d"},{"sha":"e8941aec7a3c47254a9d72f56f83268e73702245","author":{"email":"143a284775bcb51332832882ec3442103bb886f8@hotmail.com","name":"dmzimmerman13"},"message":"Merge remote-tracking branch 'origin/AddingMap' into BranchesOfDave","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/e8941aec7a3c47254a9d72f56f83268e73702245"},{"sha":"667b23aa576084961420fb29b4f9c7d2cb6bb4b3","author":{"email":"143a284775bcb51332832882ec3442103bb886f8@hotmail.com","name":"dmzimmerman13"},"message":"Merged with Other branches. Adding images to Options Screen","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/667b23aa576084961420fb29b4f9c7d2cb6bb4b3"},{"sha":"164f669bffcbc416fba9b342fe12116930dffb36","author":{"email":"0fe596ab36ea7ae9cc3fcd8cf8cdbfd3b912e455@wisc.edu","name":"jdurbanek"},"message":"Added Settings with persistence.","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/164f669bffcbc416fba9b342fe12116930dffb36"},{"sha":"5e736e79359bb3d80c54cca93f142fd43f6d2e08","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"Merge remote-tracking branch 'origin/Brad's' into homeButton\n\n# Conflicts:\n#\tapp/src/main/java/project/mobile/newworld/Base.java\n#\tapp/src/main/java/project/mobile/newworld/GoOut.java\n#\tapp/src/main/res/layout/activity_go_out.xml","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/5e736e79359bb3d80c54cca93f142fd43f6d2e08"},{"sha":"42062e0e7396b2939e31d4e417ae76fe7767bb3e","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"Merge remote-tracking branch 'origin/BranchesOfDave' into homeButton","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/42062e0e7396b2939e31d4e417ae76fe7767bb3e"},{"sha":"1e38dcf89bfcfbe61201510940a18c7ca43fe0dd","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"Merge remote-tracking branch 'origin/AddingMap' into homeButton","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/1e38dcf89bfcfbe61201510940a18c7ca43fe0dd"},{"sha":"53fec37a8da9aa170822a1bc7ff206e2ce327fea","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"fixed broken home button\nadded upgradeable class\nhave some tests for upgrading buildings and collecting resources","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/53fec37a8da9aa170822a1bc7ff206e2ce327fea"},{"sha":"d6bdd47de5b820745015a0fb754f60007c6010fa","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"added upgrade methods and buttons\nstill need logic to check if levels and resources are met","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/d6bdd47de5b820745015a0fb754f60007c6010fa"},{"sha":"87adc7442f231ac97a88104078614fa38a0d8cb8","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"changed upgradeables to buildings","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/87adc7442f231ac97a88104078614fa38a0d8cb8"},{"sha":"63e6129f1965337ede63b57a868b3217897945d0","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"changed materials to wood, stone, and metal","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/63e6129f1965337ede63b57a868b3217897945d0"},{"sha":"69a5716ed4f16724fdc0fee2438ee70b78c41081","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"mainBuidling can now be upgraded from level 1-4 and logic is set up for all the way to 10 using wood, stone and metal","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/69a5716ed4f16724fdc0fee2438ee70b78c41081"},{"sha":"88d5bbf98d0abf856a5c13a314512d0dee5565ce","author":{"email":"21c7b63bd66537375b8305e64c54f6c2967b367f@wisc.edu","name":"Anthony"},"message":"push","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/88d5bbf98d0abf856a5c13a314512d0dee5565ce"},{"sha":"1460467fd3a95408c4f0c74112f5e12301ad0fff","author":{"email":"0fe596ab36ea7ae9cc3fcd8cf8cdbfd3b912e455@wisc.edu","name":"jdurbanek"},"message":"Added some basic checks for wifi connectivity.","distinct":false,"url":"https://api.github.com/repos/jdurbanek/NewWorld/commits/1460467fd3a95408c4f0c74112f5e12301ad0fff"}]}