Merge remote-tracking branch 'refs/remotes/origin/master' into gui

2016-10-27 18:36:47 +02:00
parent b24e37bb4f 15a1302522
commit df24519230
179 changed files with 5443 additions and 2071 deletions
--- a/tests/Engine/Network/TCP.cpp
+++ b/tests/Engine/Network/TCP.cpp
@@ -27,7 +27,7 @@ SCENARIO("TCP", "[NETWORK][TCP]")
 		REQUIRE(client.Connect(serverIP) == Nz::SocketState_Connecting);

 		Nz::IpAddress clientIP = client.GetRemoteAddress();
-		REQUIRE(clientIP.IsValid());
+		CHECK(clientIP.IsValid());

 		Nz::Thread::Sleep(100);

@@ -45,9 +45,11 @@ SCENARIO("TCP", "[NETWORK][TCP]")
 			{
 				Nz::NetPacket resultPacket;
 				REQUIRE(serverToClient.ReceivePacket(&resultPacket));
+
 				Nz::Vector3f result;
 				resultPacket >> result;
-				REQUIRE(result == vector123);
+
+				CHECK(result == vector123);
 			}
 		}
 	}