Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12168


Ignore:
Timestamp:
Dec 7, 2018, 4:40:29 PM (7 months ago)
Author:
emustafa
Message:

still on controlls

Location:
code/branches/OrxoKart_HS18
Files:
5 edited

Legend:

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

    r12155 r12168  
    3131
    3232   collisionType     = "dynamic"
    33    mass              = 100
    34    linearDamping     = 0.2
    35    angularDamping    = 0.9999999
     33   mass              = 2000
     34   linearDamping     = 0.5
     35   angularDamping    = 0.999
    3636  >
    3737    <engines>
     
    4040    <attached>
    4141      <Model position="0,0,-20" mesh="hovership_body.mesh" scale="5" yaw=180/> 
    42       <Model position="0,0,-20" mesh="hovership_engine.mesh" scale="5" yaw=180/>       
    43       <Model position="0,0,-20" mesh="hovership_gun.mesh" scale="5" yaw=180/>   
    44      
     42      <Model position="0,0,-20" mesh="hovership_engine.mesh" scale="5" yaw=180/>             
    4543    </attached>
    4644    <collisionShapes>
     
    5755      <ExplosionPart mesh="explosionparts/pirate_part_4.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
    5856    </explosion>
    59 
    60 <?lua
    61   include("../includes/weaponSettingsHover.oxi")
    62 ?>
    6357  </SpaceShip>
    6458</Template>
  • code/branches/OrxoKart_HS18/data/tcl/orxokart_highscores.txt

    r12167 r12168  
    1414Name: 0:21:87s
    1515Name: 0:50:45s
    16 Name: 0:26:64s
     16Name: 0:27:45s
     17Name: 0:33:17s
     18Name: 0:31:46s
     19Name: 0:25:40s
  • code/branches/OrxoKart_HS18/src/modules/orxokart/KartController.h

    r12147 r12168  
    3434
    3535#include "OrxoKartPrereqs.h"
    36 
    3736#include "controllers/HumanController.h"
    3837
  • code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc

    r12156 r12168  
    163163        }
    164164        else {
    165             orxout() << " Should not happen, look in OrxoKart.cc";
     165            //orxout() << " Should not happen, look in OrxoKart.cc";
    166166        }
    167167
    168168
    169169
    170                 orxout() << numberOfShrooms << endl;
     170                //orxout() << numberOfShrooms << endl;
    171171
    172172
    173173        // Check if ship collided with the flag, flag is the bottom that is responsible for the game to detect the spaceship falling.
    174174        if(flag_->getCollided()){
    175                 orxout() << numberOfShrooms << endl;
     175                //orxout() << numberOfShrooms << endl;
    176176            player = flag_->getObjectofCollision();
    177177            if (level == 1)
     
    187187
    188188        if (player && player->isBoosting()) {
    189                 orxout() << "Boosting" << endl;
     189                //orxout() << "Boosting" << endl;
    190190                if(!numberOfShrooms) numberOfShrooms--;
    191191        }
  • code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKartKart.cc

    r12147 r12168  
    3333#include "core/CoreIncludes.h"
    3434#include "core/XMLPort.h"
    35 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
    36 #include "controllers/HumanController.h"
    37 
     35#include "KartController.h"
    3836namespace orxonox
    3937{
    4038    RegisterClass(OrxoKartKart);
    4139
     40    void ControllableEntity::rotateYaw(const Vector2& value)
     41    {
     42        orxout() << "TEST CONTROLlER" << endl;
     43    }
     44
    4245    OrxoKartKart::OrxoKartKart(Context* context) : SpaceShip(context)
    4346    {
    44 
    4547        RegisterObject(OrxoKartKart);
    46         enableCollisionCallback();
    4748    }
    4849
     
    6667    void OrxoKartKart::rotateYaw(const Vector2& value)
    6768        {
     69           
    6870            this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x); 
    6971        }
Note: See TracChangeset for help on using the changeset viewer.