Changeset 11505 for code/branches

Timestamp:

Oct 23, 2017, 3:49:31 PM (7 years ago)

Author:

pascscha

Message:

UpDown3

Location:

code/branches/FlappyOrx_HS17

Files:

• data/levels/includes/FlappyOrxWeapon.oxi (added)
• data/levels/includes/FlappyOrxWeaponEnemy.oxi (added)
• data/levels/templates/enemyFlappyOrx.oxt (added)
• data/levels/templates/spaceshipFlappyOrx.oxt (added)
• data/overlays/FlappyHUD.oxo (deleted)
• data/overlays/FlappyOrxHUD.oxo (added)
• src/modules/flappyorx/FlappyOrx.cc (modified) (1 diff)
• src/modules/flappyorx/FlappyOrxShip.cc (modified) (3 diffs)

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

@@ -108 +108 @@
 
 
+
     void FlappyOrx::setCenterpoint(FlappyOrxCenterPoint* center)
     {

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

@@ -39 +39 @@
 #include "graphics/Camera.h"
 #include "weapons/projectiles/Projectile.h"
+#include <math.h> 
 
 namespace orxonox
@@ -49 +50 @@
 
         UpwardThrust = 250;
-        speed = 50;
+        speed = 1;
         gravity = 20;
     }
@@ -88 +89 @@
                 camera->setOrientation(Vector3::UNIT_Z, Degree(90));
             }
-
-
 
             setPosition(pos);