- Timestamp:
- Feb 14, 2018, 11:31:43 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 3 edited
- 4 copied
-
. (modified) (1 prop)
-
src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/worldentities/NameableStaticEntity.cc (copied) (copied from code/branches/CampaignMap_HS17/src/orxonox/worldentities/NameableStaticEntity.cc)
-
src/orxonox/worldentities/NameableStaticEntity.h (copied) (copied from code/branches/CampaignMap_HS17/src/orxonox/worldentities/NameableStaticEntity.h)
-
src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) (copied from code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.cc)
-
src/orxonox/worldentities/pawns/StoryModePawn.h (copied) (copied from code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.h)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge
- Property svn:mergeinfo changed
/code/branches/CampaignMap_HS17 (added) merged: 11458,11507,11512-11513,11525-11527,11544-11545,11560,11564,11584,11588,11605,11634,11636,11663,11675-11676
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17_merge/src/orxonox/worldentities/CMakeLists.txt
r11052 r11743 13 13 ExplosionPart.cc 14 14 Actionpoint.cc 15 NameableStaticEntity.cc 15 16 ) 16 17 -
code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/CMakeLists.txt
r10216 r11743 7 7 TeamBaseMatchBase.cc 8 8 Destroyer.cc 9 StoryModePawn.cc 9 10 )
Note: See TracChangeset
for help on using the changeset viewer.
