{"push_id":902081965,"size":6,"distinct_size":1,"ref":"refs/heads/Helen","head":"915c08a31d5116429777641109ef5e112dc712d2","before":"17a5677d5d464f353f9726eca4368c0b3ae09c56","commits":[{"sha":"0a0f36f8f92d7d8a8d6e3a5cbfa6ea00f478b1d4","author":{"email":"6a2b430d3755e6449c5a40f556a8703f78e97ddb@zhdk.ch","name":"Filipe"},"message":"Push attempt all changes","distinct":false,"url":"https://api.github.com/repos/helengalliker/Blackout/commits/0a0f36f8f92d7d8a8d6e3a5cbfa6ea00f478b1d4"},{"sha":"7319de9ea1f851ca941fa1b59dc8ebd7be043b37","author":{"email":"6a2b430d3755e6449c5a40f556a8703f78e97ddb@zhdk.ch","name":"Filipe"},"message":"test","distinct":false,"url":"https://api.github.com/repos/helengalliker/Blackout/commits/7319de9ea1f851ca941fa1b59dc8ebd7be043b37"},{"sha":"a21124b41c444f90424deb877a77b8da2ede848e","author":{"email":"6a2b430d3755e6449c5a40f556a8703f78e97ddb@zhdk.ch","name":"Filipe"},"message":"Merge branch 'master' of https://github.com/helengalliker/Blackout into Filipe\n\n# Conflicts:\n#\tBlackout/Assets/Material/Materials.meta\n#\tBlackout/Assets/Modells3D/Materials.meta\n#\tBlackout/Assets/Modells3D/Materials/Material.001.mat.meta\n#\tBlackout/Assets/Modells3D/Materials/No Name.mat.meta\n#\tBlackout/Assets/Modells3D/Materials/environment_texture_02.mat.meta\n#\tBlackout/Assets/Modells3D/Materials/monster_texture.mat.meta\n#\tBlackout/Blackout.sln\n#\tBlackout/Library/CurrentLayout.dwlt\n#\tBlackout/Library/CurrentMaximizeLayout.dwlt\n#\tBlackout/Library/InspectorExpandedItems.asset\n#\tBlackout/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tBlackout/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tBlackout/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n#\tBlackout/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n#\tBlackout/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tBlackout/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tBlackout/Library/assetDatabase3\n#\tBlackout/Library/expandedItems\n#\tBlackout/Library/metadata/00/00000000000000004000000000000000\n#\tBlackout/Library/metadata/0a/0a3aac979f86f994db09dce2e279250b.info\n#\tBlackout/Library/metadata/13/13f6793a79e292642819621af86c97c2.info\n#\tBlackout/Library/metadata/17/174a1645ccc42ec4cb504408e9208e81\n#\tBlackout/Library/metadata/17/174a1645ccc42ec4cb504408e9208e81.info\n#\tBlackout/Library/metadata/18/183f4d934e54f8546a6098f07544f6dd\n#\tBlackout/Library/metadata/18/183f4d934e54f8546a6098f07544f6dd.info\n#\tBlackout/Library/metadata/1c/1c259394e9bca754ebb70f45e0ffdb6d.info\n#\tBlackout/Library/metadata/1e/1e77be1d10314e147a35dfaac1bf08e7.info\n#\tBlackout/Library/metadata/20/203008a45e9b346788dfc4482ec21a28\n#\tBlackout/Library/metadata/21/21129cc67627fbe409d5b9fc60f272c6.info\n#\tBlackout/Library/metadata/27/27ee91bdc0798ae4880ed81639edfb38.info\n#\tBlackout/Library/metadata/2e/2e3cf0b7afeda9241bf8ea77c2244ae2\n#\tBlackout/Library/metadata/36/3663c4628ff5eb240bd3a034629ee1fa.info\n#\tBlackout/Library/metadata/37/371dbefab0a4b457caee0292a921ee09\n#\tBlackout/Library/metadata/37/3774e46d00c54c34b93e8aebbf450d23\n#\tBlackout/Library/metadata/37/3774e46d00c54c34b93e8aebbf450d23.info\n#\tBlackout/Library/metadata/3b/3b0bbaadad6c81649818c6c124b2f9cc.info\n#\tBlackout/Library/metadata/43/432758621ddc9254884f0b6656e01fef.info\n#\tBlackout/Library/metadata/44/4483b99e522a7455f957f3c290c47504\n#\tBlackout/Library/metadata/45/45246dc6734179d488c4512efe919b65.info\n#\tBlackout/Library/metadata/45/453f6f8448113d14ab0714605a747671\n#\tBlackout/Library/metadata/45/453f6f8448113d14ab0714605a747671.info\n#\tBlackout/Library/metadata/49/49eeaece47032d34fb8852bd3651f89e\n#\tBlackout/Library/metadata/4e/4ed54eba29b0369428051ab29e650843\n#\tBlackout/Library/metadata/4e/4ed54eba29b0369428051ab29e650843.info\n#\tBlackout/Library/metadata/57/57c9d0871a0ab1a4f976084b18f65b16.info\n#\tBlackout/Library/metadata/59/597fbffedbe059545a09cd84fee4460a.info\n#\tBlackout/Library/metadata/5f/5fd0e0ea0a323274ab8bcd2a4e52eb43\n#\tBlackout/Library/metadata/66/6636215bf431f86499f000c6f6e688f1.info\n#\tBlackout/Library/metadata/6a/6ae79dcfc9453b04f910eb2d761a87f7\n#\tBlackout/Library/metadata/71/710efa1cdc959c44084311182c4c92f2.info\n#\tBlackout/Library/metadata/77/77791bd139aefc74a86401b0684b9eba.info\n#\tBlackout/Library/metadata/77/77d03dca206ddd54d9abdccedd33bc40\n#\tBlackout/Library/metadata/77/77d03dca206ddd54d9abdccedd33bc40.info\n#\tBlackout/Library/metadata/79/794e61fe86c4f2b48a183727d77f018e.info\n#\tBlackout/Library/metadata/7e/7ed1fdfbd7d7154439d5e9583b151520\n#\tBlackout/Library/metadata/7e/7ed1fdfbd7d7154439d5e9583b151520.info\n#\tBlackout/Library/metadata/7f/7f5052e80fb743f4fa16b35b7e097a4a.info\n#\tBlackout/Library/metadata/80/8070153769cf80f4d98949e7179e7d7c.info\n#\tBlackout/Library/metadata/88/88ff6fa13be04484f951dbc375e1d60b\n#\tBlackout/Library/metadata/88/88ff6fa13be04484f951dbc375e1d60b.info\n#\tBlackout/Library/metadata/8d/8dfccfd6538b2364689f22391b8121ea.info\n#\tBlackout/Library/metadata/92/9245bf8ba0007a34e9992555ff831ed5\n#\tBlackout/Library/metadata/92/9245bf8ba0007a34e9992555ff831ed5.info\n#\tBlackout/Library/metadata/98/98ecdaf337380c3499dcb2e4051415ff.info\n#\tBlackout/Library/metadata/9c/9ca940e9749f9e64aae04183e3464095\n#\tBlackout/Library/metadata/9c/9ca940e9749f9e64aae04183e3464095.info\n#\tBlackout/Library/metadata/a1/a1ad7a7137459f04d8f64d0100849865.info\n#\tBlackout/Library/metadata/a7/a7e56f2ac4e34e94e9a3c64f757bdfb7\n#\tBlackout/Library/metadata/a7/a7e56f2ac4e34e94e9a3c64f757bdfb7.info\n#\tBlackout/Library/metadata/b0/b07c21113fca483488bbebfda4c0cd7c\n#\tBlackout/Library/metadata/b0/b07c21113fca483488bbebfda4c0cd7c.info\n#\tBlackout/Library/metadata/b0/b0ba66b47d056934f90961507895e28c\n#\tBlackout/Library/metadata/b0/b0ba66b47d056934f90961507895e28c.info\n#\tBlackout/Library/metadata/b2/b21c891ce832ea34b95454e38d47cb69.info\n#\tBlackout/Library/metadata/b3/b3ff4261f9b292945853dccb968eacb0\n#\tBlackout/Library/metadata/b3/b3ff4261f9b292945853dccb968eacb0.info\n#\tBlackout/Library/metadata/b6/b65eb194e3000b5428e9336ad082b9cc.info\n#\tBlackout/Library/metadata/c0/c082466eecbad464e88592bb007d59ca.info\n#\tBlackout/Library/metadata/c3/c38a925861f6bb54f8f1a4fe502335d9.info\n#\tBlackout/Library/metadata/c7/c7cd8970a7022c5409dbb74bffc989e2.info\n#\tBlackout/Library/metadata/ca/ca4bfe4c65ff1bd4e994a7b68e1097e8\n#\tBlackout/Library/metadata/ca/ca4dae810125ecb4ea6ca4060d90195f\n#\tBlackout/Library/metadata/ca/ca4dae810125ecb4ea6ca4060d90195f.info\n#\tBlackout/Library/metadata/ca/caaa768ec4414a741b85fbbc7c0a29c1.info\n#\tBlackout/Library/metadata/cb/cbd313c0f2f97b649a42e2bd1c6c36da\n#\tBlackout/Library/metadata/cb/cbd313c0f2f97b649a42e2bd1c6c36da.info\n#\tBlackout/Library/metadata/cd/cdcab3fd8edaa42959d194ef545142f8\n#\tBlackout/Library/metadata/ce/ce23d119e7e070f4182f3edea7af3d7b.info\n#\tBlackout/Library/metadata/ce/cea162136efdf734eaea6d5c0ad212a5.info\n#\tBlackout/Library/metadata/cf/cf80d4c98e5e4664caf8cc71a3bbcb00\n#\tBlackout/Library/metadata/cf/cf80d4c98e5e4664caf8cc71a3bbcb00.info\n#\tBlackout/Library/metadata/d1/d1930fd832cb53548bd90739268109ea.info\n#\tBlackout/Library/metadata/d6/d60c3bc7aada0d4448229b3a78d2f9ac\n#\tBlackout/Library/metadata/d6/d60c3bc7aada0d4448229b3a78d2f9ac.info\n#\tBlackout/Library/metadata/f7/f73a725b99ec24c66ae5338770a3a7cb\n#\tBlackout/Library/metadata/f8/f855fff837e02fd48a75b83ffb8ec7f4\n#\tBlackout/Library/metadata/f8/f855fff837e02fd48a75b83ffb8ec7f4.info\n#\tBlackout/Library/metadata/f9/f9bb879a6ba3d204e80a2801b70f28eb\n#\tBlackout/Library/metadata/f9/f9bb879a6ba3d204e80a2801b70f28eb.info\n#\tBlackout/Library/shadercompiler-64bit-1.log\n#\tBlackout/Temp/UnityTempFile-057d01b04b63d41e9a3ee3cd7a43edd5\n#\tBlackout/Temp/UnityTempFile-22c7306843b3c473892c727036cf2fb0\n#\tBlackout/Temp/UnityTempFile-2c359933b8aa44f70bb35582a98d06a5\n#\tBlackout/Temp/UnityTempFile-3b3eefc57b8a5437fbb177e1a235f9f1\n#\tBlackout/Temp/UnityTempFile-3d1939f6522be4deb882d37d0ed2b1b8\n#\tBlackout/Temp/UnityTempFile-3de5ca5e93dfb4fb4985efc7d8536c2e\n#\tBlackout/Temp/UnityTempFile-414bbfc1de02743e1a6161f04bcb08e6\n#\tBlackout/Temp/UnityTempFile-53f9c6d2120834f7882abb25f1512feb\n#\tBlackout/Temp/UnityTempFile-5729e2fabee964f3790ead8434450894\n#\tBlackout/Temp/UnityTempFile-60146500d4f994a8586b48a0d6d07902\n#\tBlackout/Temp/UnityTempFile-6991cec7d8cff4e97870e81ea624dc22\n#\tBlackout/Temp/UnityTempFile-79b9f3f92714a42998d48b9d01181f60\n#\tBlackout/Temp/UnityTempFile-8afd7f6c452644845aef885f150111df\n#\tBlackout/Temp/UnityTempFile-a2ad5313090cf4a3fb8a5e22255ca34f\n#\tBlackout/Temp/UnityTempFile-b077661d48b544555a70e0b12895d5d5\n#\tBlackout/Temp/UnityTempFile-b2701efe3848f45c29e541554ff0e608\n#\tBlackout/Temp/UnityTempFile-b5f1c171e0ad744a39cf910dd839ae22\n#\tBlackout/Temp/UnityTempFile-bd53f906316344e5985920906e052dae\n#\tBlackout/Temp/UnityTempFile-caba42f5e753a4248adc9139a57329ad\n#\tBlackout/Temp/UnityTempFile-dbe2093ee525e4ad6987e569ca99213d\n#\tBlackout/Temp/UnityTempFile-de388838b6f204cedb39479330ab2027\n#\tBlackout/Temp/UnityTempFile-e07466a79759e47c5a1dd9ed7e0dc1ad\n#\tBlackout/Temp/UnityTempFile-e2fe27913be3f46a1a79c1783e3a6f9a\n#\tBlackout/Temp/UnityTempFile-f346ca6e32d524e4a9c753bd29064169\n#\tBlackout/Temp/__EditModeScene","distinct":false,"url":"https://api.github.com/repos/helengalliker/Blackout/commits/a21124b41c444f90424deb877a77b8da2ede848e"},{"sha":"d61c8ddf2e207e1e5d146b3fc811915727619007","author":{"email":"6a2b430d3755e6449c5a40f556a8703f78e97ddb@zhdk.ch","name":"Filipe"},"message":"modified helen scene with new environment objects","distinct":false,"url":"https://api.github.com/repos/helengalliker/Blackout/commits/d61c8ddf2e207e1e5d146b3fc811915727619007"},{"sha":"03b5bf3253ae5cd56ae62e4b538cb072d6ebab94","author":{"email":"d38101685b9d5dd5c5a3e8dffdc70e5cdab2a075@bluewin.ch","name":"helengalliker"},"message":"Merge branch 'Helen'\n\n* Helen:\n  Fix player points ingame gui\n\nConflicts:\n\tBlackout/Blackout.sln\n\tBlackout/Library/CurrentLayout.dwlt\n\tBlackout/Library/CurrentMaximizeLayout.dwlt\n\tBlackout/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n\tBlackout/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n\tBlackout/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n\tBlackout/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n\tBlackout/Library/ScriptAssemblies/Assembly-CSharp.dll\n\tBlackout/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tBlackout/Library/assetDatabase3\n\tBlackout/Library/expandedItems\n\tBlackout/Library/metadata/00/00000000000000004000000000000000\n\tBlackout/Library/metadata/05/0594d85120b2d4aae95554a4fb054c15.info\n\tBlackout/Library/metadata/27/279242eb5128e423fa931ea9be9ba3ec.info\n\tBlackout/Library/metadata/2e/2e993e6468bd1448e8cb320ffe197c59.info\n\tBlackout/Library/metadata/31/31d98e747b62947ff889cae3d03ad49c\n\tBlackout/Library/metadata/a7/a7716adb9e7354e3eabe3fde0eacbc16\n\tBlackout/Library/metadata/af/afa13d92b781c475687d2d52664dee72.info\n\tBlackout/Library/metadata/bb/bb51fee63a2524f82a3617f3468652b8.info\n\tBlackout/Library/metadata/ee/ee5d9f081fd864c57816a155d18ab5ed.info\n\tBlackout/Library/shadercompiler-64bit-1.log","distinct":false,"url":"https://api.github.com/repos/helengalliker/Blackout/commits/03b5bf3253ae5cd56ae62e4b538cb072d6ebab94"},{"sha":"915c08a31d5116429777641109ef5e112dc712d2","author":{"email":"d38101685b9d5dd5c5a3e8dffdc70e5cdab2a075@bluewin.ch","name":"helengalliker"},"message":"Backup before controller gui change","distinct":true,"url":"https://api.github.com/repos/helengalliker/Blackout/commits/915c08a31d5116429777641109ef5e112dc712d2"}]}