{"push_id":666793149,"size":4,"distinct_size":4,"ref":"refs/heads/Development-NEW","head":"3fc88ebe162ba6b54aa8049ef0238ca377085957","before":"eebd44f3fcf2f1f55ba0f8c1d969c2b74eb6f85a","commits":[{"sha":"fbaf1e2802b15912e8264decd1fbb106fdaecb01","author":{"email":"779d5f8a41891bc6768d9ca3462fcda572d6d817@gmail.com","name":"deadpanda1"},"message":"game over state-semi done\n\ngonna merge with nikolajs game over","distinct":true,"url":"https://api.github.com/repos/nstovring/P2_BattleShip/commits/fbaf1e2802b15912e8264decd1fbb106fdaecb01"},{"sha":"8d395fdc7ec893dc5b373fb10d3110b4c0ddd825","author":{"email":"779d5f8a41891bc6768d9ca3462fcda572d6d817@gmail.com","name":"deadpanda1"},"message":"Merge remote-tracking branch 'origin/Development-NEW' into Development-NEW\n\nConflicts:\n\tP2 Networking/Assets/StreamingAssets/build_info.txt\n\tP2 Networking/Assets/_scenes/Iteration1.unity\n\tP2 Networking/Assets/_scripts/ServerAttacking.cs\n\tP2 Networking/Assets/_scripts/ShipPlacement.cs\n\tP2 Networking/Assets/_scripts/shipScript.cs\n\tP2 Networking/Library/CurrentLayout.dwlt\n\tP2 Networking/Library/EditorUserBuildSettings.asset\n\tP2 Networking/Library/ScriptAssemblies/Assembly-CSharp.dll\n\tP2 Networking/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb\n\tP2 Networking/Library/ScriptAssemblies/Assembly-UnityScript.dll\n\tP2 Networking/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb\n\tP2 Networking/Library/assetDatabase3\n\tP2 Networking/Library/expandedItems\n\tP2 Networking/Library/metadata/00/00000000000000003000000000000000\n\tP2 Networking/Library/metadata/00/00000000000000004000000000000000\n\tP2 Networking/Library/shadercompiler-32bit-1.log\n\tP2 Networking/Library/shadercompiler-64bit-1.log\n\tP2 Networking/P2 Networking-csharp.sln\n\tP2 Networking/P2 Networking.sln\n\tP2 Networking/P2 Networking.userprefs","distinct":true,"url":"https://api.github.com/repos/nstovring/P2_BattleShip/commits/8d395fdc7ec893dc5b373fb10d3110b4c0ddd825"},{"sha":"a6a72909223193cf86b9f94cb9733ce7f3d5fdb6","author":{"email":"779d5f8a41891bc6768d9ca3462fcda572d6d817@gmail.com","name":"deadpanda1"},"message":"lolo","distinct":true,"url":"https://api.github.com/repos/nstovring/P2_BattleShip/commits/a6a72909223193cf86b9f94cb9733ce7f3d5fdb6"},{"sha":"3fc88ebe162ba6b54aa8049ef0238ca377085957","author":{"email":"779d5f8a41891bc6768d9ca3462fcda572d6d817@gmail.com","name":"deadpanda1"},"message":"Revert \"lolo\"\n\nThis reverts commit a6a72909223193cf86b9f94cb9733ce7f3d5fdb6.","distinct":true,"url":"https://api.github.com/repos/nstovring/P2_BattleShip/commits/3fc88ebe162ba6b54aa8049ef0238ca377085957"}]}