Changeset 11680 for code/branches
- Timestamp:
- Dec 16, 2017, 1:04:11 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17
- Files:
-
- 3 edited
- 3 copied
-
. (modified) (1 prop)
-
data/levels/ProtectBoss.oxw (copied) (copied from code/branches/ProtectBoss_HS17/data/levels/ProtectBoss.oxw)
-
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
- 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/src/orxonox/controllers/DroneController.cc
r11071 r11680 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/src/orxonox/worldentities/pawns/CMakeLists.txt
r10216 r11680 7 7 TeamBaseMatchBase.cc 8 8 Destroyer.cc 9 ShootableObstacle.cc 9 10 )
Note: See TracChangeset
for help on using the changeset viewer.
