Merge branch 'master' of github.com:teamfisk/TacticalZ

# Conflicts: # resources/Schema/Entities/Player.xml # src/Engine/Network/Server.cpp
2016-01-24 21:21:51 +01:00
parent 382eff169f d4797b0808
commit 0c56a05144
72 changed files with 3182 additions and 436 deletions
@@ -404,7 +404,7 @@ EntityID Client::createPlayer()
    EntityID entityID = m_World->CreateEntity();
    ComponentWrapper transform = m_World->AttachComponent(entityID, "Transform");
    ComponentWrapper model = m_World->AttachComponent(entityID, "Model");
-    model["Resource"] = "Models/Core/UnitSphere.obj";
+    model["Resource"] = "Models/Core/UnitSphere.mesh";
    ComponentWrapper player = m_World->AttachComponent(entityID, "Player");
    return entityID;
 }