Merge branch 'master' into nazara-next

2020-08-27 20:12:36 +02:00
parent 056b78c2f7 ee3b5347b8
commit b2a7e620e0
21 changed files with 617 additions and 27 deletions
--- a/include/NazaraSDK/Components/PhysicsComponent2D.hpp
+++ b/include/NazaraSDK/Components/PhysicsComponent2D.hpp
@@ -99,6 +99,8 @@ namespace Ndk
 			void OnComponentDetached(BaseComponent& component) override;
 			void OnDetached() override;
 			void OnEntityDestruction() override;
+			void OnEntityDisabled() override;
+			void OnEntityEnabled() override;

 			struct PendingPhysObjectStates
 			{