{"push_id":752637213,"size":16,"distinct_size":1,"ref":"refs/heads/merge-third-person-camera","head":"05f64b567357b48f6821baa2790a5c6c692828bb","before":"8ea46a2d985d3e30b9b3dd9f8e3ac609866a8cd7","commits":[{"sha":"dc8206738c89383796eee81730ab0c956f4861df","author":{"email":"bcd300567f297678062dbc64407d1e79a037e66e@gmail.com","name":"Blenkz"},"message":"Fire Obstacle not working","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/dc8206738c89383796eee81730ab0c956f4861df"},{"sha":"256a4178280a5d928a4fbe2f5fe0a19968865b70","author":{"email":"8f839fbf656dc640cb22f6c4167de88f716da9dd@gmail.com","name":"kyle-ilantzis"},"message":"the fire model is now drawn on the track, but no drawn properly","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/256a4178280a5d928a4fbe2f5fe0a19968865b70"},{"sha":"eb2cbeb5f2d8eb2c0216ce1273a920763248a3bd","author":{"email":"8f839fbf656dc640cb22f6c4167de88f716da9dd@gmail.com","name":"kyle-ilantzis"},"message":"remove firemodel displayed twice in solution explorer\n\nonce in source filter, once in root of the project. removed from root of the project.","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/eb2cbeb5f2d8eb2c0216ce1273a920763248a3bd"},{"sha":"f2b4f99b855f4f9c9b47798bbb545ddb27b1934c","author":{"email":"8f839fbf656dc640cb22f6c4167de88f716da9dd@gmail.com","name":"kyle-ilantzis"},"message":"fire descriptor version 2 is the best looking one for the spline obstacle","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/f2b4f99b855f4f9c9b47798bbb545ddb27b1934c"},{"sha":"7214b16c9d0d859f3123944bf90f8c5d04c06270","author":{"email":"8f839fbf656dc640cb22f6c4167de88f716da9dd@gmail.com","name":"kyle-ilantzis"},"message":"Merge branch 'master' into FireParticles\n\nConflicts:\n\tSource/Obstacles.cpp\n\tSource/Obstacles.h\n\tSource/ParticleDescriptor.cpp\n\tSource/ParticleDescriptor.h\n\tSource/ParticleSystem.cpp\n\tSource/ParticleSystem.h\n\tVS2013/Assignment1.vcxproj\n\tVS2013/Assignment1.vcxproj.filters","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/7214b16c9d0d859f3123944bf90f8c5d04c06270"},{"sha":"100f800abc6b912bf69d5088c015cc9bcfcf699d","author":{"email":"8f839fbf656dc640cb22f6c4167de88f716da9dd@gmail.com","name":"kyle-ilantzis"},"message":"merge master into fireparticles","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/100f800abc6b912bf69d5088c015cc9bcfcf699d"},{"sha":"98aec3a78399dc406c6e8f00f234ff62748924f5","author":{"email":"8f839fbf656dc640cb22f6c4167de88f716da9dd@gmail.com","name":"kyle-ilantzis"},"message":"Merge branch 'master' into FireParticles\n\nConflicts:\n\tVS2013/Assignment1.vcxproj\n\tVS2013/Assignment1.vcxproj.filters","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/98aec3a78399dc406c6e8f00f234ff62748924f5"},{"sha":"1809e71c6914b71d8e317b19bb329787a565fecf","author":{"email":"202b6106d52cd9b2d7806f0ff09900e5fbdc2487@gmail.com","name":"Robert Wen"},"message":"Added fire obstacles","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/1809e71c6914b71d8e317b19bb329787a565fecf"},{"sha":"8bfcefb3d16311c033639d21219c3fe017dea561","author":{"email":"202b6106d52cd9b2d7806f0ff09900e5fbdc2487@gmail.com","name":"yumdayum"},"message":"Merge pull request #60 from comp371samurais/merge-third-person-camera\n\nMerge third person camera","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/8bfcefb3d16311c033639d21219c3fe017dea561"},{"sha":"b39299e0706f419d0cc1b320c5a0802f01cffde3","author":{"email":"202b6106d52cd9b2d7806f0ff09900e5fbdc2487@gmail.com","name":"Robert Wen"},"message":"Merge branch 'master' into obstacles\n\nConflicts:\n\tVS2013/Assignment1.vcxproj.filters","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/b39299e0706f419d0cc1b320c5a0802f01cffde3"},{"sha":"5538386cfc2e2491936f425e62198dc8d8a1e2c9","author":{"email":"147552d22db244e824d33e32f22f5fbc5889ee6e@users.noreply.github.com","name":"kyle-ilantzis"},"message":"Merge pull request #59 from comp371samurais/obstacles\n\nObstacles","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/5538386cfc2e2491936f425e62198dc8d8a1e2c9"},{"sha":"29e6cb524c70786d89fa2a50652bedf5a4a60061","author":{"email":"147552d22db244e824d33e32f22f5fbc5889ee6e@gmail.com","name":"kyle-ilantzis"},"message":"top gun drawing z order, just draw other billboards before topgun","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/29e6cb524c70786d89fa2a50652bedf5a4a60061"},{"sha":"856407c15989f8f9e1e46626379f055481e99d4b","author":{"email":"147552d22db244e824d33e32f22f5fbc5889ee6e@users.noreply.github.com","name":"kyle-ilantzis"},"message":"Merge pull request #61 from comp371samurais/Billboards\n\ntop gun drawing z order, just draw other billboards before topgun","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/856407c15989f8f9e1e46626379f055481e99d4b"},{"sha":"507de184415ba28f72023704ab8421c0321c72d5","author":{"email":"202b6106d52cd9b2d7806f0ff09900e5fbdc2487@gmail.com","name":"yumdayum"},"message":"Merge pull request #62 from comp371samurais/merge-third-person-camera\n\ncam update","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/507de184415ba28f72023704ab8421c0321c72d5"},{"sha":"7a89d870e5c06d60b470e4f88efbad9dc436f1aa","author":{"email":"8f839fbf656dc640cb22f6c4167de88f716da9dd@gmail.com","name":"kyle-ilantzis"},"message":"can load scene files\n\nneeded to add null checks everywhere","distinct":false,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/7a89d870e5c06d60b470e4f88efbad9dc436f1aa"},{"sha":"05f64b567357b48f6821baa2790a5c6c692828bb","author":{"email":"a49d49a53351aeb7904f18493e7ff84e7947e0f4@gmail.com","name":"msetijo"},"message":"Merge branch 'master' into merge-third-person-camera","distinct":true,"url":"https://api.github.com/repos/comp371samurais/samurai-dash/commits/05f64b567357b48f6821baa2790a5c6c692828bb"}]}