- Timestamp:
- May 26, 2016, 4:53:34 PM (9 years ago)
- Location:
- code/branches/presentationFS16
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS16
- Property svn:mergeinfo changed
/code/branches/sagerjFS16 (added) merged: 11138,11142,11153,11164,11166,11170,11174-11175,11185,11189,11205
- Property svn:mergeinfo changed
-
code/branches/presentationFS16/src/orxonox/controllers/HumanController.h
r11071 r11208 61 61 virtual void pitch(const Vector2& value); 62 62 63 static void fire(unsigned int firemode); 64 virtual void doFire(unsigned int firemode); 63 static void push(unsigned int firemode); 64 virtual void doPush(unsigned int firemode); 65 static void release(unsigned int firemode); 66 virtual void doRelease(unsigned int firemode); 65 67 static void reload(); 66 68
Note: See TracChangeset
for help on using the changeset viewer.