Changeset 5693 for code/trunk/src/orxonox/objects/controllers
- Timestamp:
- Aug 29, 2009, 10:19:38 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 5 edited
-
. (modified) (1 prop)
-
src/orxonox/objects/controllers/AIController.h (modified) (1 diff)
-
src/orxonox/objects/controllers/HumanController.cc (modified) (1 diff)
-
src/orxonox/objects/controllers/PongAI.h (modified) (1 diff)
-
src/orxonox/objects/controllers/WaypointController.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/libraries (added) merged: 5612-5613,5615-5619,5621-5623,5625-5640,5642-5643,5647-5649,5665-5666,5685-5687,5692
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/controllers/AIController.h
r3196 r5693 33 33 34 34 #include "tools/Timer.h" 35 #include " interfaces/Tickable.h"35 #include "tools/interfaces/Tickable.h" 36 36 #include "ArtificialController.h" 37 37 -
code/trunk/src/orxonox/objects/controllers/HumanController.cc
r3325 r5693 35 35 #include "objects/gametypes/Gametype.h" 36 36 #include "objects/infos/PlayerInfo.h" 37 #include " overlays/map/Map.h"37 #include "Map.h" 38 38 39 39 namespace orxonox -
code/trunk/src/orxonox/objects/controllers/PongAI.h
r3196 r5693 34 34 #include <list> 35 35 #include "util/Math.h" 36 #include " interfaces/Tickable.h"36 #include "tools/interfaces/Tickable.h" 37 37 #include "Controller.h" 38 38 -
code/trunk/src/orxonox/objects/controllers/WaypointController.h
r3196 r5693 33 33 34 34 #include <vector> 35 #include " interfaces/Tickable.h"35 #include "tools/interfaces/Tickable.h" 36 36 #include "ArtificialController.h" 37 37
Note: See TracChangeset
for help on using the changeset viewer.
