Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12412


Ignore:
Timestamp:
May 22, 2019, 3:17:23 PM (4 months ago)
Author:
wiesep
Message:

Reverted unwanted changes

Location:
code/branches/Presentation_FS19
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw

    r12411 r12412  
    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,50" lookat="0,0,0" spawnclass= Asteroids2DShip pawndesign=spaceshipasteroids2d />
     46    <SpawnPoint team=0 position="0,0,0" 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/pong.oxw

    r12411 r12412  
    1616  <PongBat>
    1717    <camerapositions>
    18       <!---- Verschidene Kameraeinstellungen festlegen ---->
    1918      <CameraPosition position="0,150,0" pitch=-90 absolute=true />
    2019      <CameraPosition position="0,50,160" drag=true mouselook=true />
     
    5150  </PongBall>
    5251</Template>
     52
    5353
    5454<Level
  • code/branches/Presentation_FS19/data/levels/tetris.oxw

    r12411 r12412  
    125125      </controller>
    126126    </SpaceShip>
    127 
    128 
    129    
     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>
    130187   
    131188   
  • code/branches/Presentation_FS19/data/levels/towerDefense.oxw

    r12411 r12412  
    106106        </links>
    107107        <Weapon>         
    108           <BallGun mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=0 shielddamage=4 />
     108          <LightningGun mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=4 />
    109109        </Weapon>
    110110      </WeaponPack>
    111111    </weaponpacks>
    112112    <munition>
    113       <BallMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
    114     </munition>x
     113      <LightningMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
     114    </munition>
    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/src/modules/asteroids2D/Asteroids2DShip.cc

    r12411 r12412  
    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

    r12411 r12412  
    127127    void Pong::start()
    128128    {
    129         orxout() << "Hello" << endl;
    130129        if (this->center_ != nullptr) // There needs to be a PongCenterpoint, i.e. the area the game takes place.
    131130        {
Note: See TracChangeset for help on using the changeset viewer.