{"push_id":614819335,"size":41,"distinct_size":1,"ref":"refs/heads/Andrey","head":"a2b8704d2143837d1b9adfab8e738fb5d0b4446d","before":"5bda77ddfbdc1ad91bfeec0f6a0e913543d89678","commits":[{"sha":"5101008113dbbfe212db35bab9dd820db2c3bb20","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"s_wittma"},"message":"tried deleting .obj, .tlogs and debug folders","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/5101008113dbbfe212db35bab9dd820db2c3bb20"},{"sha":"f14d279822eb4a2047cfc432624c4ee379b2d6f6","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"s_wittma"},"message":"Merge branch 'master' into Skyler\n\nConflicts:\n\tCOMP_371_Project/Source/AsteroidFactory.cpp\n\tCOMP_371_Project/Source/AsteroidModel.h\n\tCOMP_371_Project/Source/BackgroundFactory.cpp\n\tCOMP_371_Project/Source/BackgroundFactory.h\n\tCOMP_371_Project/Source/BackgroundSphereModel.h\n\tCOMP_371_Project/Source/World.cpp","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/f14d279822eb4a2047cfc432624c4ee379b2d6f6"},{"sha":"065895c9ceebf619a51515b97b3cc1c187722d7c","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"s_wittma"},"message":"Merge branch 'master' into Skyler\n\nConflicts:\n\tCOMP_371_Project/Source/AsteroidFactory.cpp\n\tCOMP_371_Project/Source/BackgroundFactory.cpp\n\tSource/BackgroundFactory.h\n\tSource/World.cpp","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/065895c9ceebf619a51515b97b3cc1c187722d7c"},{"sha":"b6b1e6a78e8855978ad25d964b14fd61d7da3cbe","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"s_wittma"},"message":"committing files so that I can delete them","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/b6b1e6a78e8855978ad25d964b14fd61d7da3cbe"},{"sha":"6a6ff92c6047acb2ca9a8e470cf33910065eb877","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"s_wittma"},"message":"Merge branch 'master' into Skyler\n\nConflicts:\n\tCOMP_371_Project/Source/AsteroidFactory.cpp\n\tCOMP_371_Project/Source/BackgroundFactory.cpp\n\tSource/BackgroundFactory.h\n\tSource/World.cpp","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/6a6ff92c6047acb2ca9a8e470cf33910065eb877"},{"sha":"aa95bafcc9acb9c47ef3cd016995dd20e3adbf76","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"s_wittma"},"message":"Merge branch 'master' into Skyler","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/aa95bafcc9acb9c47ef3cd016995dd20e3adbf76"},{"sha":"319a1eb839c5a1338a88839d0defeebb4f5c4676","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"s_wittma"},"message":"Merge branch 'master' into Skyler","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/319a1eb839c5a1338a88839d0defeebb4f5c4676"},{"sha":"199178a299a809afec2aeb3e02afbab7a8888131","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"s_wittma"},"message":"Merge branch 'master' into Skyler","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/199178a299a809afec2aeb3e02afbab7a8888131"},{"sha":"60fbd99ba7d49eccdf0e3370268645e9a3f007e8","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"s_wittma"},"message":"removing old changes to make program run","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/60fbd99ba7d49eccdf0e3370268645e9a3f007e8"},{"sha":"1245c8fe84685c9fd723464721024c30c1f87011","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"testing name change!","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/1245c8fe84685c9fd723464721024c30c1f87011"},{"sha":"c60d025aac19cbc566a62cd5b69fd60f7fd9c8d7","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"Merge branch 'Zack'","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/c60d025aac19cbc566a62cd5b69fd60f7fd9c8d7"},{"sha":"eae8523c2927e00e2137848be5c3bac86495712f","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"Merge branch 'master' into Skyler","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/eae8523c2927e00e2137848be5c3bac86495712f"},{"sha":"20b11bfd0de9653a0ae17f3500cfaff2b6f336af","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"Got rid of BackgroundFactory, will change it to Skybox","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/20b11bfd0de9653a0ae17f3500cfaff2b6f336af"},{"sha":"4ea3b91f0c9f6734a8719182cf012afe7b1b9118","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"Added Resources Folder with some Skybox .bmp images to try and use with Skybox","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/4ea3b91f0c9f6734a8719182cf012afe7b1b9118"},{"sha":"744f9a55fcf07122f743d8503c76a2b88dfebc86","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"Added Skybox resources to play around with","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/744f9a55fcf07122f743d8503c76a2b88dfebc86"},{"sha":"2ede8ffd66216ca6153358517e8a2e00ba682228","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"Work on Skybox shaders","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/2ede8ffd66216ca6153358517e8a2e00ba682228"},{"sha":"b3c66c335724803654489d2d046748abc769930b","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"adfasd","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/b3c66c335724803654489d2d046748abc769930b"},{"sha":"471a1e71a87eaf64449f32d580bc6ec69f9276d4","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"Merge branch 'Skyler' into test","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/471a1e71a87eaf64449f32d580bc6ec69f9276d4"},{"sha":"3f25ae25af4bb08d0cd08b7b1d3cfd68ff47d466","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"Added Groups in Xcode","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/3f25ae25af4bb08d0cd08b7b1d3cfd68ff47d466"},{"sha":"bd400d63f3da7703d878f5c2629aaf3356a702bd","author":{"email":"2c6c0742c1a2b54a7e51347b960452a14370d8a8@gmail.com","name":"SkylerWittman"},"message":"Fixed groups in Xcode, deleted scenes\n\nScenes folder and files are useless so I deleted them.\nAlso grouped some things in Xcode, I’ll do it in Visual Studio later to\nmatch Xcode.","distinct":false,"url":"https://api.github.com/repos/Archimedyz/COMP_371_3D_Space_Shooter/commits/bd400d63f3da7703d878f5c2629aaf3356a702bd"}]}