{"push_id":581416131,"size":36,"distinct_size":1,"ref":"refs/heads/camera_stuff","head":"39ce5eb5c5a78dd421619a83b3144729ea214101","before":"e22508c2e5f40417b9fe686ad58c5fc68f53527b","commits":[{"sha":"7ed9c5fcd45105a9b821267f879804d6b7f9aad1","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Bush prefab fixes.","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/7ed9c5fcd45105a9b821267f879804d6b7f9aad1"},{"sha":"357fd0bfe9d8e9f5f8a9e367fadd182f81606ce0","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Set stat on eggs that is passed down into the buddy actor.","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/357fd0bfe9d8e9f5f8a9e367fadd182f81606ce0"},{"sha":"2ac3164f0f6fe85b14ff2c8d7b8ffa704b98d73c","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"different eggs for the different buddy types and buddy get their material from the egg.","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/2ac3164f0f6fe85b14ff2c8d7b8ffa704b98d73c"},{"sha":"8e15952b4e5da0cdf32f83b1d8a42b8494675516","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Fixes giving resources to buddies and sets up new UI.","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/8e15952b4e5da0cdf32f83b1d8a42b8494675516"},{"sha":"38cf572c47f9cb9b7ccef9fe4ef2ed6f8c48e4a2","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Prefab application","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/38cf572c47f9cb9b7ccef9fe4ef2ed6f8c48e4a2"},{"sha":"c009f02d636917562b435d67e32c81cb0fc5324c","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Merge branch 'level_blockouts' into buddy_gameplay\n\nConflicts:\n\tAssets/Prefabs/Actors/Player.prefab","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/c009f02d636917562b435d67e32c81cb0fc5324c"},{"sha":"76a17fa30cb6ef36af6e6dae26c3462ba8de544d","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Further merging stuff with level_blockouts.","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/76a17fa30cb6ef36af6e6dae26c3462ba8de544d"},{"sha":"0d9501d2b1836198ac77d5f735a4787df92d7234","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Skill UI","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/0d9501d2b1836198ac77d5f735a4787df92d7234"},{"sha":"4d6bf377126bdfaa9765e129260baf0ceac6914a","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Adds delay to stat recharge","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/4d6bf377126bdfaa9765e129260baf0ceac6914a"},{"sha":"a7a31280b23be5756259349f8490959f049ac5f9","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Sad emote when decrease resources.","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/a7a31280b23be5756259349f8490959f049ac5f9"},{"sha":"52cc860db90b11a95703f11ae8bb2e31a7e73541","author":{"email":"c41bb3245023884619c12809fd416ec7fcefd016@gmail.com","name":"Zac"},"message":"Merge branch 'master' into buddy_gameplay\n\nConflicts:\n\tAssets/Environment/SmallMountains.asset\n\tAssets/Scenes/BlockOut.unity\n\tAssets/Terrain.asset","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/52cc860db90b11a95703f11ae8bb2e31a7e73541"},{"sha":"9089f0b6d2500fecf11a0761e765189749b0c8d9","author":{"email":"8bb13c192bac9ae30ca64d01e329e2847df448d0@gmail.com","name":"cjacobwade"},"message":"Fixed player gliding, UI","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/9089f0b6d2500fecf11a0761e765189749b0c8d9"},{"sha":"b56dcc34091b263f7297f3b9904706bcecc80019","author":{"email":"8bb13c192bac9ae30ca64d01e329e2847df448d0@gmail.com","name":"cjacobwade"},"message":"Merge branch 'buddy_gameplay' into showbuild_feb17\n\nConflicts:\n\tAssets/Prefabs/Actors/Player.prefab\n\tAssets/Scenes/Garden.unity\n\tAssets/Scripts/Actors/ActorComponents/PlayerActorInventory.cs","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/b56dcc34091b263f7297f3b9904706bcecc80019"},{"sha":"e5622d4b2e85c9b35eb656baf2b22a991c658c3a","author":{"email":"8bb13c192bac9ae30ca64d01e329e2847df448d0@gmail.com","name":"cjacobwade"},"message":"Merging in Zac's stuff, making it so you can spawn buddies w/o looking at buddies","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/e5622d4b2e85c9b35eb656baf2b22a991c658c3a"},{"sha":"dbd151efacf74b66f046c46ff232cb76612453a2","author":{"email":"8bb13c192bac9ae30ca64d01e329e2847df448d0@gmail.com","name":"cjacobwade"},"message":"Better bushes, particles, fixing prefab material bug, fixing render settings bug, setting up sky colors","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/dbd151efacf74b66f046c46ff232cb76612453a2"},{"sha":"30fa744dd971c7fbd753b8d6bc1fd9734994ba1e","author":{"email":"8bb13c192bac9ae30ca64d01e329e2847df448d0@gmail.com","name":"cjacobwade"},"message":"Merge commit '1f1bff906b6168bb6e2e2b909a1da15df609135d' into showbuild_feb17\n\nConflicts:\n\tAssets/Scripts/PlayerControls.cs","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/30fa744dd971c7fbd753b8d6bc1fd9734994ba1e"},{"sha":"289c864a9623da16a3eddd4e14a18caa717d976b","author":{"email":"8bb13c192bac9ae30ca64d01e329e2847df448d0@gmail.com","name":"cjacobwade"},"message":"Bunny, build settings","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/289c864a9623da16a3eddd4e14a18caa717d976b"},{"sha":"6bbb417cde0fe1c097300f53c16fa48d507fe5ed","author":{"email":"8bb13c192bac9ae30ca64d01e329e2847df448d0@gmail.com","name":"cjacobwade"},"message":"Fixed UI anchor","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/6bbb417cde0fe1c097300f53c16fa48d507fe5ed"},{"sha":"1fa2c803954d315f8a63a262fa7919489e6d4f89","author":{"email":"da14740337eca32e13309e38b732b849d87793a5@gmail.com","name":"David LeGare"},"message":"Fix Merge Conflict in Garden.unity","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/1fa2c803954d315f8a63a262fa7919489e6d4f89"},{"sha":"a13b0f61fe1b8322bff7b06fa15894d980b6d805","author":{"email":"da14740337eca32e13309e38b732b849d87793a5@gmail.com","name":"David LeGare"},"message":"Showbuild Prep\n- Added a hacky fix for the misaligned climb animation.\n- Disabled the stats going down over time.\n- Fixed stamina not going down while climbing.\n- Fixed stat recharge not being a function of time.\n- Camera no longer freaks out when from buddies or resources.","distinct":false,"url":"https://api.github.com/repos/Capstrong/Godlands/commits/a13b0f61fe1b8322bff7b06fa15894d980b6d805"}]}