Changeset 6482
- Timestamp:
- Mar 7, 2010, 10:11:31 PM (15 years ago)
- Location:
- code/branches/tutorial
- Files:
-
- 7 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/tutorial
- Property svn:mergeinfo changed
/code/branches/tutorial (added) merged: 5765-5766,5786-5787,5793,5833-5835,5840
- Property svn:mergeinfo changed
-
code/branches/tutorial/data/levels/tutorial.oxw
r5781 r6482 14 14 > 15 15 16 <Drone name="meineDrohne" p rimarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">16 <Drone name="meineDrohne" position="0,0,-10" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7"> 17 17 <attached> 18 18 <Model scale="10" mesh="drone.mesh"/> -
code/branches/tutorial/src/orxonox/controllers
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/presentation2/src/orxonox/controllers merged eligible /code/branches/tutorial/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/console/src/orxonox/controllers 5941-6104 /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/core5/src/orxonox/controllers 5768-5928,6009 /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/ingamemenu/src/orxonox/controllers 6000-6023 /code/branches/input/src/orxonox/controllers 1629-1636 /code/branches/libraries/src/orxonox/controllers 5612-5692 /code/branches/libraries2/src/orxonox/controllers 5703-5737 /code/branches/lodfinal/src/orxonox/controllers 2372-2411 /code/branches/map/src/orxonox/controllers 2801-3086,3089 /code/branches/menu/src/orxonox/controllers 5941-6146,6148 /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/particles2/src/orxonox/controllers 6050-6106,6109 /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/sound3/src/orxonox/controllers 5941-6102 /code/branches/steering/src/orxonox/controllers 5949-6091 /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
r6417 r6482 5 5 ArtificialController.cc 6 6 AIController.cc 7 DroneController.cc 7 8 ScriptController.cc 8 9 WaypointController.cc -
code/branches/tutorial/src/orxonox/pickup/BaseItem.h
r5781 r6482 44 44 { 45 45 /** 46 47 46 @brief 47 Base class for all items/pickups. 48 48 49 50 51 49 Provides common methods to be used in derived classes. 50 @author 51 Daniel 'Huty' Haggenmueller 52 52 */ 53 53 class _OrxonoxExport BaseItem : public BaseObject … … 61 61 62 62 /** 63 64 63 @brief Checks how many instances of this item can be carried at a time. 64 @return How many of this item can be carried. 65 65 */ 66 66 virtual int getMaxCarryAmount() const … … 70 70 bool removeFrom(Pawn* pawn); //!< Removes the item from a pawn. 71 71 /** 72 73 72 @brief 73 Method invoked when the item gets picked up. 74 74 75 76 75 Has to be overridden for an item to work, 76 should contain a call to addTo(). 77 77 78 79 78 @param pawn Pawn who picks up the item. 79 @return Returns whether the pawn was able to pick up the item. 80 80 */ 81 81 virtual bool pickedUp(Pawn* pawn) -
code/branches/tutorial/src/orxonox/worldentities
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/presentation2/src/orxonox/worldentities merged eligible /code/branches/tutorial/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/console/src/orxonox/worldentities 5941-6104 /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/core5/src/orxonox/worldentities 5768-5928,6009 /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/ingamemenu/src/orxonox/worldentities 6000-6023 /code/branches/input/src/orxonox/worldentities 1629-1636 /code/branches/libraries/src/orxonox/worldentities 5612-5692 /code/branches/libraries2/src/orxonox/worldentities 5703-5737 /code/branches/lodfinal/src/orxonox/worldentities 2372-2411 /code/branches/map/src/orxonox/worldentities 2801-3086,3089 /code/branches/menu/src/orxonox/worldentities 5941-6146,6148 /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/particles2/src/orxonox/worldentities 6050-6106,6109 /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/sound3/src/orxonox/worldentities 5941-6102 /code/branches/steering/src/orxonox/worldentities 5949-6091 /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
r6417 r6482 7 7 8 8 BigExplosion.cc 9 Drone.cc 9 10 EffectContainer.cc 10 11 ExplosionChunk.cc
Note: See TracChangeset
for help on using the changeset viewer.