Changeset 5765 for code/branches/tutorial/src/orxonox
- Timestamp:
- Sep 23, 2009, 4:54:09 PM (15 years ago)
- Location:
- code/branches/tutorial/src/orxonox
- Files:
-
- 4 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/tutorial/src/orxonox/controllers
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/libraries2/src/orxonox/controllers merged eligible /code/branches/buildsystem/src/orxonox/controllers 1874-2276,2278-2400 /code/branches/buildsystem2/src/orxonox/controllers 2506-2658 /code/branches/buildsystem3/src/orxonox/controllers 2662-2708 /code/branches/ceguilua/src/orxonox/controllers 1802-1808 /code/branches/core3/src/orxonox/controllers 1572-1739 /code/branches/core4/src/orxonox/controllers 3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310 /code/branches/gametypes/src/orxonox/controllers 2826-3031 /code/branches/gcc43/src/orxonox/controllers 1580 /code/branches/gui/src/orxonox/controllers 1635-1723,2795-2894 /code/branches/input/src/orxonox/controllers 1629-1636 /code/branches/libraries/src/orxonox/controllers 5612-5692 /code/branches/lodfinal/src/orxonox/controllers 2372-2411 /code/branches/map/src/orxonox/controllers 2801-3086,3089 /code/branches/miniprojects/src/orxonox/controllers 2754-2824 /code/branches/netp2/src/orxonox/controllers 2835-2988 /code/branches/netp3/src/orxonox/controllers 2988-3082 /code/branches/netp6/src/orxonox/controllers 3214-3302 /code/branches/network/src/orxonox/controllers 2356 /code/branches/network64/src/orxonox/controllers 2210-2355 /code/branches/objecthierarchy/src/orxonox/controllers 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/orxonox/controllers 2171-2479 /code/branches/overlay/src/orxonox/controllers 2117-2385 /code/branches/particles/src/orxonox/controllers 2829-3085 /code/branches/pch/src/orxonox/controllers 3113-3194 /code/branches/physics/src/orxonox/controllers 1912-2055,2107-2439 /code/branches/physics_merge/src/orxonox/controllers 2436-2457 /code/branches/pickups/src/orxonox/controllers 1926-2086,2127,2827-2915 /code/branches/pickups2/src/orxonox/controllers 2107-2497,2915-3071 /code/branches/presentation/src/orxonox/controllers 2369-2652,2654-2660 /code/branches/questsystem/src/orxonox/controllers 1894-2088 /code/branches/questsystem2/src/orxonox/controllers 2107-2259 /code/branches/questsystem5/src/orxonox/controllers 2776-2905 /code/branches/resource/src/orxonox/controllers 3327-3366 /code/branches/resource2/src/orxonox/controllers 3372-5694 /code/branches/script_trigger/src/orxonox/controllers 1295-1953,1955 /code/branches/sound/src/orxonox/controllers 2829-3010 /code/branches/tutorial/src/orxonox/objects/controllers 2761-2765 /code/branches/weapon/src/orxonox/controllers 1925-2094 /code/branches/weapon2/src/orxonox/controllers 2107-2488 /code/branches/weapons/src/orxonox/controllers 2897-3051 /code/branches/weaponsystem/src/orxonox/controllers 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/tutorial/src/orxonox/controllers/CMakeLists.txt
r5738 r5765 4 4 ArtificialController.cc 5 5 AIController.cc 6 DroneController.cc 6 7 ScriptController.cc 7 8 WaypointController.cc -
code/branches/tutorial/src/orxonox/controllers/DroneController.cc
r2765 r5765 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h"30 29 #include "DroneController.h" 31 #include " objects/worldentities/Drone.h"30 #include "worldentities/Drone.h" 32 31 #include "util/Math.h" 33 32 … … 59 58 totaltime += dt; 60 59 Drone *myDrone = static_cast<Drone*>(this->getControllableEntity()); 61 if(totaltime<1 )60 if(totaltime<100) 62 61 { 63 62 myDrone->moveFrontBack( -sqrt(dt) ); -
code/branches/tutorial/src/orxonox/controllers/DroneController.h
r2765 r5765 33 33 34 34 #include "Controller.h" 35 #include " objects/Tickable.h"35 #include "tools/interfaces/Tickable.h" 36 36 37 37 namespace orxonox -
code/branches/tutorial/src/orxonox/worldentities
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/libraries2/src/orxonox/worldentities merged eligible /code/branches/buildsystem/src/orxonox/worldentities 1874-2276,2278-2400 /code/branches/buildsystem2/src/orxonox/worldentities 2506-2658 /code/branches/buildsystem3/src/orxonox/worldentities 2662-2708 /code/branches/ceguilua/src/orxonox/worldentities 1802-1808 /code/branches/core3/src/orxonox/worldentities 1572-1739 /code/branches/core4/src/orxonox/worldentities 3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310 /code/branches/gametypes/src/orxonox/worldentities 2826-3031 /code/branches/gcc43/src/orxonox/worldentities 1580 /code/branches/gui/src/orxonox/worldentities 1635-1723,2795-2894 /code/branches/input/src/orxonox/worldentities 1629-1636 /code/branches/libraries/src/orxonox/worldentities 5612-5692 /code/branches/lodfinal/src/orxonox/worldentities 2372-2411 /code/branches/map/src/orxonox/worldentities 2801-3086,3089 /code/branches/miniprojects/src/orxonox/worldentities 2754-2824 /code/branches/netp2/src/orxonox/worldentities 2835-2988 /code/branches/netp3/src/orxonox/worldentities 2988-3082 /code/branches/netp6/src/orxonox/worldentities 3214-3302 /code/branches/network/src/orxonox/worldentities 2356 /code/branches/network64/src/orxonox/worldentities 2210-2355 /code/branches/objecthierarchy/src/orxonox/worldentities 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/orxonox/worldentities 2171-2479 /code/branches/overlay/src/orxonox/worldentities 2117-2385 /code/branches/particles/src/orxonox/worldentities 2829-3085 /code/branches/pch/src/orxonox/worldentities 3113-3194 /code/branches/physics/src/orxonox/worldentities 1912-2055,2107-2439 /code/branches/physics_merge/src/orxonox/worldentities 2436-2457 /code/branches/pickups/src/orxonox/worldentities 1926-2086,2127,2827-2915 /code/branches/pickups2/src/orxonox/worldentities 2107-2497,2915-3071 /code/branches/presentation/src/orxonox/worldentities 2369-2652,2654-2660 /code/branches/questsystem/src/orxonox/worldentities 1894-2088 /code/branches/questsystem2/src/orxonox/worldentities 2107-2259 /code/branches/questsystem5/src/orxonox/worldentities 2776-2905 /code/branches/resource/src/orxonox/worldentities 3327-3366 /code/branches/resource2/src/orxonox/worldentities 3372-5694 /code/branches/script_trigger/src/orxonox/worldentities 1295-1953,1955 /code/branches/sound/src/orxonox/worldentities 2829-3010 /code/branches/tutorial/src/orxonox/objects/worldentities 2761-2765 /code/branches/weapon/src/orxonox/worldentities 1925-2094 /code/branches/weapon2/src/orxonox/worldentities 2107-2488 /code/branches/weapons/src/orxonox/worldentities 2897-3051 /code/branches/weaponsystem/src/orxonox/worldentities 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/tutorial/src/orxonox/worldentities/CMakeLists.txt
r5738 r5765 7 7 8 8 BigExplosion.cc 9 Drone.cc 9 10 ExplosionChunk.cc 10 11 CameraPosition.cc -
code/branches/tutorial/src/orxonox/worldentities/Drone.cc
r2765 r5765 27 27 */ 28 28 29 #include "OrxonoxStableHeaders.h"30 29 #include "Drone.h" 31 30 … … 53 52 this->rotationThrust_ = 10; 54 53 this->steering_ = Vector3::ZERO; 54 55 std::cout << "sdfasdfasdf===================="; 55 56 56 57 this->setCollisionType(WorldEntity::Dynamic); -
code/branches/tutorial/src/orxonox/worldentities/Drone.h
r2765 r5765 31 31 32 32 #include "OrxonoxPrereqs.h" 33 #include " objects/worldentities/ControllableEntity.h"34 #include " objects/controllers/DroneController.h"33 #include "worldentities/ControllableEntity.h" 34 #include "controllers/DroneController.h" 35 35 36 36 namespace orxonox
Note: See TracChangeset
for help on using the changeset viewer.