Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11624 for code/branches


Ignore:
Timestamp:
Dec 4, 2017, 2:38:03 PM (7 years ago)
Author:
merholzl
Message:

More clean-up, particle fix, deleting unnecessary files, adding quotes

Location:
code/branches/FlappyOrx_HS17
Files:
8 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw

    r11620 r11624  
    55 screenshot = "orxonoxArcade.png"
    66/>
    7 <FlappyOrx
    8       spawnDistance=50
    9       Speed = 700 />
     7
    108<?lua
    11   include("includes/notifications.oxi")
    129  include("templates/lodInformation.oxt")
    1310  include("templates/spaceshipFlappyOrx.oxt")
    … …  
    5047            collisionType = dynamic
    5148            linearDamping = 0.8
    52             angularDamping = 0
     49            angularDamping = 1
    5350            scale = "<?lua print(j) ?>"
    5451            collisiondamage = 10000
    … …  
    6057            </attached>
    6158            <collisionShapes>
    62               <SphereCollisionShape radius="<?lua print(j + 5) ?>" />
     59              <SphereCollisionShape radius="<?lua print(j + 7) ?>" />
    6360            </collisionShapes>
    6461          </MovableEntity>

  • code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt

    r11620 r11624  
    2323
    2424  speedBase = 100
    25   speedIncrease = 2
    26   tubeDistanceBase = 300
    27   tubeDistanceIncrease = -3
     25  speedIncrease = 0.5
     26  tubeDistanceBase = 200
     27  tubeDistanceIncrease = -1
    2828
    29   upwardThrust = 200
    30   gravity = 500
     29  upwardThrust = 210
     30  gravity = 700
    3131
    3232  >
    33     <engines>
    34       <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipFlappyOrxengine />
    35       <MultiStateEngine position="-7.6, 0, 0" template=spaceshipFlappyOrxengine />
    36     </engines>
     33   
    3734    <attached>
    3835      <Model position="0,0,0" yaw=180 pitch=90 roll=270 scale=9 mesh="FlappyOrxShip.mesh" />

  • code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo

    r11600 r11624  
    1 
    2 
     1<Template name="spectatorhud">
     2  <OverlayGroup name = "spectatorhud" scale = "1, 1">
     3  </OverlayGroup>
     4</Template>
    35<Template name="FlappyOrxHUD">
    46  <OverlayGroup name="FlappyOrxHUD" scale = "1, 1">

  • code/branches/FlappyOrx_HS17/data/particle/fire3.particle

    r5781 r11624  
    6565                colour3 0 0 0 0
    6666                time3   1
    67                 colour4 0.5 0.5 0.5 0
    68                 time4   1
    69                 colour5 0.5 0.5 0.5 0
    70                 time5   1
     67               
    7168        }
    7269}

  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/CMakeLists.txt

    r11529 r11624  
    44  FlappyOrxCenterPoint.cc
    55  FlappyOrxShip.cc
    6   FlappyOrxWeapon.cc
    7   FlappyOrxWeaponEnemy.cc
    86  FlappyOrxHUDinfo.cc
    9   FlappyOrxAsteroid.cc
    107END_BUILD_UNIT
    118)

  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc

    r11620 r11624  
    2121 *
    2222 *   Author:
    23  *      Leo Mehr Holz
     23 *      Leo Merholz
    2424 *      Pascal Schärli
     25 *   Co-authors:
     26 *      ...
    2527 *
    2628 */
    … …  
    4749
    4850#include "FlappyOrxCenterPoint.h"
    49 #include "FlappyOrxAsteroid.h"
    5051#include "FlappyOrxShip.h"
    5152
    … …  
    7374    }
    7475   
    75     void FlappyOrx::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    76         {   
    77             SUPER(FlappyOrx, XMLPort, xmlelement, mode);
    78             XMLPortParam(FlappyOrx, "spawnDistance", setspawnDistance, getspawnDistance, xmlelement, mode);
    79             XMLPortParam(FlappyOrx, "Speed", setSpeed, getSpeed, xmlelement, mode);
    80         }
    81 
    8276    void FlappyOrx::updatePlayerPos(int x){
    8377
    … …  
    287281    void FlappyOrx::end()
    288282    {
    289         // DON'T CALL THIS!
    290         //      Deathmatch::end();
    291         // It will misteriously crash the game!
    292         // Instead startMainMenu, this won't crash.
    293283        if (Highscore::exists()){
    294284                    int score = this->getPoints();

  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h

    r11620 r11624  
    2121 *
    2222 *   Author:
    23  *      Leo Mehr Holz
     23 *      Leo Merholz
    2424 *      Pascal Schärli
     25 *   Co-authors:
     26 *      ...
    2527 *
    2628 */
    … …  
    6769            virtual void end() override;
    6870            virtual void death();
    69             virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
    70             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    71            
    72             void setspawnDistance( int spawnDistance)
    73                 {this->spawnDistance = spawnDistance; }
    74             int getspawnDistance()
    75                 { return this->spawnDistance; } 
    76             inline void setSpeed( float speed ){   
    77                 orxout()<< speed<< endl;
    78                 this->speed = speed; }
    79             inline float getSpeed( )
    80                 { return this->speed; }
    81 
     71           
    8272            void updatePlayerPos(int x);
    8373            void createAsteroid(Circle &c);
    … …  
    159149                "Well, that was a waste of time",
    160150                "You suck!",
    161                 "Maybe try SuperOrxoBros? That game is not as hard.",
    162                 "Here's a tip: Try not to fly into these grey thingies."};
     151                "Maybe try SuperOrxoBros. That game is not as hard.",
     152                "Here's a tip: Try not to fly into these grey thingies.",
     153                "We won't comment on that."};
    163154            std::vector<std::string> DeathMessage30 = {
    164155                "Getting better!",
    … …  
    182173                "Wow, we're really impressed",
    183174                "We will honor you!",
    184                 "Please do that again!",
    185                 "Take that golden medal! You've earned it"};
     175                "Please, please do that again!",
     176                "Take that golden medal! You've earned it",
     177                "We are completely speechless! That was magnificent"};
    186178           
    187179

  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxCenterPoint.cc

    r11503 r11624  
    2121 *
    2222 *   Author:
    23  *      Florian Zinggeler
     23 *      Leo Merholz
     24 *      Pascal Schärli
    2425 *   Co-authors:
    2526 *      ...

  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxCenterPoint.h

    r11503 r11624  
    2121 *
    2222 *   Author:
    23  *      Florian Zinggeler
     23 *      Leo Merholz
     24 *      Pascal Schärli
    2425 *   Co-authors:
    2526 *      ...

  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc

    r11595 r11624  
    2121 *
    2222 *   Author:
    23  *      Florian Zinggeler
     23 *      Leo Merholz
     24 *      Pascal Schärli
    2425 *
     26 *      Co-authors:
     27 *      ...
    2528 */
    2629
    … …  
    8487                        if(messageID==3){
    8588                            setTextSize(0.05);
    86                             this->setCaption("press space to start");
     89                            this->setCaption("Press fire and then press space to start");
    8790                        }
    8891                    }

  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxPrereqs.h

    r11503 r11624  
    2121 *
    2222 *   Author:
    23  *      Florian Zinggeler
     23 *      Leo Merholz
     24 *      Pascal Schärli
    2425 *   Co-authors:
    2526 *      ...

  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

    r11620 r11624  
    2121 *
    2222 *   Author:
    23  *      Florian Zinggeler
     23 *      FLeo Merholz
     24 *      Pascal Schärli
    2425 *   Co-authors:
    2526 *      ...
    … …  
    5253        deathTime = 0;
    5354
    54         particleLifespan = 0.1;
     55        particleLifespan = 0.08;
    5556        particleAge = 0;
    5657
    … …  
    119120            if (camera != nullptr)
    120121            {
    121                 //camera->setPosition(Vector3(-pos.z, -pos.y, 0));
    122122                camera->setPosition(pos.x,-100,0);
    123123                camera->setOrientation(Vector3::UNIT_Z, Degree(0));
    … …  
    138138
    139139    int FlappyOrxShip::timeUntilRespawn(){
    140         return 2-time(0)+deathTime;
     140        return 1-time(0)+deathTime;
    141141    }
    142142
    … …  
    154154    }
    155155
    156     // void FlappyOrxShip::rotateRoll(const Vector2& value)
    157     // {
    158     //     if (getGame())
    159     //         if (getGame()->bEndGame)
    160     //             getGame()->end();
    161     // }
    162 
     156 
    163157    FlappyOrx* FlappyOrxShip::getGame()
    164158    {
    … …  
    177171        deathTime = time(0);
    178172
    179         orxout()<<"death time: "<<deathTime<<std::endl;
     173        //orxout()<<"death time: "<<deathTime<<std::endl;
    180174        Vector3 pos = getPosition();
    181175        pos.x = 0;

  • code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h

    r11620 r11624  
    2121 *
    2222 *   Author:
    23  *      Florian Zinggeler
     23 *      Leo Merholz
     24 *      Pascal Schärli
    2425 *   Co-authors:
    2526 *      ...
    … …  
    5657
    5758            //return to main menu if game has ended.
    58             virtual void rotateRoll(const Vector2& value) override;
    5959           
    60             inline void  setSpeedBase(int speedBase){ getGame()->setSpeedBase(speedBase);}
     60            inline void  setSpeedBase(float speedBase){ getGame()->setSpeedBase(speedBase);}
    6161            inline float getSpeedBase(){ return getGame()->getSpeedBase();}
    6262            inline void  setSpeedIncrease(int speedIncrease){ getGame()->setSpeedIncrease(speedIncrease);}
Note: See TracChangeset for help on using the changeset viewer.