Merge remote-tracking branch 'origin/master' into Networking

# Conflicts:
#	include/Game/PlayerSystem.h
#	src/Game/Game.cpp
#	src/Game/PlayerSystem.cpp

src/Game/Game.cpp

@@ -1,4 +1,6 @@
 #include "Game.h"
+#include "Collision/TriggerSystem.h"
+#include "Collision/CollisionSystem.h"
 
 Game::Game(int argc, char* argv[])
 {
@@ -53,6 +55,9 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline->AddSystem<RaptorCopterSystem>();
     m_SystemPipeline->AddSystem<PlayerSystem>();
     m_SystemPipeline->AddSystem<EditorSystem>(m_Renderer);
+    m_SystemPipeline->AddSystem<CollisionSystem>();
+    m_SystemPipeline->AddSystem<TriggerSystem>();
+
     // Invoke network
     if (m_Config->Get<bool>("Networking.StartNetwork", false)) {
         //boost::thread workerThread(&Game::networkFunction, this);

src/Game/PlayerSystem.cpp

@@ -5,6 +5,7 @@ void PlayerSystem::UpdateComponent(World * world, ComponentWrapper & player, dou
     player["Velocity"] = glm::vec3(0.f, 0.f, 0.f);
     if ((bool&)player["Forward"] == true) {
         ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt) * -1;
+
     }
     if ((bool&)player["Left"] == true) {
         ((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt) * -1;
@@ -21,3 +22,21 @@ void PlayerSystem::UpdateComponent(World * world, ComponentWrapper & player, dou
         (glm::vec3&)transform["Position"] += (glm::vec3)player["Velocity"];
     }
 }
+
+bool PlayerSystem::OnTouch(const Events::TriggerTouch &event)
+{
+    LOG_INFO("Player entity %i touched widget (entity %i).", event.Entity, event.Trigger);
+    return false;
+}
+
+bool PlayerSystem::OnEnter(const Events::TriggerEnter &event)
+{
+    LOG_INFO("Player entity %i entered widget (entity %i).", event.Entity, event.Trigger);
+    return false;
+}
+
+bool PlayerSystem::OnLeave(const Events::TriggerLeave &event)
+{
+    LOG_INFO("Player entity %i left widget (entity %i).", event.Entity, event.Trigger);
+    return false;
+}