Context Navigation

← Previous Change
Next Change →

tutorial

Timestamp:

Mar 7, 2010, 10:11:31 PM (15 years ago)

Author:

rgrieder

Message:

Merged HS 2009 tutorial in new FS 2010 branch. This includes all the previous tutorials as well.

Location:

code/branches/tutorial

Files:

: 7 edited
: 4 copied

. (modified) (1 prop)
data/levels/tutorial.oxw (modified) (1 diff)
src/orxonox/controllers (modified) (1 prop)
src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
src/orxonox/controllers/DroneController.cc (copied) (copied from code/branches/tutorial/src/orxonox/controllers/DroneController.cc)
src/orxonox/controllers/DroneController.h (copied) (copied from code/branches/tutorial/src/orxonox/controllers/DroneController.h)
src/orxonox/pickup/BaseItem.h (modified) (3 diffs)
src/orxonox/worldentities (modified) (1 prop)
src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
src/orxonox/worldentities/Drone.cc (copied) (copied from code/branches/tutorial/src/orxonox/worldentities/Drone.cc)
src/orxonox/worldentities/Drone.h (copied) (copied from code/branches/tutorial/src/orxonox/worldentities/Drone.h)

Legend:

: Unmodified
: Added
: Removed

code/branches/tutorial
- Property svn:mergeinfo changed
  /code/branches/tutorial (added) merged: 5765-5766,5786-5787,5793,5833-5835,5840

code/branches/tutorial/data/levels/tutorial.oxw

r5781	r6482
14	14	>
15	15
16		<Drone name="meineDrohne" primarythrust="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

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
+{
     /**
         @brief
             Base class for all items/pickups.
+    @brief
+        Base class for all items/pickups.
             Provides common methods to be used in derived classes.
         @author
             Daniel 'Huty' Haggenmueller
+        Provides common methods to be used in derived classes.
+    @author
+        Daniel 'Huty' Haggenmueller
     */
     class _OrxonoxExport BaseItem : public BaseObject
 …
         /**
             @brief Checks how many instances of this item can be carried at a time.
             @return How many of this item can be carried.
+        @brief Checks how many instances of this item can be carried at a time.
+        @return How many of this item can be carried.
         */
         virtual int getMaxCarryAmount() const
 …
         bool removeFrom(Pawn* pawn);        //!< Removes the item from a pawn.
         /**
             @brief
                 Method invoked when the item gets picked up.
+        @brief
+            Method invoked when the item gets picked up.
                 Has to be overridden for an item to work,
                 should contain a call to addTo().
+            Has to be overridden for an item to work,
+            should contain a call to addTo().
             @param pawn Pawn who picks up the item.
             @return Returns whether the pawn was able to pick up the item.
+        @param pawn Pawn who picks up the item.
+        @return Returns whether the pawn was able to pick up the item.
         */
         virtual bool pickedUp(Pawn* pawn)

code/branches/tutorial/src/orxonox/worldentities