Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12192


Ignore:
Timestamp:
Feb 22, 2019, 4:46:06 PM (3 years ago)
Author:
emustafa
Message:

shroom removed, KartController removed

Location:
code/branches/OrxoKart_HS18
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/OrxoKart_HS18/data/levels/templates/OrxoKartKart.oxt

    r12168 r12192  
    2626
    2727   boostPower            = 10
    28    boostPowerRate        = 1
    29    boostRate             = 5
    30    boostCooldownDuration = 10
     28   boostPowerRate        = 1000
     29   boostRate             = 1
     30   boostCooldownDuration = 1
    3131
    3232   collisionType     = "dynamic"
    3333   mass              = 2000
    3434   linearDamping     = 0.5
    35    angularDamping    = 0.999
     35   angularDamping    = 0.99999
    3636  >
    3737    <engines>
  • code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt

    r12168 r12192  
    1818Name: 0:31:46s
    1919Name: 0:25:40s
     20Name: 1:27:11s
  • code/branches/OrxoKart_HS18/src/modules/orxokart/CMakeLists.txt

    r12147 r12192  
    77  ShroomHUD.cc
    88  TimeHUD.cc
    9   KartController.cc
    109)
    1110
  • code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc

    r12168 r12192  
    5959    {
    6060        SUPER(OrxoKart, tick, dt);
    61 
    6261        if(this->firstTick_ && this->origin_)
    6362        {
     
    144143            flag->init(n, s);
    145144            flag_ = flag;
    146            
    147145
    148 
    149            
     146             
    150147
    151148        } //firsttick end
     
    184181            flag_->setCollided(false);
    185182            wayPointCounter = 0;
     183
     184           
     185
    186186        }
    187187
    188         if (player && player->isBoosting()) {
    189                 //orxout() << "Boosting" << endl;
    190                 if(!numberOfShrooms) numberOfShrooms--;
    191         }
    192188       
    193189    }
  • code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartFlag.cc

    r12156 r12192  
    8686    void OrxoKartFlag::init(int n, int s)
    8787    {
    88         model_ = new Model(this->getContext());
    89         model_->setMeshSource("OrxoKartMushroom.mesh");
    90         model_->setScale3D(Vector3(s, s, s));
    91         model_->setPosition(Vector3(s*n*0.5f,-0.0f, s*n*0.5f));
    92 
    93         this->attach(model_);
    9488
    9589        cs_ = new BoxCollisionShape(this->getContext());
  • code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc

    r12168 r12192  
    3333#include "core/CoreIncludes.h"
    3434#include "core/XMLPort.h"
    35 #include "KartController.h"
    3635namespace orxonox
    3736{
    3837    RegisterClass(OrxoKartKart);
    3938
    40     void ControllableEntity::rotateYaw(const Vector2& value)
    41     {
    42         orxout() << "TEST CONTROLlER" << endl;
    43     }
    4439
    4540    OrxoKartKart::OrxoKartKart(Context* context) : SpaceShip(context)
Note: See TracChangeset for help on using the changeset viewer.