Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 7, 2010, 10:11:31 PM (14 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:
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • code/branches/tutorial

  • 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
      /code/branches/buildsystem/src/orxonox/worldentities1874-2276,​2278-2400
      /code/branches/buildsystem2/src/orxonox/worldentities2506-2658
      /code/branches/buildsystem3/src/orxonox/worldentities2662-2708
      /code/branches/ceguilua/src/orxonox/worldentities1802-1808
      /code/branches/console/src/orxonox/worldentities5941-6104
      /code/branches/core3/src/orxonox/worldentities1572-1739
      /code/branches/core4/src/orxonox/worldentities3221-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/worldentities5768-5928,​6009
      /code/branches/gametypes/src/orxonox/worldentities2826-3031
      /code/branches/gcc43/src/orxonox/worldentities1580
      /code/branches/gui/src/orxonox/worldentities1635-1723,​2795-2894
      /code/branches/ingamemenu/src/orxonox/worldentities6000-6023
      /code/branches/input/src/orxonox/worldentities1629-1636
      /code/branches/libraries/src/orxonox/worldentities5612-5692
      /code/branches/libraries2/src/orxonox/worldentities5703-5737
      /code/branches/lodfinal/src/orxonox/worldentities2372-2411
      /code/branches/map/src/orxonox/worldentities2801-3086,​3089
      /code/branches/menu/src/orxonox/worldentities5941-6146,​6148
      /code/branches/miniprojects/src/orxonox/worldentities2754-2824
      /code/branches/netp2/src/orxonox/worldentities2835-2988
      /code/branches/netp3/src/orxonox/worldentities2988-3082
      /code/branches/netp6/src/orxonox/worldentities3214-3302
      /code/branches/network/src/orxonox/worldentities2356
      /code/branches/network64/src/orxonox/worldentities2210-2355
      /code/branches/objecthierarchy/src/orxonox/worldentities1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/orxonox/worldentities2171-2479
      /code/branches/overlay/src/orxonox/worldentities2117-2385
      /code/branches/particles/src/orxonox/worldentities2829-3085
      /code/branches/particles2/src/orxonox/worldentities6050-6106,​6109
      /code/branches/pch/src/orxonox/worldentities3113-3194
      /code/branches/physics/src/orxonox/worldentities1912-2055,​2107-2439
      /code/branches/physics_merge/src/orxonox/worldentities2436-2457
      /code/branches/pickups/src/orxonox/worldentities1926-2086,​2127,​2827-2915
      /code/branches/pickups2/src/orxonox/worldentities2107-2497,​2915-3071
      /code/branches/presentation/src/orxonox/worldentities2369-2652,​2654-2660
      /code/branches/questsystem/src/orxonox/worldentities1894-2088
      /code/branches/questsystem2/src/orxonox/worldentities2107-2259
      /code/branches/questsystem5/src/orxonox/worldentities2776-2905
      /code/branches/resource/src/orxonox/worldentities3327-3366
      /code/branches/resource2/src/orxonox/worldentities3372-5694
      /code/branches/script_trigger/src/orxonox/worldentities1295-1953,​1955
      /code/branches/sound/src/orxonox/worldentities2829-3010
      /code/branches/sound3/src/orxonox/worldentities5941-6102
      /code/branches/steering/src/orxonox/worldentities5949-6091
      /code/branches/tutorial/src/orxonox/objects/worldentities2761-2765
      /code/branches/weapon/src/orxonox/worldentities1925-2094
      /code/branches/weapon2/src/orxonox/worldentities2107-2488
      /code/branches/weapons/src/orxonox/worldentities2897-3051
      /code/branches/weaponsystem/src/orxonox/worldentities2742-2890

  • 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.