Context Navigation

← Previous Change
Next Change →

quest

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

: 32 edited

. (modified) (2 props)
src/orxonox/objects/quest/AddQuest.cc (modified) (1 prop)
src/orxonox/objects/quest/AddQuest.h (modified) (1 prop)
src/orxonox/objects/quest/AddQuestHint.cc (modified) (1 prop)
src/orxonox/objects/quest/AddQuestHint.h (modified) (1 prop)
src/orxonox/objects/quest/AddReward.cc (modified) (1 prop)
src/orxonox/objects/quest/AddReward.h (modified) (1 prop)
src/orxonox/objects/quest/CMakeLists.txt (modified) (2 diffs)
src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) (1 prop)
src/orxonox/objects/quest/ChangeQuestStatus.h (modified) (1 prop)
src/orxonox/objects/quest/CompleteQuest.cc (modified) (1 prop)
src/orxonox/objects/quest/CompleteQuest.h (modified) (1 prop)
src/orxonox/objects/quest/FailQuest.cc (modified) (1 prop)
src/orxonox/objects/quest/FailQuest.h (modified) (1 prop)
src/orxonox/objects/quest/GlobalQuest.cc (modified) (1 prop)
src/orxonox/objects/quest/GlobalQuest.h (modified) (1 prop)
src/orxonox/objects/quest/LocalQuest.cc (modified) (1 prop)
src/orxonox/objects/quest/LocalQuest.h (modified) (1 prop)
src/orxonox/objects/quest/Quest.cc (modified) (1 prop)
src/orxonox/objects/quest/Quest.h (modified) (1 prop)
src/orxonox/objects/quest/QuestDescription.cc (modified) (1 prop)
src/orxonox/objects/quest/QuestDescription.h (modified) (1 prop)
src/orxonox/objects/quest/QuestEffect.cc (modified) (1 prop)
src/orxonox/objects/quest/QuestEffect.h (modified) (1 prop)
src/orxonox/objects/quest/QuestHint.cc (modified) (1 prop)
src/orxonox/objects/quest/QuestHint.h (modified) (1 prop)
src/orxonox/objects/quest/QuestItem.cc (modified) (1 prop)
src/orxonox/objects/quest/QuestItem.h (modified) (1 prop)
src/orxonox/objects/quest/QuestManager.cc (modified) (1 prop)
src/orxonox/objects/quest/QuestManager.h (modified) (1 prop)
src/orxonox/objects/quest/Rewardable.cc (modified) (1 prop)
src/orxonox/objects/quest/Rewardable.h (modified) (1 prop)

Legend:

: Unmodified
: Added
: Removed

code/branches/buildsystem3

Property svn:ignore deleted

Property svn:mergeinfo changed

/code/branches/buildsystem (added)	merged: 1875,1882-1886,1975-1982,1991,1999,2054,2061,2135,2137-2139,2197-2199,2204,2214-2220,2223-2224,2229,2233-2244,2248-2249,2252-2253,2260,2275,2278-2279,2318,2322,2325-2326,2335-2336,2338-2339,2359-2360,2384,2392,2399
/code/branches/buildsystem2 (added)	merged: 2507,2509-2512,2516-2526,2534,2546-2547,2566-2570,2572-2574,2576-2577,2579-2652,2654,2656-2658

code/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/AddReward.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/AddReward.h
- Property svn:mergeinfo changed (with no actual effect on merging)

code/branches/buildsystem3/src/orxonox/objects/quest/CMakeLists.txt

-                      r2662
+                      r2664
 SET( SRC_FILES
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   AddQuest.cc
   AddQuestHint.cc
 …
   Rewardable.cc
+)
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/Quest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/Quest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.h
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.h
- Property svn:mergeinfo changed (with no actual effect on merging)

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 2664 for code/branches/buildsystem3/src/orxonox/objects/quest

Legend:

Download in other formats: