Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10016 in orxonox.OLD for branches


Ignore:
Timestamp:
Dec 5, 2006, 10:29:13 AM (18 years ago)
Author:
nicolasc
Message:

space_ship cleanup, ChangeLog update

Location:
branches/playability
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/playability/ChangeLog

    r10004 r10016  
     12006-12-03  Nicolas Schlumberger <nicolasc@ee.ethz.ch>
     2  Added Rotation to hbolt
     3  Did some experimenting with test_entity2 (rotation, texturing)
     4  Added textured versions of bolt, and hbolt
     5
    162006-12-03  Marc Schärer <marcscha@ee.ethz.ch>
    27  Added functionality to show / hide a crosshair to the weapon manager. No default crosshair anymore
     
    510  Addition of SwarmMissile and SwarmProjectile
    611
    7 
    8122006-11-29  Nicolas Schlumbgerger <nicolasc@ee.ethz.ch>
    913  Added bolt projectile for light blaster, copied of laser
     
    1721        Implementation of weapon energy regeneration. This needed some little modifications to the HUD class as well but now works :)
    1822        Addition of the second weapon manager to the HUD manager in util/hud .h .cc for our master of HUD ;-)
    19 
    2023
    21242006-09-22      Benjamin Grauer <bensch@orxonox.net>
  • branches/playability/src/world_entities/space_ships/space_ship.cc

    r10004 r10016  
    158158
    159159
    160   this->weaponMan.addWeapon( wpLeft1, 1, 0);
    161   this->weaponMan.addWeapon( wpRight1, 1, 1);
    162   this->weaponMan.addWeapon( wpLeft2, 1, 2);
    163   this->weaponMan.addWeapon( wpRight2, 1, 3);
     160  this->weaponMan.addWeapon( wpLeft1, 0, 0);
     161  this->weaponMan.addWeapon( wpRight1, 0, 1);
     162  this->weaponMan.addWeapon( wpLeft2, 0, 2);
     163  this->weaponMan.addWeapon( wpRight2, 0, 3);
    164164  this->weaponMan.addWeapon( wpLeft3, 0, 4);
    165165  this->weaponMan.addWeapon( wpRight3, 0, 5);
Note: See TracChangeset for help on using the changeset viewer.