Changeset 11025 for code/branches/presentationHS15/src/modules
- Timestamp:
- Jan 3, 2016, 2:39:10 PM (9 years ago)
- Location:
- code/branches/presentationHS15/src/modules
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationHS15/src/modules/hover/CMakeLists.txt
r10960 r11025 13 13 FIND_HEADER_FILES 14 14 LINK_LIBRARIES 15 15 objects 16 16 orxonox 17 17 overlays -
code/branches/presentationHS15/src/modules/hover/FlagHUD.h
r10960 r11025 49 49 virtual ~FlagHUD(); 50 50 51 51 virtual void tick(float dt); 52 52 virtual void changedOwner(); 53 53 -
code/branches/presentationHS15/src/modules/hover/HoverShip.h
r10960 r11025 47 47 { 48 48 private: 49 50 49 float jumpBoost_; 50 bool isFloor_; 51 51 52 52 public: … … 59 59 virtual void setJumpBoost(float jumpBoost); 60 60 61 61 virtual float getJumpBoost(); 62 62 63 63 virtual void moveFrontBack(const Vector2& value); 64 64 65 65 virtual void moveRightLeft(const Vector2& value); 66 66 67 67 virtual void moveUpDown(const Vector2& value); 68 68 69 69 virtual void rotateYaw(const Vector2& value); 70 70 71 virtual void rotatePitch(const Vector2& value); 72 73 virtual void rotateRoll(const Vector2& value); 71 virtual void rotatePitch(const Vector2& value); 74 72 75 virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);73 virtual void rotateRoll(const Vector2& value); 76 74 77 virtual void boost(bool bBoost);75 virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint); 78 76 79 }; 77 virtual void boost(bool bBoost); 78 79 }; 80 80 } 81 81 -
code/branches/presentationHS15/src/modules/objects/Turret.h
r10622 r11025 103 103 104 104 inline void setRotationThrust(float rotationthrust) 105 105 { this->rotationThrust_ = rotationthrust; } 106 106 107 107 inline float getRotationThrust() 108 108 { return this->rotationThrust_; } 109 109 110 110 protected: -
code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseSelecter.cc
r10629 r11025 88 88 { 89 89 moveDownPressed_ = false; 90 90 selectedPos_->Set(selecterPosX, selecterPosY - 1); 91 91 updatePosition(); 92 92 } … … 100 100 { 101 101 moveRightPressed_ = false; 102 102 selectedPos_->Set(selecterPosX + 1, selecterPosY); 103 103 updatePosition(); 104 104 }
Note: See TracChangeset
for help on using the changeset viewer.