Merge branch 'master' into physics2d-position-offset

2019-03-26 20:33:40 +01:00
parent 3beeeebc1d 1880f88e8f
commit 23887cc519
12 changed files with 206 additions and 37 deletions
--- a/SDK/include/NDK/Components/DebugComponent.hpp
+++ b/SDK/include/NDK/Components/DebugComponent.hpp
@@ -16,7 +16,7 @@ namespace Ndk
 {
 	enum class DebugDraw
 	{
-		//TODO: Collider2D
+		Collider2D,
 		Collider3D,
 		GraphicsAABB,
 		GraphicsOBB,