Changeset 10016 in orxonox.OLD for branches

Timestamp:

Dec 5, 2006, 10:29:13 AM (18 years ago)

Author:

nicolasc

Message:

space_ship cleanup, ChangeLog update

Location:

branches/playability

Files:

• ChangeLog (modified) (3 diffs)
• src/world_entities/space_ships/space_ship.cc (modified) (1 diff)

branches/playability/ChangeLog

@@ +1 @@
+2006-12-03  Nicolas Schlumberger <nicolasc@ee.ethz.ch>
+  Added Rotation to hbolt
+  Did some experimenting with test_entity2 (rotation, texturing)
+  Added textured versions of bolt, and hbolt
+
 2006-12-03  Marc Schärer <marcscha@ee.ethz.ch>
   Added functionality to show / hide a crosshair to the weapon manager. No default crosshair anymore
@@ -5 +10 @@
   Addition of SwarmMissile and SwarmProjectile
 
-
 2006-11-29  Nicolas Schlumbgerger <nicolasc@ee.ethz.ch>
   Added bolt projectile for light blaster, copied of laser
@@ -17 +21 @@
         Implementation of weapon energy regeneration. This needed some little modifications to the HUD class as well but now works :)
         Addition of the second weapon manager to the HUD manager in util/hud .h .cc for our master of HUD ;-)
-
 
 2006-09-22      Benjamin Grauer <bensch@orxonox.net>

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -158 +158 @@
 
 
-  this->weaponMan.addWeapon( wpLeft1, 1, 0);
-  this->weaponMan.addWeapon( wpRight1, 1, 1);
-  this->weaponMan.addWeapon( wpLeft2, 1, 2);
-  this->weaponMan.addWeapon( wpRight2, 1, 3);
+  this->weaponMan.addWeapon( wpLeft1, 0, 0);
+  this->weaponMan.addWeapon( wpRight1, 0, 1);
+  this->weaponMan.addWeapon( wpLeft2, 0, 2);
+  this->weaponMan.addWeapon( wpRight2, 0, 3);
   this->weaponMan.addWeapon( wpLeft3, 0, 4);
   this->weaponMan.addWeapon( wpRight3, 0, 5);