Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 2371 for code/branches/presentation/src/orxonox/objects/quest

Timestamp:

Dec 10, 2008, 12:50:05 PM (16 years ago)

Author:

scheusso

Message:

merged network branch to presentation branch

Location:

code/branches/presentation

Files:

: 31 edited

. (modified) (1 prop)
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/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)

code/branches/presentation
- Property svn:mergeinfo changed
  /code/branches/network (added) merged: 2356
  /code/branches/network64 (added) merged: 2210-2211,2245-2247,2255,2307,2309-2312,2316,2355
code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/AddQuest.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/AddQuest.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/AddQuest.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/AddQuestHint.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/AddQuestHint.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/AddReward.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/AddReward.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/AddReward.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/AddReward.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/CompleteQuest.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/CompleteQuest.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/FailQuest.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/FailQuest.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/FailQuest.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/GlobalQuest.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/GlobalQuest.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/LocalQuest.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/LocalQuest.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/Quest.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/Quest.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/Quest.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/Quest.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestDescription.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestDescription.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestEffect.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestEffect.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestHint.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestHint.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestHint.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestItem.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestItem.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestItem.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestManager.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/QuestManager.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/QuestManager.h (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/Rewardable.cc (added) merged: 2356
code/branches/presentation/src/orxonox/objects/quest/Rewardable.h
- Property svn:mergeinfo changed
  /code/branches/network/src/orxonox/objects/quest/Rewardable.h (added) merged: 2356

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

Download in other formats: