Changeset 2907 for code/branches/questsystem5/src/orxonox/objects/quest
- Timestamp:
- Apr 8, 2009, 12:36:08 AM (16 years ago)
- Location:
- code/branches/questsystem5
- Files:
-
- 31 edited
-
. (modified) (1 prop)
-
src/orxonox/objects/quest/AddQuest.cc (modified) (1 diff, 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/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/questsystem5
- Property svn:mergeinfo changed
-
code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
r2785 r2907 42 42 #include "orxonox/objects/infos/PlayerInfo.h" 43 43 #include "QuestManager.h" 44 #include "QuestDescription.h" ;44 #include "QuestDescription.h" 45 45 #include "Quest.h" 46 46 -
code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/AddReward.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/AddReward.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/Quest.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/Quest.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestItem.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
-
code/branches/questsystem5/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.
