{"push_id":1300022643,"size":33,"distinct_size":0,"ref":"refs/heads/Justin","head":"98710a1f1d1ee2176a8f93ddb0c4ef0c6d98cd61","before":"c5d1ba454f7511835601ddedcde3db7a9f778385","commits":[{"sha":"08d26cbea52aabb9f82ae93639011ee71f543210","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Merge branch 'master' of https://github.com/Kagrinberg/RTA_SuperCoolFunYay\n\n# Conflicts:\n#\tED3_Research_Project/Mesh.cpp","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/08d26cbea52aabb9f82ae93639011ee71f543210"},{"sha":"11b6467da55d582cec3ccdf38b2a0e1df75aac59","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Merge branch 'Justin'\n\n# Conflicts:\n#\tED3_Research_Project/Mesh.cpp\n#\tED3_Research_Project/Shaders/AnimationVS.glsl","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/11b6467da55d582cec3ccdf38b2a0e1df75aac59"},{"sha":"c98ab6d8e41c91a00fdc7b1e96feb4acfceb4a31","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Need to get updated master","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/c98ab6d8e41c91a00fdc7b1e96feb4acfceb4a31"},{"sha":"be266e88aa9090209b1756fea434b30e2a323e9d","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Merge branch 'Justin'\n\n# Conflicts:\n#\tED3_Research_Project/Mesh.cpp\n#\tED3_Research_Project/Shaders/AnimationVS.glsl","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/be266e88aa9090209b1756fea434b30e2a323e9d"},{"sha":"c53658283b12cfebbb862bf337885ee08725b6df","author":{"name":"PeterFarber","email":"6b101e5a2123af21e0cc19ffa2c1a7d8ea52c948@gmail.com"},"message":"Peter Farber: Added Skybox. Got the opengl core profile working=). Transposing the matrix's before being passed to the shader. Got rid of freeglut. Also added a new image loading library called SOIL. No longer using tga instead using png and jpg.\nWarnings I Cant Fix:\n1.) defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULT:Library\n2.) 'APIENTRY': macro redfinition.\nAlso after removing freeglut the memory leaks still exist.... Dont know why =P","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/c53658283b12cfebbb862bf337885ee08725b6df"},{"sha":"afdbb0c2e080fbccc09a7a7d5a676a4df7ab01d1","author":{"name":"Katie Grinberg","email":"39947a54bfb6cc7d95ae3e76e79487a02916c5ff@fullsail.edu"},"message":"Katie: it is making me commit","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/afdbb0c2e080fbccc09a7a7d5a676a4df7ab01d1"},{"sha":"7c90ad4243895afc8b6f19da737a2eb6717f6973","author":{"name":"Katie Grinberg","email":"39947a54bfb6cc7d95ae3e76e79487a02916c5ff@fullsail.edu"},"message":"removed 2 warnings","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/7c90ad4243895afc8b6f19da737a2eb6717f6973"},{"sha":"33aed9d0dcaf5b949a316d0562fc7c467afb4a41","author":{"name":"Katie Grinberg","email":"39947a54bfb6cc7d95ae3e76e79487a02916c5ff@fullsail.edu"},"message":"mile 3 rubric added","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/33aed9d0dcaf5b949a316d0562fc7c467afb4a41"},{"sha":"f863698bc47207a32d935b34514d60a32eac16b5","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Committing to merge NO CHANGES MADE","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/f863698bc47207a32d935b34514d60a32eac16b5"},{"sha":"4f5f61605c01b7c98f51f1285e3cd611020c8524","author":{"name":"PeterFarber","email":"6b101e5a2123af21e0cc19ffa2c1a7d8ea52c948@gmail.com"},"message":"Peter Farber: COmmit","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/4f5f61605c01b7c98f51f1285e3cd611020c8524"},{"sha":"5a841edab7e8cb394bf4b14ab2dd44c3203512cd","author":{"name":"PeterFarber","email":"6b101e5a2123af21e0cc19ffa2c1a7d8ea52c948@gmail.com"},"message":"Peter Farber: asdasd","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/5a841edab7e8cb394bf4b14ab2dd44c3203512cd"},{"sha":"654dcc244b045096a1e0fe2bdd8fe8a3e27289fe","author":{"name":"PeterFarber","email":"6b101e5a2123af21e0cc19ffa2c1a7d8ea52c948@gmail.com"},"message":"Merge branch 'master' of https://github.com/Kagrinberg/RTA_SuperCoolFunYay\n\n# Conflicts:\n#\tED3_Research_Project/SkyBox.cpp\n#\tED3_Research_Project/SkyBox.h","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/654dcc244b045096a1e0fe2bdd8fe8a3e27289fe"},{"sha":"cf64b5bcf158b46cab9f0efd94bd6e4298723a37","author":{"name":"PeterFarber","email":"6b101e5a2123af21e0cc19ffa2c1a7d8ea52c948@gmail.com"},"message":"Peter Farber: Commit","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/cf64b5bcf158b46cab9f0efd94bd6e4298723a37"},{"sha":"a5852b64e9fad6d289d81363ff8044230dbd1ba0","author":{"name":"Katie Grinberg","email":"39947a54bfb6cc7d95ae3e76e79487a02916c5ff@fullsail.edu"},"message":"Merge branch 'master' of https://github.com/Kagrinberg/RTA_SuperCoolFunYay","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/a5852b64e9fad6d289d81363ff8044230dbd1ba0"},{"sha":"1a4cfccfb28ea7ca3d635ac3c1348fdbcfc21118","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Merge branch 'master' of https://github.com/Kagrinberg/RTA_SuperCoolFunYay\n\n# Conflicts:\n#\tSimple OpenGL Image Library/lib/SOIL.lib\n#\tSimple OpenGL Image Library/lib/SOIL.pdb","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/1a4cfccfb28ea7ca3d635ac3c1348fdbcfc21118"},{"sha":"64275c47ca2d3ee39f0307dc1d612ea01bb19238","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Committing to merge","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/64275c47ca2d3ee39f0307dc1d612ea01bb19238"},{"sha":"4df4c202956e988b01d5eed24e30ee2e9f0d6bc8","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Got Skybox.h and Skybox.cpp","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/4df4c202956e988b01d5eed24e30ee2e9f0d6bc8"},{"sha":"81d1c5e80e4928adddec3d49ea862ea39935ae25","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Tested a few fixes. Commminting to repull master","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/81d1c5e80e4928adddec3d49ea862ea39935ae25"},{"sha":"47dcec72dee2baa1b21b78f39c0bd4314c42de51","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"Merge branch 'master' of https://github.com/Kagrinberg/RTA_SuperCoolFunYay\n\n# Conflicts:\n#\tED3_Research_Project/ED3_Research_Project.vcxproj","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/47dcec72dee2baa1b21b78f39c0bd4314c42de51"},{"sha":"360835f6a1851b4f13b43e4e08b70ed5c3826a67","author":{"name":"Justin Parks","email":"aac3abfe2911815745c40a367d2cca3065bb7886@gmail.com"},"message":"No Chnages Made","distinct":false,"url":"https://api.github.com/repos/Kagrinberg/RTA_SuperCoolFunYay/commits/360835f6a1851b4f13b43e4e08b70ed5c3826a67"}]}
{"actor":{"display_login":"parksju87"}}