Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12400


Ignore:
Timestamp:
May 20, 2019, 2:26:49 PM (4 months ago)
Author:
jeromela
Message:

Changed counter

Location:
code/branches/OrxoBlox_FS19
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

    r12394 r12400  
    1919?>
    2020
    21 <!--Template name=OrxoBloxbatcameras defaults=0>
    22   <OrxoBloxStones>
    23     <camerapositions>
    24       <CameraPosition position="0,150,0"  absolute=true />
    25       <CameraPosition position="0,50,160" drag=true mouselook=true />
    26       <CameraPosition position="0,40,125" drag=true mouselook=true />
    27       <CameraPosition position="0,30, 90" drag=true mouselook=true />
    28     </camerapositions>
    29   </OrxoBloxStones>
    30 </Template-->
    31 
    3221<Template name=OrxoBloxball>
    3322  <OrxoBloxBall
     
    4736  </OrxoBloxBall>
    4837</Template>
    49 
    50 
    51  
    52   <!-- <Template name=OrxoBloxstone>
    53     <OrxoBloxStones collisionType=static>
    54       <attached>
    55         <Model position="0,0,0" mesh="CuboidBody.mesh" scale3D="4.5,4.5,4.5" />
    56         <Model position="0,0,0" mesh="cube_orange.mesh" scale=4.3 />
    57       </attached>
    58       <collisionShapes>
    59         <BoxCollisionShape position="0,0,0" halfExtents="2,2,2" />
    60       </collisionShapes>
    61     </OrxoBloxStones>
    62   </Template> -->
    63 
    64   <!-- <StaticEntity position="0,-10000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 > -->
    65    
    66  
    6738 
    6839 
     
    9162    <!-- <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"/> -->
    9263    <Light type=directional position="-100, 10000, -700" direction="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
    93     <SpawnPoint team=0 position="0,-4.5,49" lookat="-10000,0,0" spawnclass= SpaceShip pawndesign=spaceshipOrxoBlox/>
     64    <SpawnPoint team=0 position="0,-4.5,49" lookat="-10000,0,0" spawnclass=SpaceShip pawndesign=spaceshipOrxoBlox/>
    9465
    9566    <!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort /--->
  • code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipEscort.oxt

    r11052 r12400  
    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/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

    r12396 r12400  
    7171            WeakPtr<OrxoBloxWall> futureWall_;
    7272            int counter;
    73             const int max_counter = 4;
     73            const int max_counter = 5;
    7474
    7575    };
  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc

    r12395 r12400  
    4343                float x_=(this->center_->getFieldDimension()).x;
    4444                float y_=(this->center_->getFieldDimension()).y;
    45                 stone->setPosition(size_*i -x_/2 +4.5f, -3.5f, -y_/2 + 6.5f);
     45                stone->setPosition(size_*i -x_/2 +4.5f, -3.5f, -y_/2 - 2.25f);
    4646
    4747
  • code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc

    r12396 r12400  
    2828        this->setCollisionShapeRadius(2.5);
    2929        this->setDamage(1000);
    30 
     30        orxoblox_->count();
    3131        //setEffect("Orxonox/sparks2");
    3232    }
     
    146146                position.z = this-> fieldHeight_;
    147147               
    148                 orxoblox_->count();
    149148                suicidal = true;
    150149               
Note: See TracChangeset for help on using the changeset viewer.