- Timestamp:
- Apr 6, 2011, 12:07:29 PM (13 years ago)
- Location:
- code/branches/dockingsystem
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/dockingsystem
- Property svn:mergeinfo changed
/code/branches/lastmanstanding3 (added) merged: 7903,8155,8165,8170-8175 /code/branches/tetris (added) merged: 8104-8107 /code/trunk (added) merged: 8108,8178-8179,8193
- Property svn:mergeinfo changed
-
code/branches/dockingsystem/src/orxonox/gametypes/Gametype.h
r7801 r8194 150 150 { this->timeLimit_ = t; } 151 151 152 //inline bool getForceSpawn() 153 // { return this->bForceSpawn_; } 154 152 155 virtual void resetTimer(); 153 156 virtual void resetTimer(float t);
Note: See TracChangeset
for help on using the changeset viewer.