Changeset 2090

Timestamp:

Nov 1, 2008, 8:16:51 PM (16 years ago)

Author:

landauf

Message:

merged questsystem back to trunk
(there are some changes to be done)

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)
• src/orxonox/objects/AddQuest.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/AddQuest.cc) (1 prop)
• src/orxonox/objects/AddQuest.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/AddQuest.h) (1 prop)
• src/orxonox/objects/AddQuestHint.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/AddQuestHint.cc) (1 prop)
• src/orxonox/objects/AddQuestHint.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/AddQuestHint.h) (1 prop)
• src/orxonox/objects/AddReward.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/AddReward.cc) (1 prop)
• src/orxonox/objects/AddReward.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/AddReward.h) (1 prop)
• src/orxonox/objects/ChangeQuestStatus.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/ChangeQuestStatus.cc) (1 prop)
• src/orxonox/objects/ChangeQuestStatus.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/ChangeQuestStatus.h) (1 prop)
• src/orxonox/objects/CompleteQuest.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/CompleteQuest.cc) (1 prop)
• src/orxonox/objects/CompleteQuest.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/CompleteQuest.h) (1 prop)
• src/orxonox/objects/FailQuest.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/FailQuest.cc) (1 prop)
• src/orxonox/objects/FailQuest.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/FailQuest.h) (1 prop)
• src/orxonox/objects/GlobalQuest.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/GlobalQuest.cc) (1 prop)
• src/orxonox/objects/GlobalQuest.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/GlobalQuest.h) (1 prop)
• src/orxonox/objects/LocalQuest.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/LocalQuest.cc) (1 prop)
• src/orxonox/objects/LocalQuest.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/LocalQuest.h) (1 prop)
• src/orxonox/objects/Quest.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/Quest.cc) (1 prop)
• src/orxonox/objects/Quest.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/Quest.h) (1 prop)
• src/orxonox/objects/QuestDescription.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestDescription.cc) (1 prop)
• src/orxonox/objects/QuestDescription.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestDescription.h) (1 prop)
• src/orxonox/objects/QuestEffect.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestEffect.cc) (1 prop)
• src/orxonox/objects/QuestEffect.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestEffect.h) (1 prop)
• src/orxonox/objects/QuestHint.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestHint.cc) (1 prop)
• src/orxonox/objects/QuestHint.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestHint.h) (1 prop)
• src/orxonox/objects/QuestItem.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestItem.cc) (1 prop)
• src/orxonox/objects/QuestItem.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestItem.h) (1 prop)
• src/orxonox/objects/QuestManager.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestManager.cc) (1 prop)
• src/orxonox/objects/QuestManager.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/QuestManager.h) (1 prop)
• src/orxonox/objects/Rewardable.cc (copied) (copied from code/branches/questsystem/src/orxonox/objects/Rewardable.cc) (1 prop)
• src/orxonox/objects/Rewardable.h (copied) (copied from code/branches/questsystem/src/orxonox/objects/Rewardable.h) (1 prop)
• src/tolua/tolua-5.1.pkg (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• visual_studio/vc8/audio.vsprops (modified) (1 prop)
• visual_studio/vc8/base.vsprops (modified) (1 prop)
• visual_studio/vc8/ceguilua.vsprops (modified) (1 prop)
• visual_studio/vc8/core.vsprops (modified) (1 prop)
• visual_studio/vc8/cpptcl.vsprops (modified) (1 prop)
• visual_studio/vc8/debug.vsprops (modified) (1 prop)
• visual_studio/vc8/directories.vsprops (modified) (1 prop)
• visual_studio/vc8/lua.vsprops (modified) (1 prop)
• visual_studio/vc8/network.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox_vc8.sln (modified) (1 prop)
• visual_studio/vc8/release.vsprops (modified) (1 prop)
• visual_studio/vc8/tinyxml.vcproj (modified) (1 prop)
• visual_studio/vc8/tinyxml.vsprops (modified) (1 prop)
• visual_studio/vc8/tolua.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/util.vsprops (modified) (1 prop)