Changeset 12192

Timestamp:

Feb 22, 2019, 4:46:06 PM (6 years ago)

Author:

emustafa

Message:

shroom removed, KartController removed

Location:

code/branches/OrxoKart_HS18

Files:

• data/levels/templates/OrxoKartKart.oxt (modified) (1 diff)
• data/tcl/orxokart_highscores.txt (modified) (1 diff)
• src/modules/orxokart/CMakeLists.txt (modified) (1 diff)
• src/modules/orxokart/OrxoKart.cc (modified) (3 diffs)
• src/modules/orxokart/OrxoKartFlag.cc (modified) (1 diff)
• src/modules/orxokart/OrxoKartKart.cc (modified) (1 diff)

code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt

@@ -26 +26 @@
 
    boostPower            = 10
-   boostPowerRate        = 1
-   boostRate             = 5
-   boostCooldownDuration = 10
+   boostPowerRate        = 1000
+   boostRate             = 1
+   boostCooldownDuration = 1
 
    collisionType     = "dynamic"
    mass              = 2000
    linearDamping     = 0.5
-   angularDamping    = 0.999
+   angularDamping    = 0.99999
   >
     <engines>

code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt

@@ -18 +18 @@
 Name: 0:31:46s
 Name: 0:25:40s
+Name: 1:27:11s

code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt

@@ -7 +7 @@
   ShroomHUD.cc
   TimeHUD.cc
-  KartController.cc
 )
 

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc

@@ -59 +59 @@
     { 
         SUPER(OrxoKart, tick, dt);
-
         if(this->firstTick_ && this->origin_)
         {
@@ -144 +143 @@
             flag->init(n, s);
             flag_ = flag;
-            
 
-
-            
+             
 
         } //firsttick end
@@ -184 +181 @@
             flag_->setCollided(false); 
             wayPointCounter = 0;
+
+            
+
         }
 
-        if (player && player->isBoosting()) {
-                //orxout() << "Boosting" << endl;
-                if(!numberOfShrooms) numberOfShrooms--;
-        }
         
     }

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.cc

@@ -86 +86 @@
     void OrxoKartFlag::init(int n, int s)
     {
-        model_ = new Model(this->getContext());
-        model_->setMeshSource("OrxoKartMushroom.mesh");
-        model_->setScale3D(Vector3(s, s, s));
-        model_->setPosition(Vector3(s*n*0.5f,-0.0f, s*n*0.5f));
-
-        this->attach(model_);
 
         cs_ = new BoxCollisionShape(this->getContext());

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "KartController.h"
 namespace orxonox
 {
     RegisterClass(OrxoKartKart);
 
-    void ControllableEntity::rotateYaw(const Vector2& value)
-    {
-        orxout() << "TEST CONTROLlER" << endl;
-    }
 
     OrxoKartKart::OrxoKartKart(Context* context) : SpaceShip(context)