{"push_id":1386437606,"size":7,"distinct_size":1,"ref":"refs/heads/Winson","head":"8e6fe92f81ed4ea0dd9c98aabb4414114e7b51ed","before":"bc6469fa2062b3349ccc09ba1fd016c5c17b4a01","commits":[{"sha":"a93255fe4cb6ef6acdf79c70bd03c30bb23486c7","author":{"name":"LIGHTS\\k.harris","email":"f767c999305cff7597d385d95f2e95a221dc995e@digipen.edu"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Kaila-2.0","distinct":false,"url":"https://api.github.com/repos/winthos/Temporal/commits/a93255fe4cb6ef6acdf79c70bd03c30bb23486c7"},{"sha":"6c0248aed9fd2805c7a5d824ef5a5c326e9688f3","author":{"name":"LIGHTS\\k.harris","email":"f767c999305cff7597d385d95f2e95a221dc995e@digipen.edu"},"message":"stuff","distinct":false,"url":"https://api.github.com/repos/winthos/Temporal/commits/6c0248aed9fd2805c7a5d824ef5a5c326e9688f3"},{"sha":"c3c670f32110adc504b49beeeea8ec4be239d43b","author":{"name":"LIGHTS\\k.harris","email":"f767c999305cff7597d385d95f2e95a221dc995e@digipen.edu"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Kaila-2.0\n\n# Conflicts:\n#\tSpace-Time/Library/CurrentLayout.dwlt\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tSpace-Time/Library/assetDatabase3\n#\tSpace-Time/Library/metadata/00/00000000000000004000000000000000\n#\tSpace-Time/Library/metadata/00/00000000000000006100000000000000","distinct":false,"url":"https://api.github.com/repos/winthos/Temporal/commits/c3c670f32110adc504b49beeeea8ec4be239d43b"},{"sha":"c59910d4c14550cde280e9721e4623f931e5d3b5","author":{"name":"LIGHTS\\k.harris","email":"f767c999305cff7597d385d95f2e95a221dc995e@digipen.edu"},"message":"new soundbanks.\n\nthey're not showing up in unity though.  going to attempt a reimport of\nwwise.","distinct":false,"url":"https://api.github.com/repos/winthos/Temporal/commits/c59910d4c14550cde280e9721e4623f931e5d3b5"},{"sha":"55312cfbe3aaa05332c4d0929863a3d2b20f325c","author":{"name":"LIGHTS\\k.harris","email":"f767c999305cff7597d385d95f2e95a221dc995e@digipen.edu"},"message":"new wwise integration. audio works. yay.","distinct":false,"url":"https://api.github.com/repos/winthos/Temporal/commits/55312cfbe3aaa05332c4d0929863a3d2b20f325c"},{"sha":"38961461fdfd5dabb963362ec528c6c00cf83c1e","author":{"name":"winthos","email":"9d3258b2d0b990a8936de7701c0b2ab3a7306263@gmail.com"},"message":"Merge pull request #9 from winthos/Kaila-2.0\n\nnew wwise project is in","distinct":false,"url":"https://api.github.com/repos/winthos/Temporal/commits/38961461fdfd5dabb963362ec528c6c00cf83c1e"},{"sha":"8e6fe92f81ed4ea0dd9c98aabb4414114e7b51ed","author":{"name":"winthos","email":"9d3258b2d0b990a8936de7701c0b2ab3a7306263@gmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Winson\n\n# Conflicts:\n#\tSpace-Time/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset\n#\tSpace-Time/Library/CurrentLayout.dwlt\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tSpace-Time/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tSpace-Time/Library/assetDatabase3\n#\tSpace-Time/Library/expandedItems\n#\tSpace-Time/Library/metadata/00/00000000000000004000000000000000\n#\tSpace-Time/Library/metadata/00/00000000000000006100000000000000\n#\tSpace-Time/Library/shadercompiler-UnityShaderCompiler.exe0.log","distinct":true,"url":"https://api.github.com/repos/winthos/Temporal/commits/8e6fe92f81ed4ea0dd9c98aabb4414114e7b51ed"}]}
{"actor":{"display_login":"winthos"}}