The rotation of the Pickups are now also included in the AmmoPickup.xml, HealthPickup.xml

Merge remote-tracking branch 'origin/master' into HealthPickup
# Conflicts: # resources/Schema/Entities/NewMap.xml
2016-02-17 14:54:42 +01:00 · 2016-02-17 14:32:59 +01:00 · 2016-02-17 14:30:31 +01:00 · 2016-02-17 14:24:58 +01:00 · 2016-02-17 11:22:42 +01:00 · 2016-02-17 10:53:20 +01:00
3 changed files with 14 additions and 2 deletions
@@ -5,10 +5,15 @@
    <c:AABB/>
    <c:AmmoPickup/>
    <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
    </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
    <c:Transform>
      <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
    </c:Transform>
    <c:Trigger/>
  </Components>
@@ -5,10 +5,15 @@
    <c:AABB/>
    <c:HealthPickup/>
    <c:Model>
-      <Resource>Models/Core/UnitSphere.mesh</Resource>
+      <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
    </c:Model>
+    <c:RaptorCopter>
+      <Speed>0.1</Speed>
+      <Axis X="0" Y="1" Z="0"/>
+    </c:RaptorCopter>
    <c:Transform>
      <Position X="0" Y="1" Z="0"/>
+      <Scale X="0.3" Y="0.3" Z="0.3"/>
    </c:Transform>
    <c:Trigger/>
  </Components>
@@ -43,6 +43,8 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
    m_Enabled = ResourceManager::Load<ConfigFile>("Config.ini")->Get<bool>("Debug.EditorEnabled", false);
    if (m_Enabled) {
        Enable();
+    } else {
+        Disable();
    }
 }
Author	SHA1	Message	Date
verysecrethero	b8222c7b2e	The rotation of the Pickups are now also included in the AmmoPickup.xml, HealthPickup.xml	2016-02-17 14:54:42 +01:00
verysecrethero	3e4b87da7c	Merge remote-tracking branch 'origin/master' into HealthPickup # Conflicts: # resources/Schema/Entities/NewMap.xml	2016-02-17 14:32:59 +01:00
verysecrethero	ac9ce8ea83	Merge remote-tracking branch 'origin/master' into HealthPickup	2016-02-17 14:30:31 +01:00
Tobias Dahl	99643fd748	Merge pull request #112 from teamfisk/AssaultDash You can now AssaultDash in the air	2016-02-17 14:24:58 +01:00
verysecrethero	b13362360a	Fixed RespawnModel of Pickups	2016-02-17 11:22:42 +01:00
Jace	0af9edc6e5	Editor is properly disabled when disabled in config	2016-02-17 10:53:20 +01:00
verysecrethero	ec10ef3ffc	Merge remote-tracking branch 'origin/master' into HealthPickup	2016-02-17 10:32:35 +01:00
verysecrethero	503613907e	Merge remote-tracking branch 'origin/master' into HealthPickup	2016-02-08 11:39:05 +01:00