{"push_id":1561072885,"size":11,"distinct_size":1,"ref":"refs/heads/NPC","head":"9be246a7bd22bb3e5c606990a179a645018b9fbf","before":"b8ceb6535608940d0bcd3a11492ea56256a661b2","commits":[{"sha":"8bbb8ccaff719b25fdfb097009df20fad37bfb1d","author":{"name":"DESKTOP-20Q99IO\\benth","email":"d9689ce55ff3eb8ddf09903fbebb95b08f05720f@york.ac.uk"},"message":"commit test","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/8bbb8ccaff719b25fdfb097009df20fad37bfb1d"},{"sha":"945c911e7ef3fc772702243892d070a7e6cb68db","author":{"name":"DESKTOP-20Q99IO\\benth","email":"d9689ce55ff3eb8ddf09903fbebb95b08f05720f@york.ac.uk"},"message":"added in the Scoring for the game and will show on the win screen","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/945c911e7ef3fc772702243892d070a7e6cb68db"},{"sha":"f97e5d80fffcd5bae625d0e30e5ec742917c91c9","author":{"name":"Tom-Porter","email":"cf1512d9727966b0fce7d54ea131bcd5e24cb7e5@york.ac.uk"},"message":"Work on ignore","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/f97e5d80fffcd5bae625d0e30e5ec742917c91c9"},{"sha":"56722b80171a01acbbdd92998f8f7b0c18ea8b19","author":{"name":"DESKTOP-20Q99IO\\benth","email":"d9689ce55ff3eb8ddf09903fbebb95b08f05720f@york.ac.uk"},"message":"1) added a lose screen\n2) fixed all bugs with scoring for both win and lose\nScoring finished","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/56722b80171a01acbbdd92998f8f7b0c18ea8b19"},{"sha":"5285c0f668acfd1314ac5e357cc8570aad2f5f2e","author":{"name":"Tom-Porter","email":"cf1512d9727966b0fce7d54ea131bcd5e24cb7e5@york.ac.uk"},"message":"no message","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/5285c0f668acfd1314ac5e357cc8570aad2f5f2e"},{"sha":"d0b2587053d3ff5b20728b62a1f375d2416a85b1","author":{"name":"DhillanL","email":"d5f32d0793b526a03d93414bbad03faafc0fbb0b@york.ac.uk"},"message":"Merge pull request #1 from DhillanL/score\n\nScore","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/d0b2587053d3ff5b20728b62a1f375d2416a85b1"},{"sha":"bcd80bdce801939c367ffd0e3150c4e64f46c3f2","author":{"name":"Tom-Porter","email":"cf1512d9727966b0fce7d54ea131bcd5e24cb7e5@york.ac.uk"},"message":"Ignore finished","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/bcd80bdce801939c367ffd0e3150c4e64f46c3f2"},{"sha":"ad8a6112c233a359623a54d1275d56d105d4e60a","author":{"name":"Dhillan Lad","email":"d5f32d0793b526a03d93414bbad03faafc0fbb0b@york.ac.uk"},"message":"Removed conflicts\n\n# Conflicts:\n#\tHomicide in the Hub/Assets/Scripts/CharacterInteraction.cs\n#\tHomicide in the Hub/Library/CurrentLayout.dwlt\n#\tHomicide in the Hub/Library/InspectorExpandedItems.asset\n#\tHomicide in the Hub/Library/LastSceneManagerSetup.txt\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tHomicide in the Hub/Library/assetDatabase3\n#\tHomicide in the Hub/Library/expandedItems\n#\tHomicide in the Hub/Library/metadata/00/00000000000000002000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000003000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000004000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000004100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000005000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000005100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000006000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000006100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000007000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000007100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000008000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000008100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000009000000000000000\n#\tHomicide in the Hub/Library/metadata/00/0000000000000000a000000000000000\n#\tHomicide in the Hub/Library/metadata/00/0000000000000000a100000000000000\n#\tHomicide in the Hub/Library/metadata/00/0000000000000000b000000000000000\n#\tHomicide in the Hub/Library/metadata/00/0000000000000000c000000000000000\n#\tHomicide in the Hub/Library/metadata/19/191a0fdb6cbe18048a44dcaf4a54ecca\n#\tHomicide in the Hub/Library/metadata/6a/6a9dfb0e565681141b5c24c8b9367255","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/ad8a6112c233a359623a54d1275d56d105d4e60a"},{"sha":"39914b86dc6d949a012b8a47ba1279fddcb6edb4","author":{"name":"DhillanL","email":"d5f32d0793b526a03d93414bbad03faafc0fbb0b@york.ac.uk"},"message":"Merge pull request #2 from DhillanL/Ignore\n\nIgnore","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/39914b86dc6d949a012b8a47ba1279fddcb6edb4"},{"sha":"cfb777d6b3d57c2062bf8fc3ace756755148e7ac","author":{"name":"Dhillan Lad","email":"d5f32d0793b526a03d93414bbad03faafc0fbb0b@york.ac.uk"},"message":"Fixed errors","distinct":false,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/cfb777d6b3d57c2062bf8fc3ace756755148e7ac"},{"sha":"9be246a7bd22bb3e5c606990a179a645018b9fbf","author":{"name":"Dhillan Lad","email":"d5f32d0793b526a03d93414bbad03faafc0fbb0b@york.ac.uk"},"message":"Merge branch 'master' into NPC\n\nFixed some conflicts\n\n# Conflicts:\n#\tHomicide in the Hub/Assembly-CSharp-Editor.csproj\n#\tHomicide in the Hub/Assembly-CSharp-firstpass.csproj\n#\tHomicide in the Hub/Assembly-CSharp.csproj\n#\tHomicide in the Hub/Assets/Scenes/Atrium.unity\n#\tHomicide in the Hub/Assets/Scenes/Control Room.unity\n#\tHomicide in the Hub/Assets/Scenes/Island of Interaction.unity\n#\tHomicide in the Hub/Assets/Scenes/Kitchen.unity\n#\tHomicide in the Hub/Assets/Scenes/Lakehouse.unity\n#\tHomicide in the Hub/Assets/Scenes/Lecture Theatre.unity\n#\tHomicide in the Hub/Assets/Scenes/Roof.unity\n#\tHomicide in the Hub/Assets/Scenes/Underground Lab.unity\n#\tHomicide in the Hub/Assets/Scripts/GameMaster.cs\n#\tHomicide in the Hub/Assets/Scripts/NotebookManager.cs\n#\tHomicide in the Hub/Library/CurrentLayout.dwlt\n#\tHomicide in the Hub/Library/InspectorExpandedItems.asset\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp.dll\n#\tHomicide in the Hub/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n#\tHomicide in the Hub/Library/assetDatabase3\n#\tHomicide in the Hub/Library/expandedItems\n#\tHomicide in the Hub/Library/metadata/00/00000000000000002000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000003000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000004000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000004100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000005000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000005100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000006000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000006100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000007000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000007100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000008000000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000008100000000000000\n#\tHomicide in the Hub/Library/metadata/00/00000000000000009000000000000000\n#\tHomicide in the Hub/Library/metadata/00/0000000000000000a000000000000000\n#\tHomicide in the Hub/Library/metadata/00/0000000000000000a100000000000000\n#\tHomicide in the Hub/Library/metadata/00/0000000000000000b000000000000000\n#\tHomicide in the Hub/Library/metadata/00/0000000000000000c000000000000000\n#\tHomicide in the Hub/Library/metadata/07/0754b189f5d3ef34393c1394cbbe1363.info\n#\tHomicide in the Hub/Library/metadata/07/07d10b63eb2d7354eac51581f2e6e0ad.info\n#\tHomicide in the Hub/Library/metadata/0e/0ebc7bfff55634047b4a44226bce0675.info\n#\tHomicide in the Hub/Library/metadata/10/10fc48e3fb110b54abd85bf32b937f6a.info\n#\tHomicide in the Hub/Library/metadata/11/11a5a4cec74ede240909d81339630455.info\n#\tHomicide in the Hub/Library/metadata/17/171914c7a30d6f146a2d87ebd4850893.info\n#\tHomicide in the Hub/Library/metadata/19/191a0fdb6cbe18048a44dcaf4a54ecca\n#\tHomicide in the Hub/Library/metadata/19/19555d7d9d114c7f1100f5ab44295342.info\n#\tHomicide in the Hub/Library/metadata/23/23a02ac18d11c9ffa0009c58a8ad6659.info\n#\tHomicide in the Hub/Library/metadata/25/25f0e34fe66be6e4baa2ec227d4bde01.info\n#\tHomicide in the Hub/Library/metadata/28/28f1b62e1364e5a4e88f7bb94dbcf183.info\n#\tHomicide in the Hub/Library/metadata/2e/2e23dd2e45fa8ff478089acae77b649f\n#\tHomicide in the Hub/Library/metadata/33/33d5727f227790f4ca2dec9f89930b8d.info\n#\tHomicide in the Hub/Library/metadata/37/37790e5394944d642abb3f36e81b711d.info\n#\tHomicide in the Hub/Library/metadata/3c/3c0ad459c1534645b5d603b7cc258f97\n#\tHomicide in the Hub/Library/metadata/41/41007d80e14613245b6db841172cde68.info\n#\tHomicide in the Hub/Library/metadata/4a/4a022570aa7d763458d11a4fdf8d08ee.info\n#\tHomicide in the Hub/Library/metadata/4d/4d34febb708a313468a5d636462d3b6f.info\n#\tHomicide in the Hub/Library/metadata/4e/4e1b84d4d2f386d4296d64c8c3f7700b.info\n#\tHomicide in the Hub/Library/metadata/4e/4eebf425057d7ae4ca85d6dc4ea8003c.info\n#\tHomicide in the Hub/Library/metadata/51/515968758ea9eba4bb873388e9ea123c.info\n#\tHomicide in the Hub/Library/metadata/51/51dc83dcd1821d54894af8db1b5656c9.info\n#\tHomicide in the Hub/Library/metadata/54/547cb49f53daac04ca2bb1101d218b2e.info\n#\tHomicide in the Hub/Library/metadata/59/59806aadf8aff5a4a966e2a8a31abc47.info\n#\tHomicide in the Hub/Library/metadata/5b/5bb7187490a918f4987c39ce37651aba.info\n#\tHomicide in the Hub/Library/metadata/5d/5dde944b47748f542a6e09e3a7017d78\n#\tHomicide in the Hub/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7\n#\tHomicide in the Hub/Library/metadata/64/641bb2dce818a8a499b537a1963889ac.info\n#\tHomicide in the Hub/Library/metadata/6a/6a9dfb0e565681141b5c24c8b9367255\n#\tHomicide in the Hub/Library/metadata/6c/6c66eeaf8a8ede749997565a9ec685f7\n#\tHomicide in the Hub/Library/metadata/6e/6e67bba55ca91e048b6556e894d4d9c0.info\n#\tHomicide in the Hub/Library/metadata/72/72879c784eb6315498eaa40f41ba3e72.info\n#\tHomicide in the Hub/Library/metadata/73/739bbd9f364b4268874f9fd86ab3beef\n#\tHomicide in the Hub/Library/metadata/7c/7cbab2be89b54486bbd23a6fe637d30e\n#\tHomicide in the Hub/Library/metadata/7e/7e876740513bc7b4a81f8bb6459423ab.info\n#\tHomicide in the Hub/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f\n#\tHomicide in the Hub/Library/metadata/85/852e56802eb941638acbb491814497b0\n#\tHomicide in the Hub/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba\n#\tHomicide in the Hub/Library/metadata/87/87e738072f92f734cb8778526424cfa5.info\n#\tHomicide in the Hub/Library/metadata/89/89887a068f6a573419c5373beb5c5874.info\n#\tHomicide in the Hub/Library/metadata/8d/8d26f1692cf51784f9cd0714b3790d54.info\n#\tHomicide in the Hub/Library/metadata/8e/8e0cd8ed44d4412cbe0642067abc9e44\n#\tHomicide in the Hub/Library/metadata/93/9331c6724789d684eaa9273ee0184f85.info\n#\tHomicide in the Hub/Library/metadata/93/935eccd9ae3c32a4085e1ea2d4230787.info\n#\tHomicide in the Hub/Library/metadata/94/943ceb2c7e601e54eb442822fa0938b5.info\n#\tHomicide in the Hub/Library/metadata/97/97decbdab0634cdd991f8d23ddf0dead\n#\tHomicide in the Hub/Library/metadata/9a/9a4cbcfbf3949db40b5d3a4556f8cb05.info\n#\tHomicide in the Hub/Library/metadata/9a/9a8f3af8541b9d54e91631266ef2cee6\n#\tHomicide in the Hub/Library/metadata/a2/a20ec286808ce304f95d59badab38314.info\n#\tHomicide in the Hub/Library/metadata/a6/a653a0f779e7f434a82f9eea38bb2dc5.info\n#\tHomicide in the Hub/Library/metadata/aa/aa5562ccc1651403ea5cf76a929a9a75\n#\tHomicide in the Hub/Library/metadata/ab/ab299c9a85d6c6447929e6ba36946310\n#\tHomicide in the Hub/Library/metadata/ab/abcbbaa864d949e48956685deb43bacd.info\n#\tHomicide in the Hub/Library/metadata/ad/ad4e3e3859e819246bdb8e457b17544f\n#\tHomicide in the Hub/Library/metadata/ad/adaca16618847094cb9bec55bc244d28.info\n#\tHomicide in the Hub/Library/metadata/ad/adebbd281f1a4ef3a30be7f21937e02f\n#\tHomicide in the Hub/Library/metadata/ad/aded278af5191254eabe2844a41ad849.info\n#\tHomicide in the Hub/Library/metadata/af/af3a6e3de30a7a14eb0e9da15b427143.info\n#\tHomicide in the Hub/Library/metadata/b0/b011a2621728e004f9c7ff1cb06d9ada.info\n#\tHomicide in the Hub/Library/metadata/b1/b1219fe3c4fab194da62205cb45bbee2.info\n#\tHomicide in the Hub/Library/metadata/b2/b218f30e15d24b643bd822cb75fe8621.info\n#\tHomicide in the Hub/Library/metadata/b9/b995d4bd9d11078d11005b9844295342.info\n#\tHomicide in the Hub/Library/metadata/ba/baca82ce8670a9c4b815fa578996c604\n#\tHomicide in the Hub/Library/metadata/d2/d2861761e1045a343b9d5809e541d735.info\n#\tHomicide in the Hub/Library/metadata/d8/d87477eb16443d24199a7382acc934ca.info\n#\tHomicide in the Hub/Library/metadata/dc/dc261099e252edd48a8faed2d0d7cf79.info\n#\tHomicide in the Hub/Library/metadata/e9/e971c89cc8a127f4ea3fc0ae67e10fa0.info\n#\tHomicide in the Hub/Library/metadata/eb/eb4a8c73e5edd7f4cadd4fab9050f5de.info\n#\tHomicide in the Hub/Library/metadata/f1/f1bd913fffe6a574494c712e3d8e7581.info\n#\tHomicide in the Hub/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8\n#\tHomicide in the Hub/Library/metadata/f5/f5f871d63360a2046ac3a749dafe640c.info","distinct":true,"url":"https://api.github.com/repos/DhillanL/Assessment_3/commits/9be246a7bd22bb3e5c606990a179a645018b9fbf"}]}
{"actor":{"display_login":"DhillanL"}}