Changeset 11350
- Timestamp:
- Dec 19, 2016, 8:28:58 AM (7 years ago)
- Location:
- code/branches/Presentation_HS16
- Files:
-
- 3 edited
- 7 copied
-
. (modified) (1 prop)
-
data/levels/Waypointstest.oxw (copied) (copied from code/branches/QuestGuide_HS16/data/levels/Waypointstest.oxw)
-
data/levels/templates/spaceshipWaypoint.oxt (copied) (copied from code/branches/QuestGuide_HS16/data/levels/templates/spaceshipWaypoint.oxt)
-
src/modules/CMakeLists.txt (modified) (1 diff)
-
src/modules/waypoints (copied) (copied from code/branches/QuestGuide_HS16/src/modules/waypoints)
-
src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/worldentities/Waypoint.cc (copied) (copied from code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypoint.cc)
-
src/orxonox/worldentities/Waypoint.h (copied) (copied from code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypoint.h)
-
src/orxonox/worldentities/Waypointarrow.cc (copied) (copied from code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypointarrow.cc)
-
src/orxonox/worldentities/Waypointarrow.h (copied) (copied from code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypointarrow.h)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS16
- Property svn:mergeinfo changed
/code/branches/QuestGuide_HS16 (added) merged: 11215,11230,11237,11243-11244,11258,11271,11273-11274,11287-11288,11298,11307,11309,11318,11321,11332,11349
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS16/src/modules/CMakeLists.txt
r11052 r11350 44 44 ADD_SUBDIRECTORY(dodgerace) 45 45 ADD_SUBDIRECTORY(hover) 46 ADD_SUBDIRECTORY(waypoints) -
code/branches/Presentation_HS16/src/orxonox/worldentities/CMakeLists.txt
r11052 r11350 13 13 ExplosionPart.cc 14 14 Actionpoint.cc 15 15 16 ) 16 17
Note: See TracChangeset
for help on using the changeset viewer.
