Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
6 edited
4 copied

Legend:

Unmodified
Added
Removed

  • code/branches/tutorial

  • code/branches/tutorial/src/orxonox/controllers

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/presentation2/src/orxonox/controllersmergedeligible
      /code/branches/tutorial/src/orxonox/controllersmergedeligible

  • TabularUnified code/branches/tutorial/src/orxonox/controllers/CMakeLists.txt

    r6417 r6482  
    55  ArtificialController.cc
    66  AIController.cc
     7  DroneController.cc
    78  ScriptController.cc
    89  WaypointController.cc

  • TabularUnified code/branches/tutorial/src/orxonox/pickup/BaseItem.h

    r5781 r6482  
    4444{
    4545    /**
    46         @brief
    47             Base class for all items/pickups.
     46    @brief
     47        Base class for all items/pickups.
    4848
    49             Provides common methods to be used in derived classes.
    50         @author
    51             Daniel 'Huty' Haggenmueller
     49        Provides common methods to be used in derived classes.
     50    @author
     51        Daniel 'Huty' Haggenmueller
    5252    */
    5353    class _OrxonoxExport BaseItem : public BaseObject
    … …  
    6161
    6262        /**
    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.
     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.
    6565        */
    6666        virtual int getMaxCarryAmount() const
    … …  
    7070        bool removeFrom(Pawn* pawn);        //!< Removes the item from a pawn.
    7171        /**
    72             @brief
    73                 Method invoked when the item gets picked up.
     72        @brief
     73            Method invoked when the item gets picked up.
    7474
    75                 Has to be overridden for an item to work,
    76                 should contain a call to addTo().
     75            Has to be overridden for an item to work,
     76            should contain a call to addTo().
    7777
    78             @param pawn Pawn who picks up the item.
    79             @return Returns whether the pawn was able to pick up the item.
     78        @param pawn Pawn who picks up the item.
     79        @return Returns whether the pawn was able to pick up the item.
    8080        */
    8181        virtual bool pickedUp(Pawn* pawn)

  • code/branches/tutorial/src/orxonox/worldentities

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/presentation2/src/orxonox/worldentitiesmergedeligible
      /code/branches/tutorial/src/orxonox/worldentitiesmergedeligible

  • TabularUnified code/branches/tutorial/src/orxonox/worldentities/CMakeLists.txt

    r6417 r6482  
    77
    88  BigExplosion.cc
     9  Drone.cc
    910  EffectContainer.cc
    1011  ExplosionChunk.cc
Note: See TracChangeset for help on using the changeset viewer.