- Timestamp:
- Oct 10, 2018, 4:08:48 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mergeFS18
- Property svn:mergeinfo changed
/code/branches/SuperOrxoBros_FS18 (added) merged: 11820,11987-11988
- Property svn:mergeinfo changed
-
code/branches/mergeFS18/src/modules/superorxobros/SOBItem.h
r11783 r12031 49 49 virtual void setFigure(SOBFigure* newFigure); 50 50 virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override; 51 52 51 53 52 bool attachedToFigure_;
Note: See TracChangeset
for help on using the changeset viewer.