Changeset 11764 for code/branches/Presentation_HS17_merge/src
- Timestamp:
- Feb 18, 2018, 1:17:48 AM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 3 edited
- 2 copied
-
. (modified) (1 prop)
-
src/orxonox/controllers/DroneController.cc (modified) (2 diffs)
-
src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied) (copied from code/branches/ProtectBoss_HS17/src/orxonox/worldentities/pawns/ShootableObstacle.cc)
-
src/orxonox/worldentities/pawns/ShootableObstacle.h (copied) (copied from code/branches/ProtectBoss_HS17/src/orxonox/worldentities/pawns/ShootableObstacle.h)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge
- Property svn:mergeinfo changed
/code/branches/ProtectBoss_HS17 (added) merged: 11457,11489,11494,11500,11522,11542,11557,11585,11604,11639,11672
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17_merge/src/orxonox/controllers/DroneController.cc
r11071 r11764 49 49 RegisterObject(DroneController); 50 50 51 this->setTeam(0); 51 52 this->owner_ = nullptr; 52 53 this->drone_ = nullptr; … … 164 165 } 165 166 } 167 166 168 SUPER(AIController, tick, dt); 167 169 } -
code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt
r11743 r11764 8 8 Destroyer.cc 9 9 StoryModePawn.cc 10 ShootableObstacle.cc 10 11 )
Note: See TracChangeset
for help on using the changeset viewer.
