Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12411


Ignore:
Timestamp:
May 22, 2019, 2:59:08 PM (6 years ago)
Author:
wiesep
Message:

Merged OrxoBlox_FS19

Location:
code/branches/Presentation_FS19
Files:
14 edited
11 copied

Legend:

Unmodified
Added
Removed

  • code/branches/Presentation_FS19

  • code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw

    r11783 r12411  
    4444    <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
    4545    <Light type=directional position="-100, 10000, -700" lookat="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
    46     <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass= Asteroids2DShip pawndesign=spaceshipasteroids2d />
     46    <SpawnPoint team=0 position="0,0,50" lookat="0,0,0" spawnclass= Asteroids2DShip pawndesign=spaceshipasteroids2d />
    4747
    4848    <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->

  • code/branches/Presentation_FS19/data/levels/emptyLevel.oxw

    r12409 r12411  
    11<LevelInfo
    2  name = "Empty level"
    3  description = "A level with absolutely nothing in it."
     2 name = "Emptylevel"
     3 description = "A clone version of the BBTAN game."
    44 tags = "test"
    55 screenshot = "emptylevel.png"

  • code/branches/Presentation_FS19/data/levels/pong.oxw

    r10624 r12411  
    1616  <PongBat>
    1717    <camerapositions>
     18      <!---- Verschidene Kameraeinstellungen festlegen ---->
    1819      <CameraPosition position="0,150,0" pitch=-90 absolute=true />
    1920      <CameraPosition position="0,50,160" drag=true mouselook=true />
    … …  
    5051  </PongBall>
    5152</Template>
    52 
    5353
    5454<Level

  • code/branches/Presentation_FS19/data/levels/templates/spaceshipEscort.oxt

    r11052 r12411  
    4444    <attached>
    4545      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
    46       <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
     46      <Model position="50,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
    4747<!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
    4848<Model mesh="cube.mesh" mass=10 position="12.6,-2,3" scale3D="2.8,2.8,11" />

  • code/branches/Presentation_FS19/data/levels/tetris.oxw

    r10624 r12411  
    125125      </controller>
    126126    </SpaceShip>
    127    
    128    <SpaceShip position="-500,-500,-400" lookat="0,0,0">
    129       <templates>
    130         <Template link=spaceshippirate />
    131       </templates>
    132       <controller>
    133         <WaypointController team=10>
    134           <waypoints>
    135             <Model mesh="cube.mesh" scale=0 position="-1000,-200,0" />
    136             <Model mesh="cube.mesh" scale=0 position="-700,-150,650" />
    137             <Model mesh="cube.mesh" scale=0 position="-55,-75,1000" />
    138             <Model mesh="cube.mesh" scale=0 position="650,100,650" />         
    139             <Model mesh="cube.mesh" scale=0 position="1000,150,0" />
    140             <Model mesh="cube.mesh" scale=0 position="650,100,-650" />
    141             <Model mesh="cube.mesh" scale=0 position="-55,0,-1000" />
    142             <Model mesh="cube.mesh" scale=0 position="-700,-100,-650" />
    143           </waypoints>
    144         </WaypointController>
    145       </controller>
    146     </SpaceShip>
    147    
    148        <SpaceShip position="-700,200,651" lookat="1,0,0">
    149       <templates>
    150         <Template link=spaceshipghost />
    151       </templates>
    152       <controller>
    153         <WaypointController team=10 accuracy=300>
    154           <waypoints>
    155             <Model mesh="cube.mesh" scale=0 position="-700,200,650" />
    156             <Model mesh="cube.mesh" scale=0 position="-55,100,1000" />
    157             <Model mesh="cube.mesh" scale=0 position="650,0,650" />         
    158             <Model mesh="cube.mesh" scale=0 position="1000,-100,0" />
    159             <Model mesh="cube.mesh" scale=0 position="650,0,-650" />
    160             <Model mesh="cube.mesh" scale=0 position="-55,100,-1000" />
    161             <Model mesh="cube.mesh" scale=0 position="-700,200,-650" />
    162             <Model mesh="cube.mesh" scale=0 position="-1000,300,0" />
    163           </waypoints>
    164         </WaypointController>
    165       </controller>
    166     </SpaceShip>
    167    
    168     <SpaceShip position="1000,-75,0" lookat="0,0,0">
    169       <templates>
    170         <Template link=spaceshipHtwo />
    171       </templates>
    172       <controller>
    173         <WaypointController team=10>
    174           <waypoints>
    175             <Model mesh="cube.mesh" scale=0 position="400,240,400" />
    176             <Model mesh="cube.mesh" scale=0 position="-55,240,700" />
    177             <Model mesh="cube.mesh" scale=0 position="-500,240,400" />
    178             <Model mesh="cube.mesh" scale=0 position="-700,240,0" />
    179             <Model mesh="cube.mesh" scale=0 position="-500,240,-400" />
    180             <Model mesh="cube.mesh" scale=0 position="-55,240,-700" />
    181             <Model mesh="cube.mesh" scale=0 position="400,240,-400" />
    182             <Model mesh="cube.mesh" scale=0 position="700,240,0" />
    183           </waypoints>
    184         </WaypointController>
    185       </controller>
    186     </SpaceShip>
     127
     128
     129   
    187130   
    188131   

  • code/branches/Presentation_FS19/data/levels/towerDefense.oxw

    r11052 r12411  
    106106        </links>
    107107        <Weapon>         
    108           <LightningGun mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=4 />
     108          <BallGun mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=0 shielddamage=4 />
    109109        </Weapon>
    110110      </WeaponPack>
    111111    </weaponpacks>
    112112    <munition>
    113       <LightningMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
    114     </munition>
     113      <BallMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
     114    </munition>x
    115115    <attached>
    116116      <Backlight position="0,0,0" scale=2.0 colour="0.4, 0.0, 1.0" width=10 length=10 lifetime=0.3 elements=20 trailmaterial="Trail/backlighttrail" material="Examples/Flare" loop=1 />

  • code/branches/Presentation_FS19/data/tcl/orxokart_highscores.txt

    r12194 r12411  
    1919Name: 0:25:40s
    2020Name: 1:27:11s
     21Name: 0:29:74s
     22Name: 0:24:15s

  • code/branches/Presentation_FS19/src/modules/CMakeLists.txt

    r12407 r12411  
    5555ADD_SUBDIRECTORY(MouseAPI)
    5656ADD_SUBDIRECTORY(MouseAPIExample)
     57ADD_SUBDIRECTORY(OrxoBlox)

  • code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc

    r11781 r12411  
    6969    void Asteroids2DShip::tick(float dt)
    7070    {
    71         SUPER(Asteroids2DShip, tick, dt);
     71        //SUPER(Asteroids2DShip, tick, dt);
    7272        Vector3 pos = this->getPosition();
    7373

  • code/branches/Presentation_FS19/src/modules/pong/Pong.cc

    r11083 r12411  
    127127    void Pong::start()
    128128    {
     129        orxout() << "Hello" << endl;
    129130        if (this->center_ != nullptr) // There needs to be a PongCenterpoint, i.e. the area the game takes place.
    130131        {

  • code/branches/Presentation_FS19/src/modules/weapons/munitions/CMakeLists.txt

    r11108 r12411  
    99  SplitMunition.cc
    1010  MineMunition.cc
     11  BallMunition.cc
    1112)

  • code/branches/Presentation_FS19/src/modules/weapons/projectiles/BasicProjectile.cc

    r11108 r12411  
    172172    void BasicProjectile::destroyCheck(void)
    173173    {
    174         if(GameMode::isMaster() && this->bDestroy_)
     174        if(GameMode::isMaster() && this->bDestroy_) {
    175175            this->destroy();
     176        }
    176177    }
    177178
    … …  
    182183    void BasicProjectile::destroyObject(void)
    183184    {
    184         if(GameMode::isMaster())
     185        if(GameMode::isMaster()) {
    185186            this->destroy();
     187        }
    186188    }
    187189}

  • code/branches/Presentation_FS19/src/modules/weapons/projectiles/BasicProjectile.h

    r11108 r12411  
    117117
    118118        protected:
    119             bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
     119            virtual bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
    120120            void destroyCheck(void);
    121121            inline void setDestroyAfterCollision(bool destroyAfterCollision)
Note: See TracChangeset for help on using the changeset viewer.