{"push_id":957326138,"size":58,"distinct_size":1,"ref":"refs/heads/Audio","head":"e211dcd40f00936a65c49a166a282ac11bc73368","before":"80beec176615f9586f916ceb0e166c3b3e839d08","commits":[{"sha":"fe8cbf11be45a26fc272a7c8094b5d56f0990527","author":{"email":"a952d55efa2423dbb6e2d2b61959856751bf4977@hva.nl","name":"Sander Cheung"},"message":"Preliminary art, Texture","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/fe8cbf11be45a26fc272a7c8094b5d56f0990527"},{"sha":"889ceeab1a0bd65139d9896590f05336b97ee4a7","author":{"email":"af7bd3994fdff05139f315e73389c50e10972caa@gmail.com","name":"Jimmy Vermeulen"},"message":"Created Gameboard, can fetch tiles from children","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/889ceeab1a0bd65139d9896590f05336b97ee4a7"},{"sha":"2f2cea72e3550bca86f940ca6c488a9d6139dfe1","author":{"email":"83d84e152b1ef8bc0df99c7f70eb8015d1ddff5f@hotmail.com","name":"Tim"},"message":"first part of playermovement","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/2f2cea72e3550bca86f940ca6c488a9d6139dfe1"},{"sha":"3f3305e8cdf58e8740fd5f8784c52afa26de8975","author":{"email":"d63574d44e047818ad54924c1f4a57d499480cb5@hotmail.nl","name":"Sander Goetzee"},"message":"Random gem placement","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/3f3305e8cdf58e8740fd5f8784c52afa26de8975"},{"sha":"4154bb1ec5e7e14a4b11a8715fd30a4df8e3945b","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Added GameManager.cs script to keep track of player turns and the shot counter.","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/4154bb1ec5e7e14a4b11a8715fd30a4df8e3945b"},{"sha":"c5cbeab7c9aabbb0319652c21c37a8f695d07d26","author":{"email":"a952d55efa2423dbb6e2d2b61959856751bf4977@hva.nl","name":"Sander Cheung"},"message":"Added some more assets","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/c5cbeab7c9aabbb0319652c21c37a8f695d07d26"},{"sha":"96560ba8814ef6899725ec59aa77ef9ef8a36a30","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Changed RandomGem.cs to allow gems to spawn in outer layers. Tested, ready to merge to Master.","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/96560ba8814ef6899725ec59aa77ef9ef8a36a30"},{"sha":"452fdfc2be44f86db97e3b9f3a9d386f8900f400","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Merge branch 'Orb_random_placement'","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/452fdfc2be44f86db97e3b9f3a9d386f8900f400"},{"sha":"cd8320204170726c57520f6aa4044304a2f5bc7c","author":{"email":"83d84e152b1ef8bc0df99c7f70eb8015d1ddff5f@hotmail.com","name":"Tim"},"message":"Added new Grid movement script","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/cd8320204170726c57520f6aa4044304a2f5bc7c"},{"sha":"92b2a471096d34d5b5720efa37ba741372eb3d8a","author":{"email":"af7bd3994fdff05139f315e73389c50e10972caa@gmail.com","name":"Jimmy Vermeulen"},"message":"Added ShiftTiles function and GetTilePosition","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/92b2a471096d34d5b5720efa37ba741372eb3d8a"},{"sha":"d219be9b682b1ffd499d0bc1158148304fa45eee","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Added Orb Randomizer scripts to Main scene.\nAdded Game manager prefab.\nFixed camera settings in main scene.","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/d219be9b682b1ffd499d0bc1158148304fa45eee"},{"sha":"55df332443a428927e94d03488e9942daac77f89","author":{"email":"104ef601cbe22940df5d9560772181b6cf4c7f9f@hva.nl","name":"MLB_JANSSEN"},"message":"Changed FixedUpdate tot Update","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/55df332443a428927e94d03488e9942daac77f89"},{"sha":"3d0f8e962b1525b70f70525053ba44bf9ddfde8b","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Merge branch 'Gameboard'\n\n# Conflicts:\n#\tGGJTRALALA2/Assets/Main.unity\n#\tGGJTRALALA2/Assets/Main.unity.meta\n#\tGGJTRALALA2/Assets/Prefabs.meta\n#\tGGJTRALALA2/Assets/Scenes/Gameboard scene.unity\n#\tGGJTRALALA2/Assets/Scenes/Gameboard scene.unity.meta\n#\tGGJTRALALA2/Assets/Scripts.meta\n#\tGGJTRALALA2/Assets/_Scenes/Main.unity.meta\n#\tGGJTRALALA2/Assets/_Scenes/TestRandomOrb.unity\n#\tGGJTRALALA2/Library/CurrentLayout.dwlt\n#\tGGJTRALALA2/Library/InspectorExpandedItems.asset\n#\tGGJTRALALA2/Library/LastSceneManagerSetup.txt\n#\tGGJTRALALA2/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tGGJTRALALA2/Library/UnityAssemblies/version.txt\n#\tGGJTRALALA2/Library/assetDatabase3\n#\tGGJTRALALA2/Library/expandedItems\n#\tGGJTRALALA2/Library/metadata/00/00000000000000002000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000003000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000004000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000004100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000005000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000005100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000006000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000006100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000007000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000007100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000008000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000008100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000009000000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000a000000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000a100000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000b000000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000c000000000000000\n#\tGGJTRALALA2/Library/metadata/29/29689fa5b2f4256419810bad09fa305b\n#\tGGJTRALALA2/Library/metadata/29/29689fa5b2f4256419810bad09fa305b.info\n#\tGGJTRALALA2/Library/metadata/3c/3c0ad459c1534645b5d603b7cc258f97\n#\tGGJTRALALA2/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7\n#\tGGJTRALALA2/Library/metadata/73/739bbd9f364b4268874f9fd86ab3beef\n#\tGGJTRALALA2/Library/metadata/7c/7cbab2be89b54486bbd23a6fe637d30e\n#\tGGJTRALALA2/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f\n#\tGGJTRALALA2/Library/metadata/85/852e56802eb941638acbb491814497b0\n#\tGGJTRALALA2/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba\n#\tGGJTRALALA2/Library/metadata/8e/8e0cd8ed44d4412cbe0642067abc9e44\n#\tGGJTRALALA2/Library/metadata/97/97decbdab0634cdd991f8d23ddf0dead\n#\tGGJTRALALA2/Library/metadata/ad/adebbd281f1a4ef3a30be7f21937e02f\n#\tGGJTRALALA2/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/3d0f8e962b1525b70f70525053ba44bf9ddfde8b"},{"sha":"fbd96df6c9ec820957bc7c210e2b707ad5a7cd5c","author":{"email":"104ef601cbe22940df5d9560772181b6cf4c7f9f@hva.nl","name":"MLB_JANSSEN"},"message":"Added countdown to screen.\nCountdown changes position based on which player's turn it is.","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/fbd96df6c9ec820957bc7c210e2b707ad5a7cd5c"},{"sha":"7fd5cceff97e6a9868f936fafb749daf4deafb23","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Merged Gameboard to Main","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/7fd5cceff97e6a9868f936fafb749daf4deafb23"},{"sha":"bcbfda4d1c89864bf9a41ab46c169a10563de993","author":{"email":"83d84e152b1ef8bc0df99c7f70eb8015d1ddff5f@hotmail.com","name":"Tim"},"message":"Added 2nd player & sprite turn","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/bcbfda4d1c89864bf9a41ab46c169a10563de993"},{"sha":"e8650a5786d4279ef7375e7fd90d9112442c1064","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Merge branch 'Player_Movement'\n\n# Conflicts:\n#\tGGJTRALALA2/Assets/Sprites.meta\n#\tGGJTRALALA2/Library/CurrentLayout.dwlt\n#\tGGJTRALALA2/Library/InspectorExpandedItems.asset\n#\tGGJTRALALA2/Library/LastSceneManagerSetup.txt\n#\tGGJTRALALA2/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tGGJTRALALA2/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tGGJTRALALA2/Library/UnityAssemblies/version.txt\n#\tGGJTRALALA2/Library/assetDatabase3\n#\tGGJTRALALA2/Library/expandedItems\n#\tGGJTRALALA2/Library/metadata/00/00000000000000002000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000003000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000004000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000004100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000005000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000005100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000006000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000006100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000007000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000007100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000008000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000008100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000009000000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000a000000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000a100000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000b000000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000c000000000000000\n#\tGGJTRALALA2/Library/metadata/3c/3c0ad459c1534645b5d603b7cc258f97\n#\tGGJTRALALA2/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7\n#\tGGJTRALALA2/Library/metadata/73/739bbd9f364b4268874f9fd86ab3beef\n#\tGGJTRALALA2/Library/metadata/7c/7cbab2be89b54486bbd23a6fe637d30e\n#\tGGJTRALALA2/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f\n#\tGGJTRALALA2/Library/metadata/85/852e56802eb941638acbb491814497b0\n#\tGGJTRALALA2/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba\n#\tGGJTRALALA2/Library/metadata/8e/8e0cd8ed44d4412cbe0642067abc9e44\n#\tGGJTRALALA2/Library/metadata/97/97decbdab0634cdd991f8d23ddf0dead\n#\tGGJTRALALA2/Library/metadata/ad/adebbd281f1a4ef3a30be7f21937e02f\n#\tGGJTRALALA2/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8\n#\tGGJTRALALA2/Library/shadercompiler-UnityShaderCompiler.exe0.log","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/e8650a5786d4279ef7375e7fd90d9112442c1064"},{"sha":"2f0c5ff6cf3044ddc55181545acb2020667be5fa","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Merge branch 'feature/Shot_Counter'\n\n# Conflicts:\n#\tGGJTRALALA2/Assets/Resources.meta\n#\tGGJTRALALA2/Assets/Scenes.meta\n#\tGGJTRALALA2/Assets/Scripts.meta\n#\tGGJTRALALA2/Library/CurrentLayout.dwlt\n#\tGGJTRALALA2/Library/LastSceneManagerSetup.txt\n#\tGGJTRALALA2/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tGGJTRALALA2/Library/UnityAssemblies/UnityEngine.UI.xml\n#\tGGJTRALALA2/Library/UnityAssemblies/UnityEngine.xml\n#\tGGJTRALALA2/Library/UnityAssemblies/version.txt\n#\tGGJTRALALA2/Library/assetDatabase3\n#\tGGJTRALALA2/Library/metadata/00/00000000000000002000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000003000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000004000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000004100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000005000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000005100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000006000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000006100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000007000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000007100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000008000000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000008100000000000000\n#\tGGJTRALALA2/Library/metadata/00/00000000000000009000000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000a000000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000a100000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000b000000000000000\n#\tGGJTRALALA2/Library/metadata/00/0000000000000000c000000000000000\n#\tGGJTRALALA2/Library/metadata/29/29689fa5b2f4256419810bad09fa305b\n#\tGGJTRALALA2/Library/metadata/3c/3c0ad459c1534645b5d603b7cc258f97\n#\tGGJTRALALA2/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7\n#\tGGJTRALALA2/Library/metadata/73/739bbd9f364b4268874f9fd86ab3beef\n#\tGGJTRALALA2/Library/metadata/7c/7cbab2be89b54486bbd23a6fe637d30e\n#\tGGJTRALALA2/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f\n#\tGGJTRALALA2/Library/metadata/85/852e56802eb941638acbb491814497b0\n#\tGGJTRALALA2/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba\n#\tGGJTRALALA2/Library/metadata/8e/8e0cd8ed44d4412cbe0642067abc9e44\n#\tGGJTRALALA2/Library/metadata/97/97decbdab0634cdd991f8d23ddf0dead\n#\tGGJTRALALA2/Library/metadata/ad/adebbd281f1a4ef3a30be7f21937e02f\n#\tGGJTRALALA2/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8\n#\tGGJTRALALA2/Library/metadata/fc/fcd26428523b02345990f6b87d90d4a9","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/2f0c5ff6cf3044ddc55181545acb2020667be5fa"},{"sha":"852c5f84b065df0d0d999b5b6493f91b05cc409c","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Merge error fix","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/852c5f84b065df0d0d999b5b6493f91b05cc409c"},{"sha":"bb6eaa1ef1fbb397886d8ec5592e0c51d4271889","author":{"email":"013333180bcee4cd8c856a9a7c3b9487cfcfcfb0@gmail.com","name":"Quinten Alflen"},"message":"Merged both separate gamemanager scripts into one.\nMain branch is stable.","distinct":false,"url":"https://api.github.com/repos/Exile1043/GGJTRALALA/commits/bb6eaa1ef1fbb397886d8ec5592e0c51d4271889"}]}