Changeset 7655 for code/trunk/src/orxonox/worldentities
- Timestamp:
- Nov 18, 2010, 9:54:39 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/lastmanstanding (added) merged: 7479-7481,7485,7542-7543,7554-7556,7561,7573,7579,7581,7583-7586,7596,7600,7602-7605,7617,7635-7637,7640-7644
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/worldentities/pawns/Pawn.h
r7547 r7655 155 155 float shieldAbsorption_; // Has to be between 0 and 1 156 156 157 Pawn*lastHitOriginator_;157 WeakPtr<Pawn> lastHitOriginator_; 158 158 159 159 WeaponSystem* weaponSystem_;
Note: See TracChangeset
for help on using the changeset viewer.
