- Timestamp:
- May 26, 2016, 4:53:34 PM (8 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/worldentities/pawns/Pawn.h
r11176 r11208 157 157 virtual void kill(); 158 158 159 virtual void fired(unsigned int firemode) override; 159 virtual void pushed(unsigned int firemode) override; 160 virtual void released(unsigned int firemode) override; 160 161 virtual void postSpawn(); 161 162
Note: See TracChangeset
for help on using the changeset viewer.