[Orxonox-commit 267] r2917 - in branches/pickups2: . bin cmake src/core src/cpptcl src/network/synchronisable src/orxonox src/orxonox/objects src/orxonox/objects/collisionshapes src/orxonox/objects/controllers src/orxonox/objects/gametypes src/orxonox/objects/items src/orxonox/objects/pickup src/orxonox/objects/quest src/orxonox/objects/weaponSystem src/orxonox/objects/weaponSystem/projectiles src/orxonox/objects/worldentities src/orxonox/objects/worldentities/pawns src/orxonox/objects/worldentities/triggers src/tolua src/util
landauf at orxonox.net
landauf at orxonox.net
Wed Apr 15 17:03:58 CEST 2009
Author: landauf
Date: 2009-04-15 17:03:58 +0200 (Wed, 15 Apr 2009)
New Revision: 2917
Added:
branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc
branches/pickups2/src/orxonox/objects/pickup/BaseItem.h
branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc
branches/pickups2/src/orxonox/objects/pickup/DroppedItem.h
branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.cc
branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.h
branches/pickups2/src/orxonox/objects/pickup/Jump.cc
branches/pickups2/src/orxonox/objects/pickup/Jump.h
branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.cc
branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h
branches/pickups2/src/orxonox/objects/pickup/ModifierType.h
branches/pickups2/src/orxonox/objects/pickup/PassiveItem.cc
branches/pickups2/src/orxonox/objects/pickup/PassiveItem.h
branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc
branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h
branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc
branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h
branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc
branches/pickups2/src/orxonox/objects/pickup/UsableItem.h
Removed:
branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc
branches/pickups2/src/orxonox/objects/pickup/BaseItem.h
branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc
branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h
branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc
branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h
branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.cc
branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.h
branches/pickups2/src/orxonox/objects/pickup/ShipItem.cc
branches/pickups2/src/orxonox/objects/pickup/ShipItem.h
branches/pickups2/src/orxonox/objects/pickup/Turbo.cc
branches/pickups2/src/orxonox/objects/pickup/Turbo.h
branches/pickups2/src/orxonox/objects/pickup/Usable.h
Modified:
branches/pickups2/
branches/pickups2/bin/client1.bat.in
branches/pickups2/bin/client2.bat.in
branches/pickups2/bin/dedicated.bat.in
branches/pickups2/bin/run.bat.in
branches/pickups2/bin/server.bat.in
branches/pickups2/bin/standalone.bat.in
branches/pickups2/cmake/FindDirectX.cmake
branches/pickups2/cmake/LibraryConfigTardis.cmake
branches/pickups2/src/core/LuaBind.cc
branches/pickups2/src/core/LuaBind.h
branches/pickups2/src/core/Template.cc
branches/pickups2/src/core/Template.h
branches/pickups2/src/core/XMLFile.h
branches/pickups2/src/core/XMLIncludes.h
branches/pickups2/src/cpptcl/cpptcl.cc
branches/pickups2/src/cpptcl/cpptcl.h
branches/pickups2/src/network/synchronisable/NetworkCallback.h
branches/pickups2/src/network/synchronisable/Synchronisable.cc
branches/pickups2/src/network/synchronisable/Synchronisable.h
branches/pickups2/src/orxonox/CameraManager.cc
branches/pickups2/src/orxonox/CameraManager.h
branches/pickups2/src/orxonox/objects/Level.cc
branches/pickups2/src/orxonox/objects/Level.h
branches/pickups2/src/orxonox/objects/collisionshapes/
branches/pickups2/src/orxonox/objects/controllers/HumanController.cc
branches/pickups2/src/orxonox/objects/controllers/HumanController.h
branches/pickups2/src/orxonox/objects/gametypes/TeamDeathmatch.cc
branches/pickups2/src/orxonox/objects/gametypes/TeamDeathmatch.h
branches/pickups2/src/orxonox/objects/items/Engine.cc
branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt
branches/pickups2/src/orxonox/objects/quest/AddQuest.cc
branches/pickups2/src/orxonox/objects/quest/AddQuest.h
branches/pickups2/src/orxonox/objects/quest/AddQuestHint.cc
branches/pickups2/src/orxonox/objects/quest/AddQuestHint.h
branches/pickups2/src/orxonox/objects/quest/AddReward.cc
branches/pickups2/src/orxonox/objects/quest/AddReward.h
branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.cc
branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.h
branches/pickups2/src/orxonox/objects/quest/CompleteQuest.cc
branches/pickups2/src/orxonox/objects/quest/CompleteQuest.h
branches/pickups2/src/orxonox/objects/quest/FailQuest.cc
branches/pickups2/src/orxonox/objects/quest/FailQuest.h
branches/pickups2/src/orxonox/objects/quest/GlobalQuest.cc
branches/pickups2/src/orxonox/objects/quest/GlobalQuest.h
branches/pickups2/src/orxonox/objects/quest/LocalQuest.cc
branches/pickups2/src/orxonox/objects/quest/LocalQuest.h
branches/pickups2/src/orxonox/objects/quest/Quest.cc
branches/pickups2/src/orxonox/objects/quest/Quest.h
branches/pickups2/src/orxonox/objects/quest/QuestDescription.cc
branches/pickups2/src/orxonox/objects/quest/QuestDescription.h
branches/pickups2/src/orxonox/objects/quest/QuestEffect.cc
branches/pickups2/src/orxonox/objects/quest/QuestEffect.h
branches/pickups2/src/orxonox/objects/quest/QuestHint.cc
branches/pickups2/src/orxonox/objects/quest/QuestHint.h
branches/pickups2/src/orxonox/objects/quest/QuestItem.cc
branches/pickups2/src/orxonox/objects/quest/QuestItem.h
branches/pickups2/src/orxonox/objects/quest/QuestManager.cc
branches/pickups2/src/orxonox/objects/quest/QuestManager.h
branches/pickups2/src/orxonox/objects/quest/Rewardable.cc
branches/pickups2/src/orxonox/objects/quest/Rewardable.h
branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.cc
branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.h
branches/pickups2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc
branches/pickups2/src/orxonox/objects/worldentities/Backlight.cc
branches/pickups2/src/orxonox/objects/worldentities/Backlight.h
branches/pickups2/src/orxonox/objects/worldentities/Camera.cc
branches/pickups2/src/orxonox/objects/worldentities/Camera.h
branches/pickups2/src/orxonox/objects/worldentities/ControllableEntity.h
branches/pickups2/src/orxonox/objects/worldentities/MobileEntity.cc
branches/pickups2/src/orxonox/objects/worldentities/MobileEntity.h
branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.cc
branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.h
branches/pickups2/src/orxonox/objects/worldentities/StaticEntity.cc
branches/pickups2/src/orxonox/objects/worldentities/StaticEntity.h
branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.cc
branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.h
branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.cc
branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.h
branches/pickups2/src/tolua/all-5.0.lua
branches/pickups2/src/tolua/all-5.1.lua
branches/pickups2/src/util/
branches/pickups2/src/util/Exception.cc
branches/pickups2/src/util/Exception.h
branches/pickups2/src/util/SignalHandler.cc
branches/pickups2/src/util/SignalHandler.h
Log:
merged pickup into pickup2
Property changes on: branches/pickups2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem:1875-2277,2279-2401
/branches/buildsystem2:2507-2659
/branches/buildsystem3:2663-2709
/branches/ceguilua:1803-1809
/branches/core3:1573-1740
/branches/gcc43:1581
/branches/gui:1636-1724,2796-2895
/branches/input:1630-1637
/branches/lodfinal:2373-2412
/branches/miniprojects:2755-2825
/branches/network:2357
/branches/network64:2211-2356
/branches/objecthierarchy:1912-2086,2101,2111-2170
/branches/objecthierarchy2:2172-2480
/branches/overlay:2118-2386
/branches/physics:1913-2056,2108-2440
/branches/physics_merge:2437-2458
/branches/pickups:1927-2087,2128
/branches/pickups2:2108-2498
/branches/presentation:2370-2653,2655-2661
/branches/questsystem:1895-2089
/branches/questsystem2:2108-2260
/branches/questsystem5:2777-2906
/branches/script_trigger:1296-1954,1956
/branches/weapon:1926-2095
/branches/weapon2:2108-2489
/branches/weaponsystem:2743-2891
+ /branches/buildsystem:1875-2277,2279-2401
/branches/buildsystem2:2507-2659
/branches/buildsystem3:2663-2709
/branches/ceguilua:1803-1809
/branches/core3:1573-1740
/branches/gcc43:1581
/branches/gui:1636-1724,2796-2895
/branches/input:1630-1637
/branches/lodfinal:2373-2412
/branches/miniprojects:2755-2825
/branches/network:2357
/branches/network64:2211-2356
/branches/objecthierarchy:1912-2086,2101,2111-2170
/branches/objecthierarchy2:2172-2480
/branches/overlay:2118-2386
/branches/physics:1913-2056,2108-2440
/branches/physics_merge:2437-2458
/branches/pickups:1927-2087,2128,2828-2916
/branches/pickups2:2108-2498
/branches/presentation:2370-2653,2655-2661
/branches/questsystem:1895-2089
/branches/questsystem2:2108-2260
/branches/questsystem5:2777-2906
/branches/script_trigger:1296-1954,1956
/branches/weapon:1926-2095
/branches/weapon2:2108-2489
/branches/weaponsystem:2743-2891
Added: svn:ignore
+ build
dependencies
Property changes on: branches/pickups2/bin/client1.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/client1.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client1.bat.in:2755-2825
/branches/questsystem5/bin/client1.bat.in:2777-2906
/branches/weaponsystem/bin/client1.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/client1.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client1.bat.in:2755-2825
/branches/pickups/bin/client1.bat.in:2828-2916
/branches/questsystem5/bin/client1.bat.in:2777-2906
/branches/weaponsystem/bin/client1.bat.in:2743-2891
Property changes on: branches/pickups2/bin/client2.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/client2.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client2.bat.in:2755-2825
/branches/questsystem5/bin/client2.bat.in:2777-2906
/branches/weaponsystem/bin/client2.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/client2.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client2.bat.in:2755-2825
/branches/pickups/bin/client2.bat.in:2828-2916
/branches/questsystem5/bin/client2.bat.in:2777-2906
/branches/weaponsystem/bin/client2.bat.in:2743-2891
Property changes on: branches/pickups2/bin/dedicated.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/dedicated.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/dedicated.bat.in:2755-2825
/branches/questsystem5/bin/dedicated.bat.in:2777-2906
/branches/weaponsystem/bin/dedicated.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/dedicated.bat.in:2796-2895
/branches/gui/bin/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/dedicated.bat.in:2755-2825
/branches/pickups/bin/dedicated.bat.in:2828-2916
/branches/questsystem5/bin/dedicated.bat.in:2777-2906
/branches/weaponsystem/bin/dedicated.bat.in:2743-2891
Property changes on: branches/pickups2/bin/run.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/run.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/run.bat.in:2755-2825
/branches/questsystem5/bin/run.bat.in:2777-2906
/branches/weaponsystem/bin/run.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/run.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/run.bat.in:2755-2825
/branches/pickups/bin/run.bat.in:2828-2916
/branches/questsystem5/bin/run.bat.in:2777-2906
/branches/weaponsystem/bin/run.bat.in:2743-2891
Property changes on: branches/pickups2/bin/server.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/server.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/server.bat.in:2755-2825
/branches/questsystem5/bin/server.bat.in:2777-2906
/branches/weaponsystem/bin/server.bat.in:2743-2891
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/server.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/server.bat.in:2755-2825
/branches/pickups/bin/server.bat.in:2828-2916
/branches/questsystem5/bin/server.bat.in:2777-2906
/branches/weaponsystem/bin/server.bat.in:2743-2891
Property changes on: branches/pickups2/bin/standalone.bat.in
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/standalone.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/questsystem5/bin/standalone.bat.in:2777-2906
+ /branches/buildsystem/bin/mingw/orxonox.bat:2279-2401
/branches/ceguilua/bin/orxonox.bat:1803-1809
/branches/core3/bin/orxonox.bat:1573-1740
/branches/gcc43/bin/orxonox.bat:1581
/branches/gui/bin/orxonox.bat:1636-1724
/branches/gui/bin/standalone.bat.in:2796-2895
/branches/input/bin/orxonox.bat:1630-1637
/branches/pickups/bin/standalone.bat.in:2828-2916
/branches/questsystem5/bin/standalone.bat.in:2777-2906
Property changes on: branches/pickups2/cmake/FindDirectX.cmake
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/cmake/FindDirectX.cmake:1875-2401
/branches/buildsystem2/cmake/FindDirectX.cmake:2507-2659
/branches/buildsystem3/cmake/FindDirectX.cmake:2663-2709
/branches/ceguilua/cmake/FindDirectX.cmake:1803-1809
/branches/core3/cmake/FindDirectX.cmake:1573-1740
/branches/gcc43/cmake/FindDirectX.cmake:1581
/branches/gui/cmake/FindDirectX.cmake:1636-1724,2796-2895
/branches/input/cmake/FindDirectX.cmake:1630-1637
/branches/lodfinal/cmake/FindDirectX.cmake:2373-2412
/branches/miniprojects/cmake/FindDirectX.cmake:2755-2825
/branches/network/cmake/FindDirectX.cmake:2357
/branches/network64/cmake/FindDirectX.cmake:2211-2356
/branches/objecthierarchy/cmake/FindDirectX.cmake:1912-2086,2101,2111-2170
/branches/objecthierarchy2/cmake/FindDirectX.cmake:2172-2480
/branches/overlay/cmake/FindDirectX.cmake:2118-2386
/branches/physics/cmake/FindDirectX.cmake:1913-2056,2108-2440
/branches/physics_merge/cmake/FindDirectX.cmake:2437-2458
/branches/pickups/cmake/FindDirectX.cmake:1927-2087,2128
/branches/pickups2/cmake/FindDirectX.cmake:2108-2498
/branches/presentation/cmake/FindDirectX.cmake:2370-2653,2655-2661
/branches/questsystem/cmake/FindDirectX.cmake:1895-2089
/branches/questsystem2/cmake/FindDirectX.cmake:2108-2260
/branches/questsystem5/cmake/FindDirectX.cmake:2777-2906
/branches/script_trigger/cmake/FindDirectX.cmake:1296-1954,1956
/branches/weapon/cmake/FindDirectX.cmake:1926-2095
/branches/weapon2/cmake/FindDirectX.cmake:2108-2489
/branches/weaponsystem/cmake/FindDirectX.cmake:2743-2891
+ /branches/buildsystem/cmake/FindDirectX.cmake:1875-2401
/branches/buildsystem2/cmake/FindDirectX.cmake:2507-2659
/branches/buildsystem3/cmake/FindDirectX.cmake:2663-2709
/branches/ceguilua/cmake/FindDirectX.cmake:1803-1809
/branches/core3/cmake/FindDirectX.cmake:1573-1740
/branches/gcc43/cmake/FindDirectX.cmake:1581
/branches/gui/cmake/FindDirectX.cmake:1636-1724,2796-2895
/branches/input/cmake/FindDirectX.cmake:1630-1637
/branches/lodfinal/cmake/FindDirectX.cmake:2373-2412
/branches/miniprojects/cmake/FindDirectX.cmake:2755-2825
/branches/network/cmake/FindDirectX.cmake:2357
/branches/network64/cmake/FindDirectX.cmake:2211-2356
/branches/objecthierarchy/cmake/FindDirectX.cmake:1912-2086,2101,2111-2170
/branches/objecthierarchy2/cmake/FindDirectX.cmake:2172-2480
/branches/overlay/cmake/FindDirectX.cmake:2118-2386
/branches/physics/cmake/FindDirectX.cmake:1913-2056,2108-2440
/branches/physics_merge/cmake/FindDirectX.cmake:2437-2458
/branches/pickups/cmake/FindDirectX.cmake:1927-2087,2128,2828-2916
/branches/pickups2/cmake/FindDirectX.cmake:2108-2498
/branches/presentation/cmake/FindDirectX.cmake:2370-2653,2655-2661
/branches/questsystem/cmake/FindDirectX.cmake:1895-2089
/branches/questsystem2/cmake/FindDirectX.cmake:2108-2260
/branches/questsystem5/cmake/FindDirectX.cmake:2777-2906
/branches/script_trigger/cmake/FindDirectX.cmake:1296-1954,1956
/branches/weapon/cmake/FindDirectX.cmake:1926-2095
/branches/weapon2/cmake/FindDirectX.cmake:2108-2489
/branches/weaponsystem/cmake/FindDirectX.cmake:2743-2891
Property changes on: branches/pickups2/cmake/LibraryConfigTardis.cmake
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/cmake/CheckTardis.cmake:1875-2277,2279-2401
/branches/ceguilua/cmake/CheckTardis.cmake:1803-1809
/branches/core3/cmake/CheckTardis.cmake:1573-1740
/branches/gcc43/cmake/CheckTardis.cmake:1581
/branches/gui/cmake/CheckTardis.cmake:1636-1724
/branches/gui/cmake/LibraryConfigTardis.cmake:2796-2895
/branches/input/cmake/CheckTardis.cmake:1630-1637
/branches/miniprojects/cmake/LibraryConfigTardis.cmake:2755-2825
/branches/objecthierarchy/cmake/CheckTardis.cmake:1912-2086,2101,2111-2170
/branches/pickups/cmake/CheckTardis.cmake:1927-2087
/branches/questsystem/cmake/CheckTardis.cmake:1895-2089
/branches/questsystem2/cmake/CheckTardis.cmake:2108-2260
/branches/questsystem5/cmake/LibraryConfigTardis.cmake:2777-2906
/branches/script_trigger/cmake/CheckTardis.cmake:1296-1954,1956
/branches/weapon/cmake/CheckTardis.cmake:1926-2095
/branches/weaponsystem/cmake/LibraryConfigTardis.cmake:2743-2891
+ /branches/buildsystem/cmake/CheckTardis.cmake:1875-2277,2279-2401
/branches/ceguilua/cmake/CheckTardis.cmake:1803-1809
/branches/core3/cmake/CheckTardis.cmake:1573-1740
/branches/gcc43/cmake/CheckTardis.cmake:1581
/branches/gui/cmake/CheckTardis.cmake:1636-1724
/branches/gui/cmake/LibraryConfigTardis.cmake:2796-2895
/branches/input/cmake/CheckTardis.cmake:1630-1637
/branches/miniprojects/cmake/LibraryConfigTardis.cmake:2755-2825
/branches/objecthierarchy/cmake/CheckTardis.cmake:1912-2086,2101,2111-2170
/branches/pickups/cmake/CheckTardis.cmake:1927-2087
/branches/pickups/cmake/LibraryConfigTardis.cmake:2828-2916
/branches/questsystem/cmake/CheckTardis.cmake:1895-2089
/branches/questsystem2/cmake/CheckTardis.cmake:2108-2260
/branches/questsystem5/cmake/LibraryConfigTardis.cmake:2777-2906
/branches/script_trigger/cmake/CheckTardis.cmake:1296-1954,1956
/branches/weapon/cmake/CheckTardis.cmake:1926-2095
/branches/weaponsystem/cmake/LibraryConfigTardis.cmake:2743-2891
Property changes on: branches/pickups2/src/core/LuaBind.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/core/LuaBind.cc:1875-2277,2279-2401
/branches/buildsystem/src/core/Script.cc:1875-2239
/branches/buildsystem2/src/core/LuaBind.cc:2507-2659
/branches/buildsystem3/src/core/LuaBind.cc:2663-2709
/branches/ceguilua/src/core/LuaBind.cc:1803-1809
/branches/core3/src/core/LuaBind.cc:1573-1740
/branches/gcc43/src/core/LuaBind.cc:1581
/branches/gui/src/core/LuaBind.cc:1636-1724,2796-2895
/branches/input/src/core/LuaBind.cc:1630-1637
/branches/lodfinal/src/core/LuaBind.cc:2373-2412
/branches/miniprojects/src/core/LuaBind.cc:2755-2825
/branches/network/src/core/LuaBind.cc:2357
/branches/network64/src/core/LuaBind.cc:2211-2356
/branches/objecthierarchy/src/core/LuaBind.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/LuaBind.cc:2172-2480
/branches/overlay/src/core/LuaBind.cc:2118-2386
/branches/physics/src/core/LuaBind.cc:1913-2056,2108-2440
/branches/physics_merge/src/core/LuaBind.cc:2437-2458
/branches/pickups/src/core/LuaBind.cc:1927-2087,2128
/branches/pickups2/src/core/LuaBind.cc:2108-2498
/branches/presentation/src/core/LuaBind.cc:2370-2653,2655-2661
/branches/questsystem/src/core/LuaBind.cc:1895-2089
/branches/questsystem2/src/core/LuaBind.cc:2108-2260
/branches/questsystem5/src/core/LuaBind.cc:2777-2906
/branches/script_trigger/src/core/LuaBind.cc:1296-1954,1956
/branches/weapon/src/core/LuaBind.cc:1926-2095
/branches/weapon2/src/core/LuaBind.cc:2108-2489
/branches/weaponsystem/src/core/LuaBind.cc:2743-2891
+ /branches/buildsystem/src/core/LuaBind.cc:1875-2277,2279-2401
/branches/buildsystem/src/core/Script.cc:1875-2239
/branches/buildsystem2/src/core/LuaBind.cc:2507-2659
/branches/buildsystem3/src/core/LuaBind.cc:2663-2709
/branches/ceguilua/src/core/LuaBind.cc:1803-1809
/branches/core3/src/core/LuaBind.cc:1573-1740
/branches/gcc43/src/core/LuaBind.cc:1581
/branches/gui/src/core/LuaBind.cc:1636-1724,2796-2895
/branches/input/src/core/LuaBind.cc:1630-1637
/branches/lodfinal/src/core/LuaBind.cc:2373-2412
/branches/miniprojects/src/core/LuaBind.cc:2755-2825
/branches/network/src/core/LuaBind.cc:2357
/branches/network64/src/core/LuaBind.cc:2211-2356
/branches/objecthierarchy/src/core/LuaBind.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/LuaBind.cc:2172-2480
/branches/overlay/src/core/LuaBind.cc:2118-2386
/branches/physics/src/core/LuaBind.cc:1913-2056,2108-2440
/branches/physics_merge/src/core/LuaBind.cc:2437-2458
/branches/pickups/src/core/LuaBind.cc:1927-2087,2128,2828-2916
/branches/pickups2/src/core/LuaBind.cc:2108-2498
/branches/presentation/src/core/LuaBind.cc:2370-2653,2655-2661
/branches/questsystem/src/core/LuaBind.cc:1895-2089
/branches/questsystem2/src/core/LuaBind.cc:2108-2260
/branches/questsystem5/src/core/LuaBind.cc:2777-2906
/branches/script_trigger/src/core/LuaBind.cc:1296-1954,1956
/branches/weapon/src/core/LuaBind.cc:1926-2095
/branches/weapon2/src/core/LuaBind.cc:2108-2489
/branches/weaponsystem/src/core/LuaBind.cc:2743-2891
Property changes on: branches/pickups2/src/core/LuaBind.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/core/LuaBind.h:1875-2277,2279-2401
/branches/buildsystem/src/core/Script.h:1875-2234
/branches/buildsystem2/src/core/LuaBind.h:2507-2659
/branches/buildsystem3/src/core/LuaBind.h:2663-2709
/branches/ceguilua/src/core/LuaBind.h:1803-1809
/branches/core3/src/core/LuaBind.h:1573-1740
/branches/gcc43/src/core/LuaBind.h:1581
/branches/gui/src/core/LuaBind.h:1636-1724,2796-2895
/branches/input/src/core/LuaBind.h:1630-1637
/branches/lodfinal/src/core/LuaBind.h:2373-2412
/branches/miniprojects/src/core/LuaBind.h:2755-2825
/branches/network/src/core/LuaBind.h:2357
/branches/network64/src/core/LuaBind.h:2211-2356
/branches/objecthierarchy/src/core/LuaBind.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/LuaBind.h:2172-2480
/branches/overlay/src/core/LuaBind.h:2118-2386
/branches/physics/src/core/LuaBind.h:1913-2056,2108-2440
/branches/physics_merge/src/core/LuaBind.h:2437-2458
/branches/pickups/src/core/LuaBind.h:1927-2087,2128
/branches/pickups2/src/core/LuaBind.h:2108-2498
/branches/presentation/src/core/LuaBind.h:2370-2653,2655-2661
/branches/questsystem/src/core/LuaBind.h:1895-2089
/branches/questsystem2/src/core/LuaBind.h:2108-2260
/branches/questsystem5/src/core/LuaBind.h:2777-2906
/branches/script_trigger/src/core/LuaBind.h:1296-1954,1956
/branches/weapon/src/core/LuaBind.h:1926-2095
/branches/weapon2/src/core/LuaBind.h:2108-2489
/branches/weaponsystem/src/core/LuaBind.h:2743-2891
+ /branches/buildsystem/src/core/LuaBind.h:1875-2277,2279-2401
/branches/buildsystem/src/core/Script.h:1875-2234
/branches/buildsystem2/src/core/LuaBind.h:2507-2659
/branches/buildsystem3/src/core/LuaBind.h:2663-2709
/branches/ceguilua/src/core/LuaBind.h:1803-1809
/branches/core3/src/core/LuaBind.h:1573-1740
/branches/gcc43/src/core/LuaBind.h:1581
/branches/gui/src/core/LuaBind.h:1636-1724,2796-2895
/branches/input/src/core/LuaBind.h:1630-1637
/branches/lodfinal/src/core/LuaBind.h:2373-2412
/branches/miniprojects/src/core/LuaBind.h:2755-2825
/branches/network/src/core/LuaBind.h:2357
/branches/network64/src/core/LuaBind.h:2211-2356
/branches/objecthierarchy/src/core/LuaBind.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/LuaBind.h:2172-2480
/branches/overlay/src/core/LuaBind.h:2118-2386
/branches/physics/src/core/LuaBind.h:1913-2056,2108-2440
/branches/physics_merge/src/core/LuaBind.h:2437-2458
/branches/pickups/src/core/LuaBind.h:1927-2087,2128,2828-2916
/branches/pickups2/src/core/LuaBind.h:2108-2498
/branches/presentation/src/core/LuaBind.h:2370-2653,2655-2661
/branches/questsystem/src/core/LuaBind.h:1895-2089
/branches/questsystem2/src/core/LuaBind.h:2108-2260
/branches/questsystem5/src/core/LuaBind.h:2777-2906
/branches/script_trigger/src/core/LuaBind.h:1296-1954,1956
/branches/weapon/src/core/LuaBind.h:1926-2095
/branches/weapon2/src/core/LuaBind.h:2108-2489
/branches/weaponsystem/src/core/LuaBind.h:2743-2891
Property changes on: branches/pickups2/src/core/Template.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/core/Template.cc:2507-2659
/branches/buildsystem3/src/core/Template.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Template.cc:1803-1809
/branches/core3/src/orxonox/objects/Template.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Template.cc:1581
/branches/gui/src/core/Template.cc:2796-2895
/branches/gui/src/orxonox/objects/Template.cc:1636-1724
/branches/input/src/orxonox/objects/Template.cc:1630-1637
/branches/lodfinal/src/core/Template.cc:2373-2412
/branches/miniprojects/src/core/Template.cc:2755-2825
/branches/network/src/core/Template.cc:2357
/branches/network64/src/core/Template.cc:2211-2356
/branches/objecthierarchy/src/core/Template.cc:2101,2111-2170
/branches/objecthierarchy2/src/core/Template.cc:2172-2480
/branches/overlay/src/core/Template.cc:2118-2386
/branches/physics/src/core/Template.cc:2108-2440
/branches/physics_merge/src/core/Template.cc:2437-2458
/branches/pickups2/src/core/Template.cc:2108-2498
/branches/presentation/src/core/Template.cc:2370-2653,2655-2661
/branches/questsystem2/src/core/Template.cc:2108-2260
/branches/questsystem5/src/core/Template.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Template.cc:1296-1954,1956
/branches/weapon2/src/core/Template.cc:2108-2489
/branches/weaponsystem/src/core/Template.cc:2743-2891
+ /branches/buildsystem2/src/core/Template.cc:2507-2659
/branches/buildsystem3/src/core/Template.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Template.cc:1803-1809
/branches/core3/src/orxonox/objects/Template.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Template.cc:1581
/branches/gui/src/core/Template.cc:2796-2895
/branches/gui/src/orxonox/objects/Template.cc:1636-1724
/branches/input/src/orxonox/objects/Template.cc:1630-1637
/branches/lodfinal/src/core/Template.cc:2373-2412
/branches/miniprojects/src/core/Template.cc:2755-2825
/branches/network/src/core/Template.cc:2357
/branches/network64/src/core/Template.cc:2211-2356
/branches/objecthierarchy/src/core/Template.cc:2101,2111-2170
/branches/objecthierarchy2/src/core/Template.cc:2172-2480
/branches/overlay/src/core/Template.cc:2118-2386
/branches/physics/src/core/Template.cc:2108-2440
/branches/physics_merge/src/core/Template.cc:2437-2458
/branches/pickups/src/core/Template.cc:2828-2916
/branches/pickups2/src/core/Template.cc:2108-2498
/branches/presentation/src/core/Template.cc:2370-2653,2655-2661
/branches/questsystem2/src/core/Template.cc:2108-2260
/branches/questsystem5/src/core/Template.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Template.cc:1296-1954,1956
/branches/weapon2/src/core/Template.cc:2108-2489
/branches/weaponsystem/src/core/Template.cc:2743-2891
Property changes on: branches/pickups2/src/core/Template.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/core/Template.h:2507-2659
/branches/buildsystem3/src/core/Template.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Template.h:1803-1809
/branches/core3/src/orxonox/objects/Template.h:1573-1740
/branches/gcc43/src/orxonox/objects/Template.h:1581
/branches/gui/src/core/Template.h:2796-2895
/branches/gui/src/orxonox/objects/Template.h:1636-1724
/branches/input/src/orxonox/objects/Template.h:1630-1637
/branches/lodfinal/src/core/Template.h:2373-2412
/branches/miniprojects/src/core/Template.h:2755-2825
/branches/network/src/core/Template.h:2357
/branches/network64/src/core/Template.h:2211-2356
/branches/objecthierarchy/src/core/Template.h:2101,2111-2170
/branches/objecthierarchy2/src/core/Template.h:2172-2480
/branches/overlay/src/core/Template.h:2118-2386
/branches/physics/src/core/Template.h:2108-2440
/branches/physics_merge/src/core/Template.h:2437-2458
/branches/pickups2/src/core/Template.h:2108-2498
/branches/presentation/src/core/Template.h:2370-2653,2655-2661
/branches/questsystem2/src/core/Template.h:2108-2260
/branches/questsystem5/src/core/Template.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Template.h:1296-1954,1956
/branches/weapon2/src/core/Template.h:2108-2489
/branches/weaponsystem/src/core/Template.h:2743-2891
+ /branches/buildsystem2/src/core/Template.h:2507-2659
/branches/buildsystem3/src/core/Template.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Template.h:1803-1809
/branches/core3/src/orxonox/objects/Template.h:1573-1740
/branches/gcc43/src/orxonox/objects/Template.h:1581
/branches/gui/src/core/Template.h:2796-2895
/branches/gui/src/orxonox/objects/Template.h:1636-1724
/branches/input/src/orxonox/objects/Template.h:1630-1637
/branches/lodfinal/src/core/Template.h:2373-2412
/branches/miniprojects/src/core/Template.h:2755-2825
/branches/network/src/core/Template.h:2357
/branches/network64/src/core/Template.h:2211-2356
/branches/objecthierarchy/src/core/Template.h:2101,2111-2170
/branches/objecthierarchy2/src/core/Template.h:2172-2480
/branches/overlay/src/core/Template.h:2118-2386
/branches/physics/src/core/Template.h:2108-2440
/branches/physics_merge/src/core/Template.h:2437-2458
/branches/pickups/src/core/Template.h:2828-2916
/branches/pickups2/src/core/Template.h:2108-2498
/branches/presentation/src/core/Template.h:2370-2653,2655-2661
/branches/questsystem2/src/core/Template.h:2108-2260
/branches/questsystem5/src/core/Template.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Template.h:1296-1954,1956
/branches/weapon2/src/core/Template.h:2108-2489
/branches/weaponsystem/src/core/Template.h:2743-2891
Property changes on: branches/pickups2/src/core/XMLFile.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/core/XMLFile.h:2507-2659
/branches/buildsystem3/src/core/XMLFile.h:2663-2709
/branches/ceguilua/src/core/Level.h:1803-1809
/branches/core3/src/core/Level.h:1573-1740
/branches/gcc43/src/core/Level.h:1581
/branches/gui/src/core/Level.h:1636-1724
/branches/gui/src/core/XMLFile.h:2796-2895
/branches/input/src/core/Level.h:1630-1637
/branches/lodfinal/src/core/XMLFile.h:2373-2412
/branches/miniprojects/src/core/XMLFile.h:2755-2825
/branches/network/src/core/XMLFile.h:2357
/branches/network64/src/core/XMLFile.h:2211-2356
/branches/objecthierarchy/src/core/XMLFile.h:2101,2111-2170
/branches/objecthierarchy2/src/core/XMLFile.h:2172-2480
/branches/overlay/src/core/XMLFile.h:2118-2386
/branches/physics/src/core/XMLFile.h:2108-2440
/branches/physics_merge/src/core/XMLFile.h:2437-2458
/branches/pickups2/src/core/XMLFile.h:2108-2498
/branches/presentation/src/core/XMLFile.h:2370-2653,2655-2661
/branches/questsystem2/src/core/XMLFile.h:2108-2260
/branches/questsystem5/src/core/XMLFile.h:2777-2906
/branches/script_trigger/src/core/Level.h:1296-1954,1956
/branches/weapon2/src/core/XMLFile.h:2108-2489
/branches/weaponsystem/src/core/XMLFile.h:2743-2891
/trunk/src/core/XMLFile.h:2-2086
+ /branches/buildsystem2/src/core/XMLFile.h:2507-2659
/branches/buildsystem3/src/core/XMLFile.h:2663-2709
/branches/ceguilua/src/core/Level.h:1803-1809
/branches/core3/src/core/Level.h:1573-1740
/branches/gcc43/src/core/Level.h:1581
/branches/gui/src/core/Level.h:1636-1724
/branches/gui/src/core/XMLFile.h:2796-2895
/branches/input/src/core/Level.h:1630-1637
/branches/lodfinal/src/core/XMLFile.h:2373-2412
/branches/miniprojects/src/core/XMLFile.h:2755-2825
/branches/network/src/core/XMLFile.h:2357
/branches/network64/src/core/XMLFile.h:2211-2356
/branches/objecthierarchy/src/core/XMLFile.h:2101,2111-2170
/branches/objecthierarchy2/src/core/XMLFile.h:2172-2480
/branches/overlay/src/core/XMLFile.h:2118-2386
/branches/physics/src/core/XMLFile.h:2108-2440
/branches/physics_merge/src/core/XMLFile.h:2437-2458
/branches/pickups/src/core/XMLFile.h:2828-2916
/branches/pickups2/src/core/XMLFile.h:2108-2498
/branches/presentation/src/core/XMLFile.h:2370-2653,2655-2661
/branches/questsystem2/src/core/XMLFile.h:2108-2260
/branches/questsystem5/src/core/XMLFile.h:2777-2906
/branches/script_trigger/src/core/Level.h:1296-1954,1956
/branches/weapon2/src/core/XMLFile.h:2108-2489
/branches/weaponsystem/src/core/XMLFile.h:2743-2891
/trunk/src/core/XMLFile.h:2-2086
Property changes on: branches/pickups2/src/core/XMLIncludes.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/core/XMLIncludes.h:1875-2277,2279-2401
/branches/buildsystem2/src/core/XMLIncludes.h:2507-2659
/branches/buildsystem3/src/core/XMLIncludes.h:2663-2709
/branches/ceguilua/src/util/XMLIncludes.h:1803-1809
/branches/core3/src/util/XMLIncludes.h:1573-1740
/branches/gcc43/src/util/XMLIncludes.h:1581
/branches/gui/src/core/XMLIncludes.h:2796-2895
/branches/gui/src/util/XMLIncludes.h:1636-1724
/branches/input/src/util/XMLIncludes.h:1630-1637
/branches/lodfinal/src/core/XMLIncludes.h:2373-2412
/branches/miniprojects/src/core/XMLIncludes.h:2755-2825
/branches/network/src/core/XMLIncludes.h:2357
/branches/network64/src/core/XMLIncludes.h:2211-2356
/branches/objecthierarchy/src/core/XMLIncludes.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/XMLIncludes.h:2172-2480
/branches/overlay/src/core/XMLIncludes.h:2118-2386
/branches/physics/src/core/XMLIncludes.h:1913-2056,2108-2440
/branches/physics_merge/src/core/XMLIncludes.h:2437-2458
/branches/pickups/src/core/XMLIncludes.h:1927-2087,2128
/branches/pickups2/src/core/XMLIncludes.h:2108-2498
/branches/presentation/src/core/XMLIncludes.h:2370-2653,2655-2661
/branches/questsystem/src/core/XMLIncludes.h:1895-2089
/branches/questsystem2/src/core/XMLIncludes.h:2108-2260
/branches/questsystem5/src/core/XMLIncludes.h:2777-2906
/branches/weapon/src/core/XMLIncludes.h:1926-2095
/branches/weapon2/src/core/XMLIncludes.h:2108-2489
/branches/weaponsystem/src/core/XMLIncludes.h:2743-2891
+ /branches/buildsystem/src/core/XMLIncludes.h:1875-2277,2279-2401
/branches/buildsystem2/src/core/XMLIncludes.h:2507-2659
/branches/buildsystem3/src/core/XMLIncludes.h:2663-2709
/branches/ceguilua/src/util/XMLIncludes.h:1803-1809
/branches/core3/src/util/XMLIncludes.h:1573-1740
/branches/gcc43/src/util/XMLIncludes.h:1581
/branches/gui/src/core/XMLIncludes.h:2796-2895
/branches/gui/src/util/XMLIncludes.h:1636-1724
/branches/input/src/util/XMLIncludes.h:1630-1637
/branches/lodfinal/src/core/XMLIncludes.h:2373-2412
/branches/miniprojects/src/core/XMLIncludes.h:2755-2825
/branches/network/src/core/XMLIncludes.h:2357
/branches/network64/src/core/XMLIncludes.h:2211-2356
/branches/objecthierarchy/src/core/XMLIncludes.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/core/XMLIncludes.h:2172-2480
/branches/overlay/src/core/XMLIncludes.h:2118-2386
/branches/physics/src/core/XMLIncludes.h:1913-2056,2108-2440
/branches/physics_merge/src/core/XMLIncludes.h:2437-2458
/branches/pickups/src/core/XMLIncludes.h:1927-2087,2128,2828-2916
/branches/pickups2/src/core/XMLIncludes.h:2108-2498
/branches/presentation/src/core/XMLIncludes.h:2370-2653,2655-2661
/branches/questsystem/src/core/XMLIncludes.h:1895-2089
/branches/questsystem2/src/core/XMLIncludes.h:2108-2260
/branches/questsystem5/src/core/XMLIncludes.h:2777-2906
/branches/weapon/src/core/XMLIncludes.h:1926-2095
/branches/weapon2/src/core/XMLIncludes.h:2108-2489
/branches/weaponsystem/src/core/XMLIncludes.h:2743-2891
Property changes on: branches/pickups2/src/cpptcl/cpptcl.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/cpptcl/CppTcl.cc:1875-2277,2279-2401
/branches/ceguilua/src/cpptcl/CppTcl.cc:1803-1809
/branches/core3/src/cpptcl/CppTcl.cc:1573-1740
/branches/gcc43/src/cpptcl/CppTcl.cc:1581
/branches/gui/src/cpptcl/CppTcl.cc:1636-1724
/branches/gui/src/cpptcl/cpptcl.cc:2796-2895
/branches/input/src/cpptcl/CppTcl.cc:1630-1637
/branches/miniprojects/src/cpptcl/cpptcl.cc:2755-2825
/branches/objecthierarchy/src/cpptcl/CppTcl.cc:1912-2086,2101,2111-2170
/branches/pickups/src/cpptcl/CppTcl.cc:1927-2087
/branches/questsystem/src/cpptcl/CppTcl.cc:1895-2089
/branches/questsystem2/src/cpptcl/CppTcl.cc:2108-2260
/branches/questsystem5/src/cpptcl/cpptcl.cc:2777-2906
/branches/script_trigger/src/cpptcl/CppTcl.cc:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.cc:1926-2095
/branches/weaponsystem/src/cpptcl/cpptcl.cc:2743-2891
+ /branches/buildsystem/src/cpptcl/CppTcl.cc:1875-2277,2279-2401
/branches/ceguilua/src/cpptcl/CppTcl.cc:1803-1809
/branches/core3/src/cpptcl/CppTcl.cc:1573-1740
/branches/gcc43/src/cpptcl/CppTcl.cc:1581
/branches/gui/src/cpptcl/CppTcl.cc:1636-1724
/branches/gui/src/cpptcl/cpptcl.cc:2796-2895
/branches/input/src/cpptcl/CppTcl.cc:1630-1637
/branches/miniprojects/src/cpptcl/cpptcl.cc:2755-2825
/branches/objecthierarchy/src/cpptcl/CppTcl.cc:1912-2086,2101,2111-2170
/branches/pickups/src/cpptcl/CppTcl.cc:1927-2087
/branches/pickups/src/cpptcl/cpptcl.cc:2828-2916
/branches/questsystem/src/cpptcl/CppTcl.cc:1895-2089
/branches/questsystem2/src/cpptcl/CppTcl.cc:2108-2260
/branches/questsystem5/src/cpptcl/cpptcl.cc:2777-2906
/branches/script_trigger/src/cpptcl/CppTcl.cc:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.cc:1926-2095
/branches/weaponsystem/src/cpptcl/cpptcl.cc:2743-2891
Property changes on: branches/pickups2/src/cpptcl/cpptcl.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/cpptcl/CppTcl.h:1875-2277,2279-2401
/branches/ceguilua/src/cpptcl/CppTcl.h:1803-1809
/branches/core3/src/cpptcl/CppTcl.h:1573-1740
/branches/gcc43/src/cpptcl/CppTcl.h:1581
/branches/gui/src/cpptcl/CppTcl.h:1636-1724
/branches/gui/src/cpptcl/cpptcl.h:2796-2895
/branches/input/src/cpptcl/CppTcl.h:1630-1637
/branches/miniprojects/src/cpptcl/cpptcl.h:2755-2825
/branches/objecthierarchy/src/cpptcl/CppTcl.h:1912-2086,2101,2111-2170
/branches/pickups/src/cpptcl/CppTcl.h:1927-2087
/branches/questsystem/src/cpptcl/CppTcl.h:1895-2089
/branches/questsystem2/src/cpptcl/CppTcl.h:2108-2260
/branches/questsystem5/src/cpptcl/cpptcl.h:2777-2906
/branches/script_trigger/src/cpptcl/CppTcl.h:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.h:1926-2095
/branches/weaponsystem/src/cpptcl/cpptcl.h:2743-2891
+ /branches/buildsystem/src/cpptcl/CppTcl.h:1875-2277,2279-2401
/branches/ceguilua/src/cpptcl/CppTcl.h:1803-1809
/branches/core3/src/cpptcl/CppTcl.h:1573-1740
/branches/gcc43/src/cpptcl/CppTcl.h:1581
/branches/gui/src/cpptcl/CppTcl.h:1636-1724
/branches/gui/src/cpptcl/cpptcl.h:2796-2895
/branches/input/src/cpptcl/CppTcl.h:1630-1637
/branches/miniprojects/src/cpptcl/cpptcl.h:2755-2825
/branches/objecthierarchy/src/cpptcl/CppTcl.h:1912-2086,2101,2111-2170
/branches/pickups/src/cpptcl/CppTcl.h:1927-2087
/branches/pickups/src/cpptcl/cpptcl.h:2828-2916
/branches/questsystem/src/cpptcl/CppTcl.h:1895-2089
/branches/questsystem2/src/cpptcl/CppTcl.h:2108-2260
/branches/questsystem5/src/cpptcl/cpptcl.h:2777-2906
/branches/script_trigger/src/cpptcl/CppTcl.h:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.h:1926-2095
/branches/weaponsystem/src/cpptcl/cpptcl.h:2743-2891
Property changes on: branches/pickups2/src/network/synchronisable/NetworkCallback.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/network/synchronisable/NetworkCallback.h:2663-2709
/branches/ceguilua/src/network/NetworkCallback.h:1803-1809
/branches/core3/src/network/NetworkCallback.h:1573-1740
/branches/gcc43/src/network/NetworkCallback.h:1581
/branches/gui/src/network/NetworkCallback.h:1636-1724
/branches/gui/src/network/synchronisable/NetworkCallback.h:2796-2895
/branches/input/src/network/NetworkCallback.h:1630-1637
/branches/miniprojects/src/network/synchronisable/NetworkCallback.h:2755-2825
/branches/network/src/network/synchronisable/NetworkCallback.h:2357
/branches/objecthierarchy/src/network/NetworkCallback.h:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/NetworkCallback.h:2437-2458
/branches/pickups/src/network/NetworkCallback.h:1927-2087
/branches/presentation/src/network/synchronisable/NetworkCallback.h:2655-2661
/branches/questsystem/src/network/NetworkCallback.h:1895-2089
/branches/questsystem5/src/network/synchronisable/NetworkCallback.h:2777-2906
/branches/script_trigger/src/network/NetworkCallback.h:1296-1954,1956
/branches/weapon/src/network/NetworkCallback.h:1926-2095
/branches/weaponsystem/src/network/synchronisable/NetworkCallback.h:2743-2891
+ /branches/buildsystem3/src/network/synchronisable/NetworkCallback.h:2663-2709
/branches/ceguilua/src/network/NetworkCallback.h:1803-1809
/branches/core3/src/network/NetworkCallback.h:1573-1740
/branches/gcc43/src/network/NetworkCallback.h:1581
/branches/gui/src/network/NetworkCallback.h:1636-1724
/branches/gui/src/network/synchronisable/NetworkCallback.h:2796-2895
/branches/input/src/network/NetworkCallback.h:1630-1637
/branches/miniprojects/src/network/synchronisable/NetworkCallback.h:2755-2825
/branches/network/src/network/synchronisable/NetworkCallback.h:2357
/branches/objecthierarchy/src/network/NetworkCallback.h:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/NetworkCallback.h:2437-2458
/branches/pickups/src/network/NetworkCallback.h:1927-2087
/branches/pickups/src/network/synchronisable/NetworkCallback.h:2828-2916
/branches/presentation/src/network/synchronisable/NetworkCallback.h:2655-2661
/branches/questsystem/src/network/NetworkCallback.h:1895-2089
/branches/questsystem5/src/network/synchronisable/NetworkCallback.h:2777-2906
/branches/script_trigger/src/network/NetworkCallback.h:1296-1954,1956
/branches/weapon/src/network/NetworkCallback.h:1926-2095
/branches/weaponsystem/src/network/synchronisable/NetworkCallback.h:2743-2891
Property changes on: branches/pickups2/src/network/synchronisable/Synchronisable.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/network/synchronisable/Synchronisable.cc:2663-2709
/branches/ceguilua/src/network/Synchronisable.cc:1803-1809
/branches/core3/src/network/Synchronisable.cc:1573-1740
/branches/gcc43/src/network/Synchronisable.cc:1581
/branches/gui/src/network/Synchronisable.cc:1636-1724
/branches/gui/src/network/synchronisable/Synchronisable.cc:2796-2895
/branches/input/src/network/Synchronisable.cc:1630-1637
/branches/miniprojects/src/network/synchronisable/Synchronisable.cc:2755-2825
/branches/network/src/network/synchronisable/Synchronisable.cc:2357
/branches/objecthierarchy/src/network/Synchronisable.cc:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/Synchronisable.cc:2437-2458
/branches/pickups/src/network/Synchronisable.cc:1927-2087
/branches/presentation/src/network/synchronisable/Synchronisable.cc:2655-2661
/branches/questsystem/src/network/Synchronisable.cc:1895-2089
/branches/questsystem5/src/network/synchronisable/Synchronisable.cc:2777-2906
/branches/script_trigger/src/network/Synchronisable.cc:1296-1954,1956
/branches/weapon/src/network/Synchronisable.cc:1926-2095
/branches/weaponsystem/src/network/synchronisable/Synchronisable.cc:2743-2891
+ /branches/buildsystem3/src/network/synchronisable/Synchronisable.cc:2663-2709
/branches/ceguilua/src/network/Synchronisable.cc:1803-1809
/branches/core3/src/network/Synchronisable.cc:1573-1740
/branches/gcc43/src/network/Synchronisable.cc:1581
/branches/gui/src/network/Synchronisable.cc:1636-1724
/branches/gui/src/network/synchronisable/Synchronisable.cc:2796-2895
/branches/input/src/network/Synchronisable.cc:1630-1637
/branches/miniprojects/src/network/synchronisable/Synchronisable.cc:2755-2825
/branches/network/src/network/synchronisable/Synchronisable.cc:2357
/branches/objecthierarchy/src/network/Synchronisable.cc:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/Synchronisable.cc:2437-2458
/branches/pickups/src/network/Synchronisable.cc:1927-2087
/branches/pickups/src/network/synchronisable/Synchronisable.cc:2828-2916
/branches/presentation/src/network/synchronisable/Synchronisable.cc:2655-2661
/branches/questsystem/src/network/Synchronisable.cc:1895-2089
/branches/questsystem5/src/network/synchronisable/Synchronisable.cc:2777-2906
/branches/script_trigger/src/network/Synchronisable.cc:1296-1954,1956
/branches/weapon/src/network/Synchronisable.cc:1926-2095
/branches/weaponsystem/src/network/synchronisable/Synchronisable.cc:2743-2891
Property changes on: branches/pickups2/src/network/synchronisable/Synchronisable.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/network/synchronisable/Synchronisable.h:2663-2709
/branches/ceguilua/src/network/Synchronisable.h:1803-1809
/branches/core3/src/network/Synchronisable.h:1573-1740
/branches/gcc43/src/network/Synchronisable.h:1581
/branches/gui/src/network/Synchronisable.h:1636-1724
/branches/gui/src/network/synchronisable/Synchronisable.h:2796-2895
/branches/input/src/network/Synchronisable.h:1630-1637
/branches/miniprojects/src/network/synchronisable/Synchronisable.h:2755-2825
/branches/network/src/network/synchronisable/Synchronisable.h:2357
/branches/objecthierarchy/src/network/Synchronisable.h:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/Synchronisable.h:2437-2458
/branches/pickups/src/network/Synchronisable.h:1927-2087
/branches/presentation/src/network/synchronisable/Synchronisable.h:2655-2661
/branches/questsystem/src/network/Synchronisable.h:1895-2089
/branches/questsystem5/src/network/synchronisable/Synchronisable.h:2777-2906
/branches/script_trigger/src/network/Synchronisable.h:1296-1954,1956
/branches/weapon/src/network/Synchronisable.h:1926-2095
/branches/weaponsystem/src/network/synchronisable/Synchronisable.h:2743-2891
+ /branches/buildsystem3/src/network/synchronisable/Synchronisable.h:2663-2709
/branches/ceguilua/src/network/Synchronisable.h:1803-1809
/branches/core3/src/network/Synchronisable.h:1573-1740
/branches/gcc43/src/network/Synchronisable.h:1581
/branches/gui/src/network/Synchronisable.h:1636-1724
/branches/gui/src/network/synchronisable/Synchronisable.h:2796-2895
/branches/input/src/network/Synchronisable.h:1630-1637
/branches/miniprojects/src/network/synchronisable/Synchronisable.h:2755-2825
/branches/network/src/network/synchronisable/Synchronisable.h:2357
/branches/objecthierarchy/src/network/Synchronisable.h:1912-2086,2101,2111-2170
/branches/physics_merge/src/network/synchronisable/Synchronisable.h:2437-2458
/branches/pickups/src/network/Synchronisable.h:1927-2087
/branches/pickups/src/network/synchronisable/Synchronisable.h:2828-2916
/branches/presentation/src/network/synchronisable/Synchronisable.h:2655-2661
/branches/questsystem/src/network/Synchronisable.h:1895-2089
/branches/questsystem5/src/network/synchronisable/Synchronisable.h:2777-2906
/branches/script_trigger/src/network/Synchronisable.h:1296-1954,1956
/branches/weapon/src/network/Synchronisable.h:1926-2095
/branches/weaponsystem/src/network/synchronisable/Synchronisable.h:2743-2891
Property changes on: branches/pickups2/src/orxonox/CameraManager.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/CameraManager.cc:2507-2659
/branches/buildsystem3/src/orxonox/CameraManager.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/CameraHandler.cc:1803-1809
/branches/core3/src/orxonox/objects/CameraHandler.cc:1573-1740
/branches/gcc43/src/orxonox/objects/CameraHandler.cc:1581
/branches/gui/src/orxonox/CameraManager.cc:2796-2895
/branches/gui/src/orxonox/objects/CameraHandler.cc:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.cc:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.cc:2373-2412
/branches/miniprojects/src/orxonox/CameraManager.cc:2755-2825
/branches/network/src/orxonox/CameraManager.cc:2357
/branches/network64/src/orxonox/CameraManager.cc:2211-2356
/branches/objecthierarchy/src/orxonox/CameraManager.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/CameraManager.cc:2172-2480
/branches/overlay/src/orxonox/CameraManager.cc:2118-2386
/branches/physics/src/orxonox/CameraManager.cc:2108-2440
/branches/physics_merge/src/orxonox/CameraManager.cc:2437-2458
/branches/pickups2/src/orxonox/CameraManager.cc:2108-2498
/branches/presentation/src/orxonox/CameraManager.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/CameraManager.cc:2108-2260
/branches/questsystem5/src/orxonox/CameraManager.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/CameraHandler.cc:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.cc:2108-2489
/branches/weaponsystem/src/orxonox/CameraManager.cc:2743-2891
/trunk/src/orxonox/CameraManager.cc:2-2086
+ /branches/buildsystem2/src/orxonox/CameraManager.cc:2507-2659
/branches/buildsystem3/src/orxonox/CameraManager.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/CameraHandler.cc:1803-1809
/branches/core3/src/orxonox/objects/CameraHandler.cc:1573-1740
/branches/gcc43/src/orxonox/objects/CameraHandler.cc:1581
/branches/gui/src/orxonox/CameraManager.cc:2796-2895
/branches/gui/src/orxonox/objects/CameraHandler.cc:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.cc:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.cc:2373-2412
/branches/miniprojects/src/orxonox/CameraManager.cc:2755-2825
/branches/network/src/orxonox/CameraManager.cc:2357
/branches/network64/src/orxonox/CameraManager.cc:2211-2356
/branches/objecthierarchy/src/orxonox/CameraManager.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/CameraManager.cc:2172-2480
/branches/overlay/src/orxonox/CameraManager.cc:2118-2386
/branches/physics/src/orxonox/CameraManager.cc:2108-2440
/branches/physics_merge/src/orxonox/CameraManager.cc:2437-2458
/branches/pickups/src/orxonox/CameraManager.cc:2828-2916
/branches/pickups2/src/orxonox/CameraManager.cc:2108-2498
/branches/presentation/src/orxonox/CameraManager.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/CameraManager.cc:2108-2260
/branches/questsystem5/src/orxonox/CameraManager.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/CameraHandler.cc:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.cc:2108-2489
/branches/weaponsystem/src/orxonox/CameraManager.cc:2743-2891
/trunk/src/orxonox/CameraManager.cc:2-2086
Property changes on: branches/pickups2/src/orxonox/CameraManager.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/CameraManager.h:2507-2659
/branches/buildsystem3/src/orxonox/CameraManager.h:2663-2709
/branches/ceguilua/src/orxonox/objects/CameraHandler.h:1803-1809
/branches/core3/src/orxonox/objects/CameraHandler.h:1573-1740
/branches/gcc43/src/orxonox/objects/CameraHandler.h:1581
/branches/gui/src/orxonox/CameraManager.h:2796-2895
/branches/gui/src/orxonox/objects/CameraHandler.h:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.h:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.h:2373-2412
/branches/miniprojects/src/orxonox/CameraManager.h:2755-2825
/branches/network/src/orxonox/CameraManager.h:2357
/branches/network64/src/orxonox/CameraManager.h:2211-2356
/branches/objecthierarchy/src/orxonox/CameraManager.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/CameraManager.h:2172-2480
/branches/overlay/src/orxonox/CameraManager.h:2118-2386
/branches/physics/src/orxonox/CameraManager.h:2108-2440
/branches/physics_merge/src/orxonox/CameraManager.h:2437-2458
/branches/pickups2/src/orxonox/CameraManager.h:2108-2498
/branches/presentation/src/orxonox/CameraManager.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/CameraManager.h:2108-2260
/branches/questsystem5/src/orxonox/CameraManager.h:2777-2906
/branches/script_trigger/src/orxonox/objects/CameraHandler.h:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.h:2108-2489
/branches/weaponsystem/src/orxonox/CameraManager.h:2743-2891
/trunk/src/orxonox/CameraManager.h:2-2086
+ /branches/buildsystem2/src/orxonox/CameraManager.h:2507-2659
/branches/buildsystem3/src/orxonox/CameraManager.h:2663-2709
/branches/ceguilua/src/orxonox/objects/CameraHandler.h:1803-1809
/branches/core3/src/orxonox/objects/CameraHandler.h:1573-1740
/branches/gcc43/src/orxonox/objects/CameraHandler.h:1581
/branches/gui/src/orxonox/CameraManager.h:2796-2895
/branches/gui/src/orxonox/objects/CameraHandler.h:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.h:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.h:2373-2412
/branches/miniprojects/src/orxonox/CameraManager.h:2755-2825
/branches/network/src/orxonox/CameraManager.h:2357
/branches/network64/src/orxonox/CameraManager.h:2211-2356
/branches/objecthierarchy/src/orxonox/CameraManager.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/CameraManager.h:2172-2480
/branches/overlay/src/orxonox/CameraManager.h:2118-2386
/branches/physics/src/orxonox/CameraManager.h:2108-2440
/branches/physics_merge/src/orxonox/CameraManager.h:2437-2458
/branches/pickups/src/orxonox/CameraManager.h:2828-2916
/branches/pickups2/src/orxonox/CameraManager.h:2108-2498
/branches/presentation/src/orxonox/CameraManager.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/CameraManager.h:2108-2260
/branches/questsystem5/src/orxonox/CameraManager.h:2777-2906
/branches/script_trigger/src/orxonox/objects/CameraHandler.h:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.h:2108-2489
/branches/weaponsystem/src/orxonox/CameraManager.h:2743-2891
/trunk/src/orxonox/CameraManager.h:2-2086
Property changes on: branches/pickups2/src/orxonox/objects/Level.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/Level.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/Level.cc:2663-2709
/branches/gui/src/orxonox/objects/Level.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/Level.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/Level.cc:2755-2825
/branches/network/src/orxonox/objects/Level.cc:2357
/branches/network64/src/orxonox/objects/Level.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/Level.cc:2172-2480
/branches/physics_merge/src/orxonox/objects/Level.cc:2437-2458
/branches/presentation/src/orxonox/objects/Level.cc:2370-2653,2655-2661
/branches/questsystem5/src/orxonox/objects/Level.cc:2777-2906
/branches/weaponsystem/src/orxonox/objects/Level.cc:2743-2891
/trunk/src/orxonox/objects/Level.cc:2-2170
+ /branches/buildsystem2/src/orxonox/objects/Level.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/Level.cc:2663-2709
/branches/gui/src/orxonox/objects/Level.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/Level.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/Level.cc:2755-2825
/branches/network/src/orxonox/objects/Level.cc:2357
/branches/network64/src/orxonox/objects/Level.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/Level.cc:2172-2480
/branches/physics_merge/src/orxonox/objects/Level.cc:2437-2458
/branches/pickups/src/orxonox/objects/Level.cc:2828-2916
/branches/presentation/src/orxonox/objects/Level.cc:2370-2653,2655-2661
/branches/questsystem5/src/orxonox/objects/Level.cc:2777-2906
/branches/weaponsystem/src/orxonox/objects/Level.cc:2743-2891
/trunk/src/orxonox/objects/Level.cc:2-2170
Property changes on: branches/pickups2/src/orxonox/objects/Level.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/Level.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/Level.h:2663-2709
/branches/gui/src/orxonox/objects/Level.h:2796-2895
/branches/lodfinal/src/orxonox/objects/Level.h:2373-2412
/branches/miniprojects/src/orxonox/objects/Level.h:2755-2825
/branches/network/src/orxonox/objects/Level.h:2357
/branches/network64/src/orxonox/objects/Level.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/Level.h:2172-2480
/branches/physics_merge/src/orxonox/objects/Level.h:2437-2458
/branches/presentation/src/orxonox/objects/Level.h:2370-2653,2655-2661
/branches/questsystem5/src/orxonox/objects/Level.h:2777-2906
/branches/weaponsystem/src/orxonox/objects/Level.h:2743-2891
/trunk/src/orxonox/objects/Level.h:2-2170
+ /branches/buildsystem2/src/orxonox/objects/Level.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/Level.h:2663-2709
/branches/gui/src/orxonox/objects/Level.h:2796-2895
/branches/lodfinal/src/orxonox/objects/Level.h:2373-2412
/branches/miniprojects/src/orxonox/objects/Level.h:2755-2825
/branches/network/src/orxonox/objects/Level.h:2357
/branches/network64/src/orxonox/objects/Level.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/Level.h:2172-2480
/branches/physics_merge/src/orxonox/objects/Level.h:2437-2458
/branches/pickups/src/orxonox/objects/Level.h:2828-2916
/branches/presentation/src/orxonox/objects/Level.h:2370-2653,2655-2661
/branches/questsystem5/src/orxonox/objects/Level.h:2777-2906
/branches/weaponsystem/src/orxonox/objects/Level.h:2743-2891
/trunk/src/orxonox/objects/Level.h:2-2170
Property changes on: branches/pickups2/src/orxonox/objects/collisionshapes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/collisionshapes:2663-2709
/branches/ceguilua/src/orxonox/objects/collisionshapes:1803-1809
/branches/ceguilua/src/orxonox/objects/worldentities/collisionshapes:1803-1809
/branches/core3/src/orxonox/objects/collisionshapes:1573-1740
/branches/core3/src/orxonox/objects/worldentities/collisionshapes:1573-1740
/branches/gcc43/src/orxonox/objects/collisionshapes:1581
/branches/gcc43/src/orxonox/objects/worldentities/collisionshapes:1581
/branches/gui/src/orxonox/objects/collisionshapes:1636-1724,2796-2895
/branches/gui/src/orxonox/objects/worldentities/collisionshapes:1636-1724
/branches/input/src/orxonox/objects/collisionshapes:1630-1637
/branches/input/src/orxonox/objects/worldentities/collisionshapes:1630-1637
/branches/lodfinal/src/orxonox/objects/collisionshapes:2373-2412
/branches/miniprojects/src/orxonox/objects/collisionshapes:2755-2825
/branches/network/src/orxonox/objects/collisionshapes:2357
/branches/network64/src/orxonox/objects/collisionshapes:2211-2356
/branches/objecthierarchy/src/orxonox/objects/collisionshapes:1912-2086,2101,2111-2170
/branches/objecthierarchy/src/orxonox/objects/worldentities/collisionshapes:1912-2086,2101
/branches/objecthierarchy2/src/orxonox/objects/collisionshapes:2172-2480
/branches/overlay/src/orxonox/objects/collisionshapes:2118-2386
/branches/physics/src/orxonox/objects/collisionshapes:1913-2056,2108-2440
/branches/physics/src/orxonox/objects/worldentities/collisionshapes:1913-2056
/branches/physics_merge/src/orxonox/objects/collisionshapes:2437-2458
/branches/pickups/src/orxonox/objects/collisionshapes:1927-2087,2128
/branches/pickups/src/orxonox/objects/worldentities/collisionshapes:1927-2087
/branches/pickups2/src/orxonox/objects/collisionshapes:2108-2498
/branches/presentation/src/orxonox/objects/collisionshapes:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/collisionshapes:1895-2089
/branches/questsystem/src/orxonox/objects/worldentities/collisionshapes:1895-2089
/branches/questsystem2/src/orxonox/objects/collisionshapes:2108-2260
/branches/questsystem5/src/orxonox/objects/collisionshapes:2777-2906
/branches/script_trigger/src/orxonox/objects/collisionshapes:1296-1954,1956
/branches/script_trigger/src/orxonox/objects/worldentities/collisionshapes:1296-1954,1956
/branches/weapon/src/orxonox/objects/collisionshapes:1926-2095
/branches/weapon/src/orxonox/objects/worldentities/collisionshapes:1926-2095
/branches/weapon2/src/orxonox/objects/collisionshapes:2108-2489
/branches/weaponsystem/src/orxonox/objects/collisionshapes:2743-2891
+ /branches/buildsystem3/src/orxonox/objects/collisionshapes:2663-2709
/branches/ceguilua/src/orxonox/objects/collisionshapes:1803-1809
/branches/ceguilua/src/orxonox/objects/worldentities/collisionshapes:1803-1809
/branches/core3/src/orxonox/objects/collisionshapes:1573-1740
/branches/core3/src/orxonox/objects/worldentities/collisionshapes:1573-1740
/branches/gcc43/src/orxonox/objects/collisionshapes:1581
/branches/gcc43/src/orxonox/objects/worldentities/collisionshapes:1581
/branches/gui/src/orxonox/objects/collisionshapes:1636-1724,2796-2895
/branches/gui/src/orxonox/objects/worldentities/collisionshapes:1636-1724
/branches/input/src/orxonox/objects/collisionshapes:1630-1637
/branches/input/src/orxonox/objects/worldentities/collisionshapes:1630-1637
/branches/lodfinal/src/orxonox/objects/collisionshapes:2373-2412
/branches/miniprojects/src/orxonox/objects/collisionshapes:2755-2825
/branches/network/src/orxonox/objects/collisionshapes:2357
/branches/network64/src/orxonox/objects/collisionshapes:2211-2356
/branches/objecthierarchy/src/orxonox/objects/collisionshapes:1912-2086,2101,2111-2170
/branches/objecthierarchy/src/orxonox/objects/worldentities/collisionshapes:1912-2086,2101
/branches/objecthierarchy2/src/orxonox/objects/collisionshapes:2172-2480
/branches/overlay/src/orxonox/objects/collisionshapes:2118-2386
/branches/physics/src/orxonox/objects/collisionshapes:1913-2056,2108-2440
/branches/physics/src/orxonox/objects/worldentities/collisionshapes:1913-2056
/branches/physics_merge/src/orxonox/objects/collisionshapes:2437-2458
/branches/pickups/src/orxonox/objects/collisionshapes:1927-2087,2128,2828-2916
/branches/pickups/src/orxonox/objects/worldentities/collisionshapes:1927-2087
/branches/pickups2/src/orxonox/objects/collisionshapes:2108-2498
/branches/presentation/src/orxonox/objects/collisionshapes:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/collisionshapes:1895-2089
/branches/questsystem/src/orxonox/objects/worldentities/collisionshapes:1895-2089
/branches/questsystem2/src/orxonox/objects/collisionshapes:2108-2260
/branches/questsystem5/src/orxonox/objects/collisionshapes:2777-2906
/branches/script_trigger/src/orxonox/objects/collisionshapes:1296-1954,1956
/branches/script_trigger/src/orxonox/objects/worldentities/collisionshapes:1296-1954,1956
/branches/weapon/src/orxonox/objects/collisionshapes:1926-2095
/branches/weapon/src/orxonox/objects/worldentities/collisionshapes:1926-2095
/branches/weapon2/src/orxonox/objects/collisionshapes:2108-2489
/branches/weaponsystem/src/orxonox/objects/collisionshapes:2743-2891
Modified: branches/pickups2/src/orxonox/objects/controllers/HumanController.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/controllers/HumanController.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/controllers/HumanController.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -48,13 +48,13 @@
SetConsoleCommand(HumanController, altFire, true).keybindMode(KeybindMode::OnHold);
SetConsoleCommand(HumanController, boost, true).keybindMode(KeybindMode::OnHold);
SetConsoleCommand(HumanController, greet, true);
- SetConsoleCommand(HumanController, use, true);
SetConsoleCommand(HumanController, switchCamera, true);
SetConsoleCommand(HumanController, mouseLook, true);
SetConsoleCommand(HumanController, suicide, true);
SetConsoleCommand(HumanController, addBots, true).defaultValues(1);
SetConsoleCommand(HumanController, killBots, true).defaultValues(0);
SetConsoleCommand(HumanController, dropItems, true);
+ SetConsoleCommand(HumanController, useItem, true);
CreateUnloadableFactory(HumanController);
@@ -132,12 +132,6 @@
HumanController::localController_s->controllableEntity_->greet();
}
- void HumanController::use()
- {
- if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
- HumanController::localController_s->controllableEntity_->use();
- }
-
void HumanController::switchCamera()
{
if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
@@ -162,6 +156,12 @@
}
}
+ void HumanController::useItem()
+ {
+ if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+ HumanController::localController_s->controllableEntity_->useItem();
+ }
+
void HumanController::addBots(unsigned int amount)
{
if (HumanController::localController_s && HumanController::localController_s->controllableEntity_ && HumanController::localController_s->controllableEntity_->getGametype())
Modified: branches/pickups2/src/orxonox/objects/controllers/HumanController.h
===================================================================
--- branches/pickups2/src/orxonox/objects/controllers/HumanController.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/controllers/HumanController.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -55,10 +55,10 @@
static void boost();
static void greet();
- static void use();
static void switchCamera();
static void mouseLook();
static void dropItems();
+ static void useItem();
static void suicide();
Property changes on: branches/pickups2/src/orxonox/objects/gametypes/TeamDeathmatch.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.cc:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.cc:1803-1809
/branches/core3/src/orxonox/objects/gametypes/TeamGametype.cc:1573-1740
/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.cc:1581
/branches/gui/src/orxonox/objects/gametypes/TeamGametype.cc:1636-1724
/branches/input/src/orxonox/objects/gametypes/TeamGametype.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.cc:2373-2412
/branches/network/src/orxonox/objects/gametypes/TeamGametype.cc:2357
/branches/network64/src/orxonox/objects/gametypes/TeamGametype.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.cc:2172-2480
/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.cc:2118-2386
/branches/physics/src/orxonox/objects/gametypes/TeamGametype.cc:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.cc:2437-2458
/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.cc:1927-2087,2128
/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2498
/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.cc:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.cc:1895-2089
/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2260
/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.cc:1926-2095
/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2489
+ /branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.cc:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.cc:1803-1809
/branches/core3/src/orxonox/objects/gametypes/TeamGametype.cc:1573-1740
/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.cc:1581
/branches/gui/src/orxonox/objects/gametypes/TeamGametype.cc:1636-1724
/branches/input/src/orxonox/objects/gametypes/TeamGametype.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.cc:2373-2412
/branches/network/src/orxonox/objects/gametypes/TeamGametype.cc:2357
/branches/network64/src/orxonox/objects/gametypes/TeamGametype.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.cc:2172-2480
/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.cc:2118-2386
/branches/physics/src/orxonox/objects/gametypes/TeamGametype.cc:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.cc:2437-2458
/branches/pickups/src/orxonox/objects/gametypes/TeamDeathmatch.cc:2828-2916
/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.cc:1927-2087,2128
/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2498
/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.cc:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.cc:1895-2089
/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2260
/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.cc:1926-2095
/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.cc:2108-2489
Property changes on: branches/pickups2/src/orxonox/objects/gametypes/TeamDeathmatch.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.h:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.h:2663-2709
/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.h:1803-1809
/branches/core3/src/orxonox/objects/gametypes/TeamGametype.h:1573-1740
/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.h:1581
/branches/gui/src/orxonox/objects/gametypes/TeamGametype.h:1636-1724
/branches/input/src/orxonox/objects/gametypes/TeamGametype.h:1630-1637
/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.h:2373-2412
/branches/network/src/orxonox/objects/gametypes/TeamGametype.h:2357
/branches/network64/src/orxonox/objects/gametypes/TeamGametype.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.h:2172-2480
/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.h:2118-2386
/branches/physics/src/orxonox/objects/gametypes/TeamGametype.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.h:2437-2458
/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.h:1927-2087,2128
/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2498
/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.h:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.h:1895-2089
/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2260
/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.h:1926-2095
/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2489
+ /branches/buildsystem/src/orxonox/objects/gametypes/TeamGametype.h:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/gametypes/TeamGametype.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/gametypes/TeamGametype.h:2663-2709
/branches/ceguilua/src/orxonox/objects/gametypes/TeamGametype.h:1803-1809
/branches/core3/src/orxonox/objects/gametypes/TeamGametype.h:1573-1740
/branches/gcc43/src/orxonox/objects/gametypes/TeamGametype.h:1581
/branches/gui/src/orxonox/objects/gametypes/TeamGametype.h:1636-1724
/branches/input/src/orxonox/objects/gametypes/TeamGametype.h:1630-1637
/branches/lodfinal/src/orxonox/objects/gametypes/TeamGametype.h:2373-2412
/branches/network/src/orxonox/objects/gametypes/TeamGametype.h:2357
/branches/network64/src/orxonox/objects/gametypes/TeamGametype.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/gametypes/TeamGametype.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/gametypes/TeamGametype.h:2172-2480
/branches/overlay/src/orxonox/objects/gametypes/TeamGametype.h:2118-2386
/branches/physics/src/orxonox/objects/gametypes/TeamGametype.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/gametypes/TeamGametype.h:2437-2458
/branches/pickups/src/orxonox/objects/gametypes/TeamDeathmatch.h:2828-2916
/branches/pickups/src/orxonox/objects/gametypes/TeamGametype.h:1927-2087,2128
/branches/pickups2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2498
/branches/presentation/src/orxonox/objects/gametypes/TeamGametype.h:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/gametypes/TeamGametype.h:1895-2089
/branches/questsystem2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2260
/branches/script_trigger/src/orxonox/objects/gametypes/TeamGametype.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/gametypes/TeamGametype.h:1926-2095
/branches/weapon2/src/orxonox/objects/gametypes/TeamGametype.h:2108-2489
Modified: branches/pickups2/src/orxonox/objects/items/Engine.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/items/Engine.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/items/Engine.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -191,7 +191,7 @@
acceleration.y = direction.y * this->accelerationUpDown_ * clamp((this->maxSpeedUpDown_ - velocity.y) / this->maxSpeedUpDown_, 0.0f, 1.0f);
}
- this->ship_->setAcceleration(this->ship_->getOrientation() * acceleration);
+ this->ship_->setAcceleration(this->ship_->getPickups().processModifiers(ModifierType::Acceleration, this->ship_->getOrientation() * acceleration, false));
if (!this->ship_->getPermanentBoost())
this->ship_->setBoost(false);
Deleted: branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,78 +0,0 @@
-/* has to be added to player
- multimap<std::string, BaseItem*> Equipment;*/
-
-
-#include "OrxonoxStableHeaders.h"
-#include "BaseItem.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "util/String.h"
-#include "objects/worldentities/pawns/Pawn.h"
-
-
-namespace orxonox
-{
-BaseItem::BaseItem(BaseObject* creator) : BaseObject(creator)
-{
- RegisterObject(BaseItem);
-
- this->playerBaseClass_ = 0;
-}
-
-BaseItem::~BaseItem()
-{
-}
- void BaseItem::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(BaseItem, XMLPort, xmlelement, mode);
-
- XMLPortParam(BaseItem, "playerclass", setPlayerBaseClassName, getPlayerBaseClassName, xmlelement, mode);
- }
-
-bool BaseItem::addTo (Pawn* player)
-{
-
- return player->getPickUp().insert(this);
- /*if(checkSlot(player)==true)
- player->pickUp.Equipment.insert ( std::pair<std::string, BaseItem*>(this->getName(),this) );
- else
- COUT(3) << "swap?" << std::endl;*/
-}
-bool BaseItem::remove(Pawn* player)
-{
- /*if(player->pickUp.Equipment.find(this->getName())!= player->pickUp.Equipment.end())
- {
- std::multimap<std::string,BaseItem*>::iterator it;
- it=player->pickUp.Equipment.find(this->getName());
- player->pickUp.Equipment.erase (it);
- return true;
- }
- else
- return false;*/
- return player->getPickUp().erase(this);
-}
-bool BaseItem::checkSlot(Pawn* player)
-{
- /*std::multimap<std::string,BaseItem*>::iterator it;
- for ( it=player->getPickUp().getEquipment().begin() ; it != player->getPickUp().getEquipment().end(); it++ )
- {
- if((*it).second->playerBaseClass_==this->playerBaseClass_)
- //das isch schmarre...machs mit isExactlyA(...)
- return false;
- }
- return true;*/
- return player->getPickUp().checkSlot(this);
-}
-void BaseItem::setPlayerBaseClassName(const std::string& name)
-{
- this->playerBaseClass_ = ClassByString(name);
-}
-
-const std::string& BaseItem::getPlayerBaseClassName() const
-{
- if (this->playerBaseClass_)
- return this->playerBaseClass_->getName();
- else
- return BLANKSTRING;
-}
-}
Copied: branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc (from rev 2916, branches/pickups/src/orxonox/objects/pickup/BaseItem.cc)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,87 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of BaseItem (base-class for items/pickups).
+*/
+
+#include "BaseItem.h"
+
+#include "PickupCollection.h"
+#include "objects/worldentities/pawns/Pawn.h"
+
+namespace orxonox
+{
+ /**
+ @brief Constructor. Registers the BaseItem.
+ @param creator Pointer to the object which created this item.
+ */
+ BaseItem::BaseItem(BaseObject* creator) : BaseObject(creator)
+ {
+ RegisterObject(BaseItem);
+
+ this->setOwner(0);
+ this->setPickupIdentifier(this->getName());
+ }
+ //! Deconstructor.
+ BaseItem::~BaseItem()
+ {
+ }
+ /**
+ @brief Method to add the item to a pawn.
+ @param pawn Pawn to which the item should get added.
+ @return Returns whether the pawn's PickupCollection accepted the item.
+ */
+ bool BaseItem::addTo(Pawn* pawn)
+ {
+ this->setOwner(pawn);
+
+ if (pawn->getPickups().add(this))
+ {
+ COUT(3) << "Added '" << this->getPickupIdentifier() << "' item." << std::endl;
+ return true;
+ }
+ return false;
+ }
+ /**
+ @brief Removes the item from a pawn.
+ @param pawn Pawn from which to remove the item.
+ @return Returns whether the pawn's PickupCollection was able to locate and remove the item.
+ */
+ bool BaseItem::removeFrom(Pawn* pawn)
+ {
+ this->setOwner(0);
+
+ COUT(3) << "Removing '" << this->getPickupIdentifier() << "' item." << std::endl;
+
+ pawn->getPickups().remove(this, false);
+
+ return true;
+ }
+}
Property changes on: branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Deleted: branches/pickups2/src/orxonox/objects/pickup/BaseItem.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/BaseItem.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/BaseItem.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,37 +0,0 @@
-#ifndef _BaseItem_H__
-#define _BaseItem_H__
-
-#include "core/BaseObject.h"
-#include "OrxonoxPrereqs.h"
-
-namespace orxonox
-{
- class ShipEquipment;
-
- class _OrxonoxExport BaseItem : public BaseObject
- {
- public:
- BaseItem( BaseObject* creator);
- virtual ~BaseItem();
- bool checkSlot(Pawn* player);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
- virtual bool pickedUp(Pawn* player) { return true; }
- virtual bool dropped(Pawn* player) { return true; } //erst bei festen Items
- bool remove(Pawn* player);
- bool addTo(Pawn* player);
-
- inline void setPlayerBaseClass(Identifier* identifier)
- { this->playerBaseClass_ = identifier; }
- inline Identifier* getPlayerBaseClass() const
- { return this->playerBaseClass_; }
-
- private:
- void setPlayerBaseClassName(const std::string& name);
- const std::string& getPlayerBaseClassName() const;
-
- Identifier* playerBaseClass_;
- };
-}
-
-#endif /* _BaseItem_H__ */
Copied: branches/pickups2/src/orxonox/objects/pickup/BaseItem.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/BaseItem.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/BaseItem.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/BaseItem.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,132 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of BaseItem (base-class for items/pickups).
+*/
+
+#ifndef _BaseItem_H__
+#define _BaseItem_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "core/BaseObject.h"
+
+namespace orxonox
+{
+ /**
+ @brief
+ Base class for all items/pickups.
+
+ Provides common methods to be used in derived classes.
+ @author
+ Daniel 'Huty' Haggenmueller
+ */
+ class _OrxonoxExport BaseItem : public BaseObject
+ {
+ public:
+ BaseItem(BaseObject* creator);
+ virtual ~BaseItem();
+
+ /**
+ @brief Checks how many instances of this item can be carried at a time.
+ @return How many of this item can be carried.
+ */
+ virtual int getMaxCarryAmount() const
+ { return 1; }
+
+ bool addTo(Pawn* pawn); //!< Add the item to a pawn.
+ bool removeFrom(Pawn* pawn); //!< Removes the item from a pawn.
+ /**
+ @brief
+ Method invoked when the item gets picked up.
+
+ Has to be overridden for an item to work,
+ should contain a call to addTo().
+
+ @param pawn Pawn who picks up the item.
+ @return Returns whether the pawn was able to pick up the item.
+ */
+ virtual bool pickedUp(Pawn* pawn)
+ { return false; }
+ /**
+ @brief
+ Method invoked when the item is dropped from a player.
+
+ Should be overridden by derived classes,
+ should also contain a call to removeFrom().
+
+ @param pawn Pawn which dropped the item.
+ @return Returns whether the item was able to get dropped by the pawn.
+ */
+ virtual bool dropped(Pawn* pawn)
+ { return false; }
+
+ /**
+ @brief Gets the current owner of the pickup.
+ @return Returns the current owner.
+ */
+ inline Pawn* getOwner() const
+ { return this->owner_; }
+ /**
+ @brief Sets the owner of the pickup.
+ @param owner New owner for the pickup.
+ */
+ inline void setOwner(Pawn* owner)
+ { this->owner_ = owner; }
+
+ /**
+ @brief Gets the pickupIdentifier of the item.
+ @return Returns the pickupIdentifier of the item.
+ @see pickupIdentifier_
+ */
+ inline const std::string& getPickupIdentifier() const
+ { return this->pickupIdentifier_; }
+ /**
+ @brief Sets the pickupIdentifier for the item.
+ @param identifier New pickupIdentifier for the item.
+ @see pickupIdentifier_
+ */
+ inline void setPickupIdentifier(const std::string& identifier)
+ { this->pickupIdentifier_ = identifier; }
+ private:
+ Pawn* owner_; //!< The current owner of the item.
+
+ /**
+ @brief
+ The pickupIdentifier of the item..
+
+ Usually set to the template name used by a PickupSpawner,
+ used to index items in the PickupCollection.
+ */
+ std::string pickupIdentifier_;
+ };
+}
+
+#endif /* _BaseItem_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/BaseItem.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,6 +1,11 @@
ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ BaseItem.cc
+ DroppedItem.cc
+ EquipmentItem.cc
+ Jump.cc
+ ModifierPickup.cc
+ PassiveItem.cc
+ PickupCollection.cc
PickupSpawner.cc
- BaseItem.cc
- Turbo.cc
- ShipEquipment.cc
+ UsableItem.cc
)
Copied: branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc (from rev 2916, branches/pickups/src/orxonox/objects/pickup/DroppedItem.cc)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,93 @@
+#include "DroppedItem.h"
+
+#include "BaseItem.h"
+#include "objects/worldentities/pawns/Pawn.h"
+#include "objects/worldentities/Model.h"
+#include "objects/worldentities/Billboard.h"
+
+#include "core/CoreIncludes.h"
+#include "core/Core.h"
+
+namespace orxonox
+{
+ CreateFactory(DroppedItem);
+
+ DroppedItem::DroppedItem(BaseObject* creator) : StaticEntity(creator)
+ {
+ RegisterObject(DroppedItem);
+
+ this->triggerDistance_ = 20.0f;
+ this->timeToLive_ = 0;
+ this->item_ = 0;
+ }
+ DroppedItem::~DroppedItem()
+ {
+ }
+ void DroppedItem::tick(float dt)
+ {
+ if (this->item_)
+ {
+ for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); it++)
+ {
+ Vector3 distance = it->getWorldPosition() - this->getWorldPosition();
+ if (distance.length() < this->triggerDistance_)
+ this->trigger(*it);
+ }
+ }
+ }
+ void DroppedItem::trigger(Pawn* pawn)
+ {
+ if (this->item_->pickedUp(pawn))
+ {
+ COUT(3) << "DroppedItem '" << this->item_->getPickupIdentifier() << "' picked up." << std::endl;
+ delete this;
+ }
+ }
+ void DroppedItem::createTimer()
+ {
+ if (this->timeToLive_ > 0)
+ {
+ ExecutorMember<DroppedItem>* exec = createExecutor(createFunctor(&DroppedItem::timerCallback));
+ this->timer_.setTimer(this->timeToLive_, false, this, exec, false);
+ }
+ }
+ void DroppedItem::timerCallback()
+ {
+ if (this->item_)
+ delete this->item_;
+
+ delete this;
+ }
+
+ DroppedItem* DroppedItem::createDefaultDrop(BaseItem* item, const Vector3& position, const ColourValue& flareColour, float timeToLive)
+ {
+ DroppedItem* drop = new DroppedItem(item);
+ Model* model = new Model(item);
+ Billboard* billboard = new Billboard(item);
+
+ model->setMeshSource("sphere.mesh");
+ model->setScale(3.0f);
+
+ billboard->setMaterial("Examples/Flare");
+ billboard->setColour(flareColour);
+ billboard->setScale(0.5f);
+
+ drop->setPosition(position);
+ drop->attach(model);
+ drop->attach(billboard);
+
+ drop->setItem(item);
+
+ drop->setTimeToLive(timeToLive);
+ drop->createTimer();
+
+ COUT(3) << "Created DroppedItem for '" << item->getPickupIdentifier() << "' at (" << position.x << "," << position.y << "," << position.z << ")." << std::endl;
+
+ return drop;
+ }
+ DroppedItem* DroppedItem::createDefaultDrop(BaseItem* item, Pawn* pawn, const ColourValue& flareColour, float timeToLive)
+ {
+ Vector3 after = pawn->getPosition() + pawn->getOrientation() * Vector3(0.0f, 0.0f, 50.0f);
+ return DroppedItem::createDefaultDrop(item, after, flareColour, timeToLive);
+ }
+}
Property changes on: branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/DroppedItem.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/DroppedItem.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/DroppedItem.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/DroppedItem.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,86 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of BaseItem (base-class for items/pickups).
+*/
+
+#ifndef _DroppedItem_H__
+#define _DroppedItem_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "objects/Tickable.h"
+#include "objects/worldentities/StaticEntity.h"
+#include "tools/Timer.h"
+
+namespace orxonox
+{
+ class BaseItem;
+ class Pawn;
+
+ class _OrxonoxExport DroppedItem : public StaticEntity, public Tickable
+ {
+ public:
+ DroppedItem(BaseObject* creator);
+ virtual ~DroppedItem();
+
+ void tick(float dt);
+ void trigger(Pawn* pawn);
+
+ static DroppedItem* createDefaultDrop(BaseItem* item, const Vector3& position, const ColourValue& flareColour = ColourValue(0.5f, 1.0f, 0.3f), float timeToLive = 0);
+ static DroppedItem* createDefaultDrop(BaseItem* item, Pawn* pawn, const ColourValue& flareColour = ColourValue(0.5f, 1.0f, 0.3f), float timeToLive = 0);
+
+ void createTimer();
+ void timerCallback();
+
+ inline float getTriggerDistance() const
+ { return this->triggerDistance_; }
+ inline void setTriggerDistance(float distance)
+ { this->triggerDistance_ = distance; }
+
+ inline BaseItem* getItem() const
+ { return this->item_; }
+ inline void setItem(BaseItem* item)
+ { this->item_ = item; }
+
+ inline float getTimeToLive() const
+ { return this->timeToLive_; }
+ inline void setTimeToLive(float time)
+ { this->timeToLive_ = time; }
+ private:
+ float timeToLive_;
+ float triggerDistance_;
+ BaseItem* item_;
+
+ Timer<DroppedItem> timer_;
+ };
+}
+
+#endif /* _DroppedItem_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/DroppedItem.h
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.cc (from rev 2916, branches/pickups/src/orxonox/objects/pickup/EquipmentItem.cc)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,52 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of EquipmentItem.
+*/
+
+#include "EquipmentItem.h"
+
+#include "core/CoreIncludes.h"
+
+namespace orxonox
+{
+ /**
+ @brief Constructor. Registers the EquipmentItem.
+ @param creator Pointer to the object which created this item.
+ */
+ EquipmentItem::EquipmentItem(BaseObject* creator) : BaseItem(creator)
+ {
+ RegisterObject(EquipmentItem);
+ }
+ //! Deconstructor.
+ EquipmentItem::~EquipmentItem()
+ {
+ }
+}
Property changes on: branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/EquipmentItem.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,55 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of EquipmentItem (base-class for equipment-type items).
+*/
+
+#ifndef _EquipmentPickup_H__
+#define _EquipmentPickup_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "BaseItem.h"
+
+namespace orxonox
+{
+ /**
+ @brief Base class for all equipment-type items.
+ @author Daniel 'Huty' Haggenmueller
+ */
+ class _OrxonoxExport EquipmentItem : public BaseItem
+ {
+ public:
+ EquipmentItem(BaseObject* creator);
+ virtual ~EquipmentItem();
+ };
+}
+
+#endif /* _EquipmentPickup_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.h
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/Jump.cc (from rev 2916, branches/pickups/src/orxonox/objects/pickup/Jump.cc)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/Jump.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/Jump.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,108 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of Jump.
+*/
+
+#include "Jump.h"
+#include "DroppedItem.h"
+
+#include "objects/worldentities/pawns/Pawn.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "core/Core.h"
+
+namespace orxonox
+{
+ CreateFactory(Jump);
+
+ /**
+ @brief Constructor
+ @param creator Object that created this item.
+ */
+ Jump::Jump(BaseObject* creator) : UsableItem(creator)
+ {
+ RegisterObject(Jump);
+
+ this->velocity_ = Vector3(0.0f, 0.0f, 0.0f);
+ this->jumpsAvailable_ = 1;
+ }
+ //! Deconstructor
+ Jump::~Jump()
+ {
+ }
+ /**
+ @brief XMLPort for Jump.
+ @param xmlelement Element of the XML-file.
+ @param mode XMLPort mode to use.
+ */
+ void Jump::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(Jump, XMLPort, xmlelement, mode);
+
+ XMLPortParam(Jump, "velocity", setVelocity, getVelocity, xmlelement, mode);
+ XMLPortParam(Jump, "jumpsAvailable", setJumpsAvailable, getJumpsAvailable, xmlelement, mode);
+ }
+ /**
+ @brief Called when the item is used, makes the user "jump".
+ @param pawn Pawn which used te item.
+ */
+ void Jump::used(Pawn* pawn)
+ {
+ if (this->jumpsAvailable_ > 0){
+ pawn->setVelocity(pawn->getVelocity() + pawn->getOrientation() * this->velocity_);
+ }
+
+ this->jumpsAvailable_--;
+ if (this->jumpsAvailable_ <= 0)
+ {
+ this->removeFrom(pawn);
+ delete this;
+ }
+ }
+ /**
+ @brief Called when the item is picked up.
+ @param pawn Pawn which picked up the item.
+ */
+ bool Jump::pickedUp(Pawn* pawn)
+ {
+ return this->addTo(pawn);
+ }
+ /**
+ @brief Called when the item is dropped, creates a DroppedItem behind the pawn.
+ @param pawn Pawn which dropped the item.
+ */
+ bool Jump::dropped(Pawn* pawn)
+ {
+ DroppedItem::createDefaultDrop(this, pawn, ColourValue(1.0f, 0.0f, 0.0f), 5.0f);
+ return this->removeFrom(pawn);
+ }
+}
\ No newline at end of file
Property changes on: branches/pickups2/src/orxonox/objects/pickup/Jump.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/Jump.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/Jump.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/Jump.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/Jump.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,92 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of Jump.
+*/
+
+#ifndef _Jump_H__
+#define _Jump_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "UsableItem.h"
+#include "util/Math.h"
+
+namespace orxonox
+{
+ class Pawn;
+
+ /**
+ @brief Jump-item, enables player to "jump" into a direction.
+ */
+ class _OrxonoxExport Jump : public UsableItem
+ {
+ public:
+ Jump(BaseObject* creator); //!< Constructor
+ virtual ~Jump(); //!< Deconstructor
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< XMLPort
+
+ virtual void used(Pawn* pawn); //!< Called when the item is used.
+
+ virtual bool pickedUp(Pawn* pawn); //!< Called when the item is picked up.
+ virtual bool dropped(Pawn* pawn); //!< Called when the item is dropped.
+
+ /**
+ @brief Get the velocity added when the item is used.
+ @return Returns the added velocity (relative to the Pawn).
+ */
+ inline const Vector3& getVelocity() const
+ { return this->velocity_; }
+ /**
+ @brief Set the velocity added when the item is used.
+ @param velocity New added velocity (relative to Pawn).
+ */
+ inline void setVelocity(const Vector3& velocity)
+ { this->velocity_ = velocity; }
+ /**
+ @brief Get the amount of jumps available.
+ @return Returns how many times the item can be used.
+ */
+ inline int getJumpsAvailable() const
+ { return this->jumpsAvailable_; }
+ /**
+ @brief Set the amount of jumps available.
+ @param num New number of available jumps.
+ */
+ inline void setJumpsAvailable(int num)
+ { this->jumpsAvailable_ = num; }
+ private:
+ Vector3 velocity_; //!< The velocity added when the item is used.
+ int jumpsAvailable_; //!< Amount of jumps still available.
+ };
+}
+
+#endif /* _Jump_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/Jump.h
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.cc (from rev 2916, branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,210 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of ModifierPickup (temporary(?) pickup for testing).
+*/
+
+#include "ModifierPickup.h"
+#include "PickupCollection.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "core/Core.h"
+
+#include "objects/worldentities/pawns/Pawn.h"
+
+#include "util/Debug.h"
+
+namespace orxonox
+{
+ CreateFactory(ModifierPickup);
+
+ /**
+ @brief Constructor. Registers the ModifierPickup.
+ @param creator Pointer to the object which created this item.
+ */
+ ModifierPickup::ModifierPickup(BaseObject* creator) : PassiveItem(creator)
+ {
+ RegisterObject(ModifierPickup);
+
+ this->duration_ = 0.0f;
+ }
+ //! Deconstructor.
+ ModifierPickup::~ModifierPickup()
+ {
+ }
+ /**
+ @brief Method for loading information from a level file.
+ @param element XMLElement from which to read the data.
+ @param mode XMLPort mode to use.
+ */
+ void ModifierPickup::XMLPort(Element& element, XMLPort::Mode mode)
+ {
+ SUPER(ModifierPickup, XMLPort, element, mode);
+
+ XMLPortParam(ModifierPickup, "duration", setDuration, getDuration, element, mode);
+
+ XMLPortParamTemplate(ModifierPickup, "damageAdd", setAdditiveDamage, getAdditiveDamage, element, mode, float);
+ XMLPortParamTemplate(ModifierPickup, "damageMulti", setMultiplicativeDamage, getMultiplicativeDamage, element, mode, float);
+
+ XMLPortParamTemplate(ModifierPickup, "accelerationAdd", setAdditiveAcceleration, getAdditiveAcceleration, element, mode, float);
+ XMLPortParamTemplate(ModifierPickup, "accelerationMulti", setMultiplicativeAcceleration, getMultiplicativeAcceleration, element, mode, float);
+ }
+ /**
+ @brief
+ Invoked when a pawn picks up the pickup.
+
+ Adds the modifiers to the pawn and sets a timer (if effect is limited)
+ if the pickup could be added to the pawn's PickupCollection.
+
+ @param pawn Pawn which picked up the pickup.
+ @return Returns whether the pickup was able to be added to the pawn.
+ */
+ bool ModifierPickup::pickedUp(Pawn* pawn)
+ {
+ if (this->addTo(pawn))
+ {
+ std::map<ModifierType::Enum, float>::iterator it;
+
+ for (it = this->additiveModifiers_.begin(); it != this->additiveModifiers_.end(); it++)
+ {
+ pawn->getPickups().addAdditiveModifier((*it).first, (*it).second);
+ }
+
+ for (it = this->multiplicativeModifiers_.begin(); it != this->multiplicativeModifiers_.end(); it++)
+ {
+ pawn->getPickups().addMultiplicativeModifier((*it).first, (*it).second);
+ }
+
+ if (this->duration_ > 0.0f)
+ {
+ ExecutorMember<ModifierPickup>* executor = createExecutor(createFunctor(&ModifierPickup::timerCallback));
+ executor->setDefaultValues(pawn);
+ this->timer_.setTimer(this->duration_, false, this, executor);
+ }
+
+ return true;
+ }
+ return false;
+ }
+ /**
+ @brief
+ Invoked when a pawn drops the pickup.
+
+ Removes the modifiers from the pawn if the pickup
+ was successfully removed from it's PickupCollection.
+
+ @param pawn Pawn which dropped the pickup.
+ @return Returns whether the pickup could be removed.
+ */
+ bool ModifierPickup::dropped(Pawn* pawn)
+ {
+ if (this->removeFrom(pawn))
+ {
+ std::map<ModifierType::Enum, float>::iterator it;
+
+ for (it = this->additiveModifiers_.begin(); it != this->additiveModifiers_.end(); it++)
+ {
+ pawn->getPickups().removeAdditiveModifier((*it).first, (*it).second);
+ }
+
+ for (it = this->multiplicativeModifiers_.begin(); it != this->multiplicativeModifiers_.end(); it++)
+ {
+ pawn->getPickups().removeMultiplicativeModifier((*it).first, (*it).second);
+ }
+
+ if (this->timer_.getRemainingTime() > 0.0f)
+ this->timer_.stopTimer();
+
+ delete this;
+
+ return true;
+ }
+ return false;
+ }
+ /**
+ @brief Invoked when the timer finished, calls dropped().
+ */
+ void ModifierPickup::timerCallback(Pawn* pawn)
+ {
+ if (!this->dropped(pawn))
+ COUT(2) << "Failed to remove modifier pickup after the timer ran out!" << std::endl;
+ }
+ /**
+ @brief Gets the additive modifier of a given type.
+ @param type ModifierType for which to return the modifier.
+ @return Returns the additive modifier for type (or 0 if not exists).
+ */
+ float ModifierPickup::getAdditiveModifier(ModifierType::Enum type) const
+ {
+ std::map<ModifierType::Enum, float>::const_iterator it = this->additiveModifiers_.find(type);
+ if (it != this->additiveModifiers_.end())
+ return (*it).second;
+ else
+ return 0.0f;
+ }
+ /**
+ @brief Gets the multiplicative modifier of a given type.
+ @param type ModifierType for which to return the modifier.
+ @return Returns the multiplicative modifier for type (or 1 if not exists).
+ */
+ float ModifierPickup::getMultiplicativeModifier(ModifierType::Enum type) const
+ {
+ std::map<ModifierType::Enum, float>::const_iterator it = this->multiplicativeModifiers_.find(type);
+ if (it != this->multiplicativeModifiers_.end())
+ return (*it).second;
+ else
+ return 1.0f;
+ }
+ /**
+ @brief Gets the additive modifier of a given type.
+ @param type ModifierType for which to return the modifier.
+ @param value The new additive modifier for type.
+ */
+ void ModifierPickup::setAdditiveModifier(ModifierType::Enum type, float value)
+ {
+ if (this->additiveModifiers_.find(type) == this->additiveModifiers_.end())
+ this->additiveModifiers_.insert( std::pair<ModifierType::Enum, float>(type, value) );
+ else
+ this->additiveModifiers_[type] = value;
+ }
+ /**
+ @brief Gets the multiplicative modifier of a given type.
+ @param type ModifierType for which to return the modifier.
+ @param value The new multiplicative modifier for type.
+ */
+ void ModifierPickup::setMultiplicativeModifier(ModifierType::Enum type, float value)
+ {
+ if (this->multiplicativeModifiers_.find(type) == this->multiplicativeModifiers_.end())
+ this->multiplicativeModifiers_.insert( std::pair<ModifierType::Enum, float>(type, value) );
+ else
+ this->multiplicativeModifiers_[type] = value;
+ }
+}
Property changes on: branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/ModifierPickup.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,142 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of ModifierPickup (temporary(?) pickup for testing).
+*/
+
+#ifndef _ModifierPickup_H__
+#define _ModifierPickup_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "PassiveItem.h"
+#include "ModifierType.h"
+#include "orxonox/tools/timer.h"
+
+namespace orxonox
+{
+ /**
+ @brief Class for a (temporary) modifier effect.
+ @author Daniel 'Huty' Haggenmueller
+ */
+ class _OrxonoxExport ModifierPickup : public PassiveItem
+ {
+ public:
+ ModifierPickup(BaseObject* creator);
+ virtual ~ModifierPickup();
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< To create a ModifierPickup through the level file.
+
+ virtual bool pickedUp(Pawn* pawn); //!< Override of the BaseItem::pickedUp() method.
+ virtual bool dropped(Pawn* pawn); //!< Override of the BaseItem::dropped() method
+
+ virtual int getMaxCarryAmount(){ return INT_MAX; } //!< Allow the player to carry infinite ModPickups
+
+ /**
+ @brief Get the duration of this pickup.
+ @return Returns how long the effect holds on.
+ */
+ inline float getDuration() const
+ { return this->duration_; }
+ /**
+ @brief Set the duration of this pickup.
+ @param duration How long the effect should hold.
+ */
+ inline void setDuration(float duration)
+ { this->duration_ = duration; }
+
+ /**
+ @brief Get the amount of damage this pickup adds.
+ @return Returns how much damage this pickup adds.
+ */
+ inline float getAdditiveDamage() const
+ { return this->getAdditiveModifier(ModifierType::Damage); }
+ /**
+ @brief Get the factor by which this pickup multiplies the damage.
+ @return Returns the factor by which to multiply damage.
+ */
+ inline float getMultiplicativeDamage() const
+ { return this->getMultiplicativeModifier(ModifierType::Damage); }
+
+ /**
+ @brief Set the amount of damage this pickup adds.
+ @param value How much damage this pickup adds.
+ */
+ inline void setAdditiveDamage(float value)
+ { this->setAdditiveModifier(ModifierType::Damage, value); }
+ /**
+ @brief Set the factor by which this pickup multiplies the damage.
+ @param value Factor by which to multiply damage.
+ */
+ inline void setMultiplicativeDamage(float value)
+ { this->setMultiplicativeModifier(ModifierType::Damage, value); }
+
+ /**
+ @brief Get the amount of acceleration this pickup adds.
+ @return Returns how much acceleration this pickup adds.
+ */
+ inline float getAdditiveAcceleration() const
+ { return this->getAdditiveModifier(ModifierType::Acceleration); }
+ /**
+ @brief Get the factor by which this pickup multiplies the acceleration.
+ @return Returns the factor by which to multiply acceleration.
+ */
+ inline float getMultiplicativeAcceleration() const
+ { return this->getMultiplicativeModifier(ModifierType::Acceleration); }
+
+ /**
+ @brief Set the amount of acceleration this pickup adds.
+ @param value How much acceleration this pickup adds.
+ */
+ inline void setAdditiveAcceleration(float value)
+ { this->setAdditiveModifier(ModifierType::Acceleration, value); }
+ /**
+ @brief Set the factor by which this pickup multiplies the acceleration.
+ @param value Factor by which to multiply acceleration.
+ */
+ inline void setMultiplicativeAcceleration(float value)
+ { this->setMultiplicativeModifier(ModifierType::Acceleration, value); }
+
+ void timerCallback(Pawn* pawn); //!< Method called when the timer runs out.
+ private:
+ float getAdditiveModifier(ModifierType::Enum type) const; //!< Get the additive modifier for a given ModifierType.
+ float getMultiplicativeModifier(ModifierType::Enum type) const; //!< Get the multiplicative modifier for a given ModifierType.
+ void setAdditiveModifier(ModifierType::Enum type, float value); //!< Set the additive modifier for a given ModifierType.
+ void setMultiplicativeModifier(ModifierType::Enum type, float value); //!< Set the multiplicative modifier for a given ModifierType
+
+ std::map<ModifierType::Enum, float> additiveModifiers_; //!< Map of additive modifiers, indexed by ModifierType.
+ std::map<ModifierType::Enum, float> multiplicativeModifiers_; //!< Map of multiplicative modifiers, indexed by ModifierType.
+
+ float duration_; //!< Duration of this pickup's effect (0 for unlimited).
+ Timer<ModifierPickup> timer_; //!< Timer used if the pickup's effect has a time limit.
+ };
+}
+
+#endif /* _ModifierPickup_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/ModifierType.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/ModifierType.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ModifierType.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/ModifierType.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,53 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Contains enumeration for different types of modifiers.
+*/
+
+#ifndef _ModifierType_H__
+#define _ModifierType_H__
+
+namespace orxonox
+{
+ namespace ModifierType
+ {
+ /**
+ @brief Gives the available types for modifiers.
+ */
+ enum Enum
+ {
+ Unknown = 0,
+ Damage,
+ Acceleration
+ };
+ }
+}
+
+#endif /* _ModifierType_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/ModifierType.h
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/PassiveItem.cc (from rev 2916, branches/pickups/src/orxonox/objects/pickup/PassiveItem.cc)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PassiveItem.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/PassiveItem.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,47 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "PassiveItem.h"
+
+#include "core/CoreIncludes.h"
+
+namespace orxonox
+{
+ /**
+ @brief Constructor. Registers the PassiveItem.
+ @param creator Pointer to the object which created this item.
+ */
+ PassiveItem::PassiveItem(BaseObject* creator) : BaseItem(creator)
+ {
+ RegisterObject(PassiveItem);
+ }
+ //! Deconstructor.
+ PassiveItem::~PassiveItem()
+ {
+ }
+}
Property changes on: branches/pickups2/src/orxonox/objects/pickup/PassiveItem.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/PassiveItem.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/PassiveItem.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PassiveItem.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/PassiveItem.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,55 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of PassiveItem (base class for passive items).
+*/
+
+#ifndef _PassiveItem_H__
+#define _PassiveItem_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "BaseItem.h"
+
+namespace orxonox
+{
+ /**
+ @brief Base class for all passive items.
+ @author Daniel 'Huty' Haggenmueller
+ */
+ class _OrxonoxExport PassiveItem : public BaseItem
+ {
+ public:
+ PassiveItem(BaseObject* creator);
+ virtual ~PassiveItem();
+ };
+}
+
+#endif /* _PassiveItem_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/PassiveItem.h
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (from rev 2916, branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,361 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of PickupCollection.
+*/
+
+#include "PickupCollection.h"
+
+#include "BaseItem.h"
+#include "EquipmentItem.h"
+#include "PassiveItem.h"
+#include "UsableItem.h"
+
+#include "objects/worldentities/pawns/Pawn.h"
+
+namespace orxonox
+{
+ //! Constructor
+ PickupCollection::PickupCollection()
+ {
+ this->bBlockRemovals_ = false;
+ }
+
+ /**
+ @brief
+ Add an item to the collection.
+
+ Only adds the item if there's a free slot for it.
+
+ @param item Item to add to the collection.
+ @return Returns whether the item has been added to the collection.
+ */
+ bool PickupCollection::add(BaseItem* item)
+ {
+ if (this->checkSlot(item))
+ {
+ this->items_.insert( std::pair<std::string, BaseItem*> (item->getPickupIdentifier(), item) );
+ return true;
+ }
+ else
+ return false;
+ }
+ /**
+ @brief
+ Check if there's a free slot for an item.
+
+ Compares the amount of the item-type in the collection
+ against the maximal amount of the item that can be carried.
+
+ @param item Item to check for a slot.
+ @return Returns if there's a free slot for the item.
+ */
+ bool PickupCollection::checkSlot(BaseItem* item)
+ {
+ return (this->items_.count(item->getPickupIdentifier()) < item->getMaxCarryAmount());
+ }
+ /**
+ @brief
+ Empty the collection.
+
+ Calls dropped() on all the items in the collection,
+ then clears the collection.
+ */
+ void PickupCollection::clear()
+ {
+ this->bBlockRemovals_ = true;
+ for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
+ {
+ if((*it).second && (*it).second->getOwner())
+ (*it).second->dropped((*it).second->getOwner());
+ }
+ this->items_.clear();
+ this->bBlockRemovals_ = false;
+ }
+ /**
+ @brief Check if an item/type of item is in the collection.
+ @param item Item to check.
+ @param anyOfType If it should look for any item of the item's type (default: false).
+ @return Whether the collection contains the item/type of item.
+ */
+ bool PickupCollection::contains(BaseItem* item, bool anyOfType)
+ {
+ if (anyOfType)
+ {
+ return (this->items_.count(item->getPickupIdentifier()) > 0);
+ }
+ else
+ {
+ std::multimap<std::string, BaseItem*>::_Pairii bounds = this->items_.equal_range(item->getPickupIdentifier());
+ for (std::multimap<std::string, BaseItem*>::iterator it = bounds.first; it != bounds.second && it != this->items_.end(); it++)
+ {
+ if ((*it).second == item)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+ //! Uses the first usable item in the collection on the owner.
+ void PickupCollection::useItem()
+ {
+ Identifier* ident = Class(UsableItem);
+ for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
+ {
+ if ((*it).second->isA(ident))
+ {
+ UsableItem* asUsable = dynamic_cast<UsableItem*>((*it).second);
+ asUsable->used(this->owner_);
+ return;
+ }
+ }
+ }
+ /**
+ @brief Uses a usable item on the owner of the collection.
+ @param item Item to use.
+ */
+ void PickupCollection::useItem(UsableItem* item)
+ {
+ if (item && this->owner_)
+ item->used(this->owner_);
+ }
+ /**
+ @brief Remove an item/all of a type from the collection.
+ @param item Item to remove.
+ @param removeAllOfType Whether to remove all the items with the item's type (default: false).
+ */
+ void PickupCollection::remove(BaseItem* item, bool removeAllOfType)
+ {
+ if (!item || !this->contains(item, removeAllOfType) || this->bBlockRemovals_)
+ return;
+
+ if (removeAllOfType)
+ {
+ std::multimap<std::string, BaseItem*>::iterator it;
+ while ((it = this->items_.find(item->getPickupIdentifier())) != this->items_.end())
+ {
+ this->items_.erase(it);
+ }
+ }
+ else
+ {
+ std::multimap<std::string, BaseItem*>::_Pairii bounds = this->items_.equal_range(item->getPickupIdentifier());
+ for (std::multimap<std::string, BaseItem*>::iterator it = bounds.first; it != bounds.second && it != this->items_.end(); it++)
+ {
+ if ((*it).second == item)
+ {
+ this->items_.erase(it);
+ return;
+ }
+ }
+ }
+ }
+ /**
+ @brief Add an additive modifier.
+ @param type ModifierType to add.
+ @param value Value for the modifier.
+ */
+ void PickupCollection::addAdditiveModifier(ModifierType::Enum type, float value)
+ {
+ this->additiveModifiers_.insert( std::pair<ModifierType::Enum, float>(type, value) );
+ }
+ /**
+ @brief Get the total amount of an additive modifier.
+ @param type Type for which to get the total.
+ @return Returns the sum of the additive modifiers of the type.
+ */
+ float PickupCollection::getAdditiveModifier(ModifierType::Enum type)
+ {
+ float v = 0.0f;
+
+ std::multimap<ModifierType::Enum, float>::_Pairii range = this->additiveModifiers_.equal_range(type);
+
+ for (std::multimap<ModifierType::Enum, float>::iterator it = range.first; it != range.second && it != this->additiveModifiers_.end(); it++)
+ {
+ v += (*it).second;
+ }
+
+ return v;
+ }
+ /**
+ @brief Remove an additive modifier.
+ @param type Type of modifier.
+ @param value Value which is to be removed.
+ */
+ void PickupCollection::removeAdditiveModifier(ModifierType::Enum type, float value)
+ {
+ std::multimap<ModifierType::Enum, float>::_Pairii range = this->additiveModifiers_.equal_range(type);
+ for (std::multimap<ModifierType::Enum, float>::iterator it = range.first; it != range.second && it != this->additiveModifiers_.end(); it++)
+ {
+ if ((*it).second == value)
+ {
+ this->additiveModifiers_.erase(it);
+ return;
+ }
+ }
+ }
+ /**
+ @brief Add a multiplicative modifier.
+ @param type ModifierType to add.
+ @param value Value for the modifier.
+ */
+ void PickupCollection::addMultiplicativeModifier(ModifierType::Enum type, float value)
+ {
+ this->multiplicativeModifiers_.insert( std::pair<ModifierType::Enum, float>(type, value) );
+ }
+ /**
+ @brief Get the total amount of a multiplicative modifier.
+ @param type Type for which to get the total.
+ @return Returns the product of the multiplicative modifiers of the type.
+ */
+ float PickupCollection::getMultiplicativeModifier(ModifierType::Enum type)
+ {
+ float v = 1.0f;
+
+ std::multimap<ModifierType::Enum, float>::_Pairii range = this->multiplicativeModifiers_.equal_range(type);
+ for (std::multimap<ModifierType::Enum, float>::iterator it = range.first; it != range.second && it != this->multiplicativeModifiers_.end(); it++)
+ {
+ v *= (*it).second;
+ }
+
+ return v;
+ }
+ /**
+ @brief Remove a multiplicative modifier.
+ @param type Type of modifier.
+ @param value Value which is to be removed.
+ */
+ void PickupCollection::removeMultiplicativeModifier(ModifierType::Enum type, float value)
+ {
+ std::multimap<ModifierType::Enum, float>::_Pairii range = this->multiplicativeModifiers_.equal_range(type);
+ for (std::multimap<ModifierType::Enum, float>::iterator it = range.first; it != range.second && it != this->multiplicativeModifiers_.end(); it++)
+ {
+ if ((*it).second == value)
+ {
+ this->multiplicativeModifiers_.erase(it);
+ return;
+ }
+ }
+ }
+ /**
+ @brief Applies modifiers to a float.
+ @param type Type of modifier tp apply.
+ @param inputValue Value which is to be processed.
+ @param addBeforeMultiplication Whether to apply the additive modifier before the multiplicative one (default: false).
+ @return Returns the value after being processed.
+ */
+ float PickupCollection::processModifiers(ModifierType::Enum type, float inputValue, bool addBeforeMultiplication)
+ {
+ float outputValue = inputValue;
+
+ if (addBeforeMultiplication)
+ outputValue += this->getAdditiveModifier(type);
+
+ outputValue *= this->getMultiplicativeModifier(type);
+
+ if (!addBeforeMultiplication)
+ outputValue += this->getAdditiveModifier(type);
+
+ return outputValue;
+ }
+ /**
+ @brief Applies modifiers to a Vector3.
+ @param type Type of modifier tp apply.
+ @param inputValue Value which is to be processed.
+ @param addBeforeMultiplication Whether to apply the additive modifier before the multiplicative one (default: false).
+ @return Returns the value after being processed.
+ */
+ Vector3 PickupCollection::processModifiers(ModifierType::Enum type, Vector3 inputValue, bool addBeforeMultiplication)
+ {
+ Vector3 outputValue = inputValue;
+
+ if (addBeforeMultiplication)
+ outputValue += Vector3(this->getAdditiveModifier(type));
+
+ outputValue *= this->getMultiplicativeModifier(type);
+
+ if (!addBeforeMultiplication)
+ outputValue += Vector3(this->getAdditiveModifier(type));
+
+ return outputValue;
+ }
+ /**
+ @brief Get a list of equipment-type items.
+ @return Returns a list of all the equipment-type items in the collection.
+ */
+ std::set<BaseItem*> PickupCollection::getEquipmentItems()
+ {
+ std::set<BaseItem*> ret;
+ Identifier* ident = Class(EquipmentItem);
+
+ for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
+ {
+ if ((*it).second->isA(ident))
+ ret.insert((*it).second);
+ }
+
+ return ret;
+ }
+ /**
+ @brief Get a list of passive items.
+ @return Returns a list of all the passive items in the collection.
+ */
+ std::set<BaseItem*> PickupCollection::getPassiveItems()
+ {
+ std::set<BaseItem*> ret;
+ Identifier* ident = Class(PassiveItem);
+
+ for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
+ {
+ if ((*it).second->isA(ident))
+ ret.insert((*it).second);
+ }
+
+ return ret;
+ }
+ /**
+ @brief Get a list of usable items.
+ @return Returns a list of all the usable items in the collection.
+ */
+ std::set<BaseItem*> PickupCollection::getUsableItems()
+ {
+ std::set<BaseItem*> ret;
+ Identifier* ident = Class(UsableItem);
+
+ for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
+ {
+ if ((*it).second->isA(ident))
+ ret.insert((*it).second);
+ }
+
+ return ret;
+ }
+}
Property changes on: branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/PickupCollection.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,121 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of PickupCollection.
+*/
+
+#ifndef _PickupCollection_H__
+#define _PickupCollection_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <map>
+#include <set>
+#include <string>
+
+#include "util/Math.h"
+
+#include "ModifierType.h"
+
+namespace orxonox
+{
+ class BaseItem;
+ class UsableItem;
+ class Pawn;
+
+ /**
+ @brief PickupCollection for organising items.
+ @author Daniel 'Huty' Haggenmueller
+ */
+ class _OrxonoxExport PickupCollection
+ {
+ public:
+ PickupCollection();
+
+ bool add(BaseItem* item); //!< Add an item to the collection.
+
+ bool checkSlot(BaseItem* item); //!< Check if there's a free slot in the collection for an item.
+
+ void clear(); //!< Empty the collection
+ bool contains(BaseItem* item, bool anyOfType = false); //!< Check if the collection contains an item.
+
+ void remove(BaseItem* item, bool removeAllOfType = false); //!< Remove an item from the collection.
+
+ void useItem(); //!< Use the first usable item.
+ void useItem(UsableItem* item); //!< Use a usable item.
+
+ void addAdditiveModifier(ModifierType::Enum type, float value); //!< Add an additive modifier.
+ void addMultiplicativeModifier(ModifierType::Enum type, float value); //!< Add a multiplicative modifier.
+
+ float getAdditiveModifier(ModifierType::Enum type); //!< Get total additive modifier.
+ float getMultiplicativeModifier(ModifierType::Enum type); //!< Get total multiplicative modifier.
+
+ void removeAdditiveModifier(ModifierType::Enum type, float value); //!< Remove an additive modifier.
+ void removeMultiplicativeModifier(ModifierType::Enum type, float value); //!< Remove a multiplicative modifier.
+
+ float processModifiers(ModifierType::Enum type, float inputValue, bool addBeforeMultiplication = false); //!< Apply the modifiers to a float.
+ Vector3 processModifiers(ModifierType::Enum type, Vector3 inputValue, bool addBeforeMultiplication = false); //!< Apply the modifiers to a Vector3.
+
+ /**
+ @brief Get the map of contained items.
+ @return The map of items.
+ */
+ std::multimap<std::string, BaseItem*> getItems() const
+ { return this->items_; }
+
+ /**
+ @brief Get the owner of the PickupCollection.
+ @return Returns the pawn which owns the PickupCollection.
+ */
+ inline Pawn* getOwner() const
+ { return this->owner_; }
+ /**
+ @brief Set the owner of the PickupCollection.
+ @param owner The new Pawn which owns the PickupCollection.
+ */
+ inline void setOwner(Pawn* owner)
+ { this->owner_ = owner; }
+
+ std::set<BaseItem*> getEquipmentItems(); //!< Get a list of equipment-type items.
+ std::set<BaseItem*> getPassiveItems(); //!< Get a list of passive items.
+ std::set<BaseItem*> getUsableItems(); //!< Get a list of usable items.
+ private:
+ Pawn* owner_; //!< The owner of the PickupCollection.
+
+ bool bBlockRemovals_; //!< Whether to block direct removals through remove().
+
+ std::multimap<ModifierType::Enum, float> additiveModifiers_; //!< Contains additive modifiers (indexed by ModifierType).
+ std::multimap<ModifierType::Enum, float> multiplicativeModifiers_; //!< Contains multiplicative modifiers (indexed by ModifierType).
+
+ std::multimap<std::string, BaseItem*> items_; //!< Map of items in the collection (indexed by pickupIdentifier of the items).
+ };
+}
+
+#endif /* _PickupCollection_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h
___________________________________________________________________
Added: svn:eol-style
+ native
Deleted: branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,121 +0,0 @@
-#include "OrxonoxStableHeaders.h"
-#include "PickupSpawner.h"
-#include "BaseItem.h"
-#include "objects/worldentities/pawns/Pawn.h"
-#include "objects/worldentities/triggers/DistanceTrigger.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "core/Template.h"
-
-namespace orxonox
-{
-CreateFactory(PickupSpawner);
-
-PickupSpawner::PickupSpawner(BaseObject* creator) : StaticEntity(creator)
-{
- RegisterObject(PickupSpawner);
-
- this->template_ = 0;
- this->distance_ = 20;
- this->respawntimer_= 0;
-}
-
-PickupSpawner::~PickupSpawner()
-{
-}
-
-void PickupSpawner::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-{
- SUPER(PickupSpawner, XMLPort, xmlelement, mode);
-
- XMLPortParam(PickupSpawner, "item", setItemTemplate, getItemTemplate, xmlelement, mode);
- XMLPortParam(PickupSpawner, "distance", setDistance, getDistance, xmlelement, mode).defaultValues(20.0f);
- XMLPortParam(PickupSpawner, "respawntimer", setRespawnTimer, getRespawnTimer, xmlelement, mode);
-
-}
-
-void PickupSpawner::tick(float dt)
-{
- if (this->isActive())
- {
- for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
- {
- Vector3 distanceVec = it->getWorldPosition() - this->getWorldPosition();
- if (distanceVec.length() < this->distance_)
- this->triggering(*it);
- }
- }
-}
-
-void PickupSpawner::setItemTemplate(const std::string& itemtemplate)
-{
- this->itemtemplate_ = itemtemplate;
- this->template_ = Template::getTemplate(itemtemplate);
-}
-
-void PickupSpawner::triggering(Pawn* player)
-{
- if (this->isActive() && this->template_ && this->template_->getBaseclassIdentifier())
- {
- COUT(0) << "ITEM PICKED UP" << std::endl;
- //if(player->isA(itemtemplate_->getPlayerBaseClass()))
- {
- BaseObject* newobject = this->template_->getBaseclassIdentifier()->fabricate(this);
- BaseItem* newitem = dynamic_cast<BaseItem*>(newobject);
- if (newitem)
- {
- newitem->addTemplate(this->itemtemplate_);
- if (newitem->pickedUp(player)== true)
- {
- if(respawntimer_!=0)
- this->triggerRespawnTimer();
- this->setActive(false);
- this->fireEvent();
- }
- else
- delete newobject;
- }
- }
- //else
- // delete newobject;
- }
-}
-
-void PickupSpawner::triggerRespawnTimer()
-{
-
- if(respawntimer_!=0)
- {
- ExecutorMember<BaseObject>* executor = createExecutor(createFunctor(&BaseObject::setActive));
- executor->setDefaultValues(true);
- RespawnTimer_.setTimer(this->respawntimer_, false, this, executor);
- COUT(0) << "TIMER SET" << std::endl;
- }
-}
-void PickupSpawner::changedActivity()
-{
-/*
- COUT(0) << "Visble?" << std::endl;
- if(isActive())
- {
- setVisible(true);
- COUT(0) << "Visble!" << std::endl;
- }
- if(isActive()==false)
- {
- setVisible(false);
- COUT(0) << "INvisble!" << std::endl;
- }
-
-*/
- SUPER(PickupSpawner, changedActivity);
-
- for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); ++it)
- (*it)->setVisible(this->isActive());
-}
-
-
-}
-
-
-
Copied: branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc (from rev 2916, branches/pickups/src/orxonox/objects/pickup/PickupSpawner.cc)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,159 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of PickupSpawner.
+*/
+
+#include "PickupSpawner.h"
+#include "BaseItem.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "core/Template.h"
+
+#include "objects/worldentities/pawns/Pawn.h"
+#include "objects/worldentities/triggers/DistanceTrigger.h"
+
+namespace orxonox
+{
+ CreateFactory(PickupSpawner);
+
+ /**
+ @brief Constructor. Registers the PickupSpawner.
+ @param creator Pointer to the object which created this item.
+ */
+ PickupSpawner::PickupSpawner(BaseObject* creator) : StaticEntity(creator)
+ {
+ RegisterObject(PickupSpawner);
+
+ this->itemTemplate_ = 0;
+ this->triggerDistance_ = 20;
+ this->respawnTime_ = 0.0f;
+ }
+ //! Deconstructor.
+ PickupSpawner::~PickupSpawner()
+ {
+ }
+ /**
+ @brief Method for creating a PickupSpawner through XML.
+ @param xmlelement XML element which contains the PickupSpawner.
+ @param mode XMLPort mode.
+ */
+ void PickupSpawner::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(PickupSpawner, XMLPort, xmlelement, mode);
+
+ XMLPortParam(PickupSpawner, "item", setItemTemplateName, getItemTemplateName, xmlelement, mode);
+ XMLPortParam(PickupSpawner, "triggerDistance", setTriggerDistance, getTriggerDistance, xmlelement, mode);
+ XMLPortParam(PickupSpawner, "respawnTime", setRespawnTime, getRespawnTime, xmlelement, mode);
+ }
+ /**
+ @brief Invoked when the activity has changed. Sets visibility of attached objects.
+ */
+ void PickupSpawner::changedActivity()
+ {
+ SUPER(PickupSpawner, changedActivity);
+
+ for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
+ (*it)->setVisible(this->isActive());
+ }
+ /**
+ @brief Set the template name of the item to spawn, also loads the template.
+ @param name Name of the new template.
+ */
+ void PickupSpawner::setItemTemplateName(const std::string& name)
+ {
+ this->itemTemplateName_ = name;
+ this->itemTemplate_ = Template::getTemplate(name);
+ }
+ /**
+ @brief Tick, checks if any Pawn is close enough to trigger.
+ @param dt Time since last tick.
+ */
+ void PickupSpawner::tick(float dt)
+ {
+ if (this->isActive())
+ {
+ for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); it++)
+ {
+ Vector3 distance = it->getWorldPosition() - this->getWorldPosition();
+ if (distance.length() < this->triggerDistance_)
+ this->trigger(*it);
+ }
+ }
+ }
+ /**
+ @brief
+ Trigger the PickupSpawner.
+
+ Adds the pickup to the Pawn that triggered,
+ sets the timer to re-activate and deactives the PickupSpawner.
+
+ @param pawn Pawn which triggered the PickupSpawner.
+ */
+ void PickupSpawner::trigger(Pawn* pawn)
+ {
+ if (this->isActive() && this->itemTemplate_ && this->itemTemplate_->getBaseclassIdentifier())
+ {
+ BaseObject* newObject = this->itemTemplate_->getBaseclassIdentifier()->fabricate(this);
+ BaseItem* asItem = dynamic_cast<BaseItem*>(newObject);
+ if (asItem)
+ {
+ asItem->setPickupIdentifier(this->itemTemplateName_);
+ asItem->addTemplate(this->itemTemplate_);
+
+ if (asItem->pickedUp(pawn))
+ {
+ COUT(3) << this->itemTemplateName_ << " got picked up." << std::endl;
+
+ if (this->respawnTime_ > 0.0f)
+ {
+ ExecutorMember<PickupSpawner>* executor = createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback));
+ this->respawnTimer_.setTimer(this->respawnTime_, false, this, executor);
+
+ this->setActive(false);
+ this->fireEvent();
+ }
+ }
+ else
+ delete newObject;
+ }
+ }
+ }
+ /**
+ @brief Invoked by the timer, re-activates the PickupSpawner.
+ */
+ void PickupSpawner::respawnTimerCallback()
+ {
+ COUT(3) << "PickupSpawner reactivated." << std::endl;
+
+ this->setActive(true);
+ }
+}
Property changes on: branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Deleted: branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,67 +0,0 @@
-#ifndef _PickupSpawner_H__
-#define _PickupSpawner_H__
-
-#include "OrxonoxPrereqs.h"
-#include "BaseItem.h"
-#include "tools/Timer.h"
-#include "objects/worldentities/StaticEntity.h"
-#include "objects/Tickable.h"
-
-namespace orxonox
-{
- class _OrxonoxExport PickupSpawner : public StaticEntity, public Tickable
- {
- public:
- PickupSpawner(BaseObject* creator);
- virtual ~PickupSpawner();
- virtual void changedActivity();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void triggering(Pawn* trigger); // Wenn ein Spieler in die Naehe kommt
- void triggerRespawnTimer();
-
- /*inline void setVisibility(bool visible)
- { this->setActive(visible); }
- inline float getVisibility() const
- { return this->isActive(); }*/
-
- void setItemTemplate(const std::string& itemtemplate);
- inline const std::string& getItemTemplate() const
- { return this->itemtemplate_; }
-
- inline void setDistance(float distance)
- { this->distance_ = distance; }
- inline float getDistance() const
- { return this->distance_; }
- inline void setRespawnTimer (float respawntimer)
- { this->respawntimer_ = respawntimer; }
- inline float getRespawnTimer() const
- { return this->respawntimer_; }
-
- private:
- std::string itemtemplate_;
- Template* template_;
- float distance_;
- float respawntimer_;
- Timer<BaseObject> RespawnTimer_;
- };
-}
-
-#endif /* _PickupSpawner_H__ */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Copied: branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/PickupSpawner.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,116 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of PickupSpawner.
+*/
+
+#ifndef _PickupSpawner_H__
+#define _PickupSpawner_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "core/BaseObject.h"
+#include "objects/Tickable.h"
+#include "objects/worldentities/StaticEntity.h"
+#include "tools/timer.h"
+
+namespace orxonox
+{
+ class BaseItem;
+
+ /**
+ @brief PickupSpawner.
+ @author Daniel 'Huty' Haggenmueller
+ */
+ class _OrxonoxExport PickupSpawner : public StaticEntity, public Tickable
+ {
+ public:
+ PickupSpawner(BaseObject* creator);
+ virtual ~PickupSpawner();
+
+ virtual void changedActivity(); //!< Invoked when activity has changed (set visibilty).
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PickupSpawner through XML.
+ virtual void tick(float dt);
+
+ void trigger(Pawn* pawn); //!< Method called when a Pawn is close enough.
+ void respawnTimerCallback(); //!< Method called when the timer runs out.
+
+ /**
+ @brief Get the template name for the item to spawn.
+ @return Returns the name of the template of the item to spawn.
+ */
+ inline const std::string& getItemTemplateName() const
+ { return this->itemTemplateName_; }
+ void setItemTemplateName(const std::string& name); //!< Set the template name of the item to spawn.
+
+ /**
+ @brief Get the template for the item to spawn.
+ @return Returns the template of the item to spawn.
+ */
+ inline Template* getItemTemplate() const
+ { return this->itemTemplate_; }
+
+ /**
+ @brief Get the distance in which to trigger.
+ @return Returns the distance in which this gets triggered.
+ */
+ inline float getTriggerDistance() const
+ { return this->triggerDistance_; }
+ /**
+ @brief Set the distance in which to trigger.
+ @param value The new distance in which to trigger.
+ */
+ inline void setTriggerDistance(float value)
+ { this->triggerDistance_ = value; }
+
+ /**
+ @brief Get the time to respawn.
+ @returns Returns the time after which this gets re-actived.
+ */
+ inline float getRespawnTime() const
+ { return this->respawnTime_; }
+ /**
+ @brief Set the time to respawn.
+ @param time New time after which this gets re-actived.
+ */
+ inline void setRespawnTime(float time)
+ { this->respawnTime_ = time; }
+ private:
+ std::string itemTemplateName_; //!< Template name of the item to spawn.
+ Template* itemTemplate_; //!< Template of the item to spawn.
+
+ float triggerDistance_; //!< Distance in which this gets triggered.
+
+ float respawnTime_; //!< Time after which this gets re-actived.
+ Timer<PickupSpawner> respawnTimer_; //!< Timer used for re-activating.
+ };
+}
+
+#endif /* _PickupSpawner_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h
___________________________________________________________________
Added: svn:eol-style
+ native
Deleted: branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,98 +0,0 @@
-#include "OrxonoxStableHeaders.h"
-#include "BaseItem.h"
-#include "ShipEquipment.h"
-#include "objects/worldentities/pawns/Pawn.h"
-
-
-namespace orxonox
-{
-/**
- at brief
- Insert a permanent Item to the Equipment. Is usually called by the addTo function in Items.
-
- at param item
- pointer to the item which is to be inserted.
-
- at return
- if new item has sucessfully been added it will return true, in any other case the return value is false.
-*/
- bool ShipEquipment::insert(BaseItem* item)
- {
- if(checkSlot(item)==NULL)
- {
- Equipment.insert ( std::pair<std::string, BaseItem*>(item->getName(),item) );
- return true;
- }
- else
- {
- COUT(3) << "SWAP?" << endl;
- //Abfrage- irgendne ifschleife...
- if((checkSlot(item)->dropped(player))==true)
- {
- Equipment.insert ( std::pair<std::string, BaseItem*>(item->getName(),item) );
- COUT(3) << "SWAPPED!" << endl;
- return true;
- }
- return false;
- }
-
- return false;
- };
-
-/**
- at brief
- Erases a permanent Item in the Equipment. Is usually called by the remove/dropped function in Items.
-
- at param item
- pointer to the item which is to be erased.
-
- at return
- if new item has sucessfully been erased it will return true, in any other case the return value is false.
-*/
- bool ShipEquipment::erase (BaseItem* item)
- {
- std::multimap<std::string,BaseItem*>::iterator it = Equipment.find(item->getName());
- if(it != Equipment.end())
- {
- Equipment.erase (it);
- return true;
- }
- return false;
- };
- /*void print(std::multimap<std::string, BaseItem*> eut)
- {
- std::multimap<std::string,BaseItem*>::iterator it;
- COUT(3) << "Liste:" << endl;
- for ( it=eut.begin() ; it != eut.end(); ++it )
- COUT(3) << (*it).first << endl;
-
- }*/
-/**
- at brief
- Erases all permanent Items in the Equipment. Its Triggered by hitting the L button.
-
-*/
- void ShipEquipment::eraseAll()
- {
- //print(Equipment);
- for (std::multimap<std::string,BaseItem*>::iterator it = Equipment.begin(); it != Equipment.end(); )
- {
-
- (it++)->second->dropped(this->getPlayer());
- }
- //print(Equipment);
- }
-
- BaseItem* ShipEquipment::checkSlot(BaseItem* item)
- {
- std::multimap<std::string,BaseItem*>::iterator it;
- for ( it= getPlayer()->getPickUp().getEquipment().begin() ; it != getPlayer()->getPickUp().getEquipment().end(); it++ )
- {
- //if((*it).second->getPlayerBaseClass()==item->getPlayerBaseClass())
- if(item->isExactlyA((*it).second->getIdentifier()))
- return (*it).second;
- }
- return NULL;
- };
-
-}
Deleted: branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,66 +0,0 @@
-#ifndef _ShipEquipment_H__
-#define _ShipEquipment_H__
-#include <string>
-#include <map>
-
-/*
-multimap<std::string, BaseItem*> equipment_;
-equipment_.insert(pair<std::string, BaseItem*>("Weapon", new BaseItem()));*/
-
-
-/* std::map<std::itemtype, BaseItem*> EQClasses;
- EQClasses["jacke"] = 0;
- BaseItem* item = itemMap_["jacke"];
-
- if (itemMap_["jacke"])
- if (itemMap_.find("jacke") != itemMap_.end()) */
-namespace orxonox
-{
- class BaseItem;
-/**
- at brief
- ShipEquipment is the inventory of a player. It's part of the Pawn class.
-
-*/
- class _OrxonoxExport ShipEquipment
- {
- public:
- inline int getSpace()
- {
- return Usable.size()+Trunk.size();
- };
- bool insert(BaseItem* item);
- bool erase (BaseItem* item);
- //void print(std::multimap<std::string, BaseItem*> eut);
- void eraseAll();
- //bool checkSlot(BaseItem* item);
- BaseItem* checkSlot(BaseItem* item);
-// const std::multimap<std::string, BaseItem*>& getEquipment() const { return this->Equipment; }
- inline std::multimap<std::string, BaseItem*>& getEquipment() {return this->Equipment;}
- inline std::multimap<std::string, BaseItem*>& getUsable() {return this->Usable;}
- inline std::multimap<std::string, BaseItem*>& getTrunk() {return this->Trunk;}
- inline Pawn* getPlayer() {return this->player ;}
- inline void setPlayer(Pawn* setplayer)
- {this->player = setplayer;}
- private:
- Pawn* player;//!< Is a pointer to the belonging player
- std::multimap<std::string, BaseItem*> Equipment;//!< the Equipment for permanent Items
- std::multimap<std::string, BaseItem*> Usable;//!< Where Usables are stored
- std::multimap<std::string, BaseItem*> Trunk;//!< Every other Item is stored here
- };
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#endif
Deleted: branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,136 +0,0 @@
-namespace orxonox
-{
- const int maxweapons_ =2; //Weaponslots (provisorisch)
- const int maxslots_= 50; //Inventoryslots (provisorisch)
-
-
- bool ShipEquipment::CheckifSpace()
- {
- if((Usable.size()+Trunk.size())>=maxslots_)
- return false;
- return true;
- }
-
- /* Checks if the Ship can pick an Item up. Permanents will give a "false" back unless the Ship doesnt carry a Item for that Slot (2 Weaponslots) yet.Others will be picked up unless there is no Space in the Trunk.*/
-
- bool ShipEquipment::CheckifValid(Shipitem* toBeChecked)
- {
- switch(toBeChecked.CheckType())
- {
- case Powerups:
- activatePowerUp(); //gibts noch nicht
- return true;
- case Permanent:
- switch (toBeChecked.CheckSubType())
- {
- case Weapon:
- int weaponcheck=0;
- multimap<string, ShipItem*>::iterator it;
- for ( it=Equipment.begin() ; it != Equipment.end(); it++ ){
- if((*it).second->CheckSubType()==Weapon)
- weaponcheck++;
- };
- if (weaponcheck>=maxweapons_){
- weaponcheck=0;
- return false;
- }
- break;
- case Thrusters:
- multimap<string, ShipItem*>::iterator it;
- for ( it=Equipment.begin() ; it != Equipment.end(); it++ ){
- if((*it).second->CheckSubType()==Thrusters)
- return false;
- }
- break;
- case Shields:
- multimap<string, ShipItem*>::iterator it;
- for ( it=Equipment.begin() ; it != Equipment.end(); it++ ){
- if((*it).second->CheckSubType()==Shields)
- return false;
- }
- break;
- case Armor:
- multimap<string, ShipItem*>::iterator it;
- for ( it=Equipment.begin() ; it != Equipment.end(); it++ ){
- if((*it).second->CheckSubType()==Armor)
- return false;
- }
- break;
- }
- case Useable:
- return CheckifSpace();
- }
- return true;
- }
-
- /*Adds the Item to the Ship*/
- void ShipEquipment::AddItem(ShipItem* toAddItem)
- {
- if(CheckifValid(toAddItem)==true)
- {
- switch(toAddItem.CheckType())
- {
- case Permanent:
- Equipment.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,*toAddItem) );
- break;
- case Usable:
- Usable.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,*toAddItem) );
- break;
- case Trunk:
- Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,*toAddItem) );
- break;
- }
- }
- else if(toAddItem.CheckType()==Permanent)
- {
- if(CheckifSpace()==true)
- Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,*toAddItem) );
- }
- }
-
- /*Adds the Item to the Ship*/
- void ShipEquipment::AddItem(Shipitem* toAddItem)
- {
- if(CheckifValid(toAddItem)==true)
- {
- switch(toAddItem.CheckType()){
- case Permanent:
- Equipment.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
- break;
- case Usable:
- Usable.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
- break;
- case Trunk:
- Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
- break;
- }
- }
- else if(toAddItem.CheckType()==Permanent)
- {
- if(CheckifSpace()==true)
- Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
- }
- }
-
- void ShipEquipment::SwitchItem(Permanent* toSwitchItem)
- {
- multimap<string, ShipItem*>::iterator it;
- string equippedname;
- equippedname=GetNameofPermanent(toSwitchItem.CheckSubType());
- it=Equipment.find(equippedname);
- Trunk.insert (find(equippedname));
- Equipment.erase (it);
- Equipment.insert(pair<std::string, ShipItem*>(toSwitchItem.itemname,toSwitchItem)
- }
-
- string ShipEquipment::GetNameofPermanent (subItemTypePermanent NametoGet)
- {
- multimap<string, ShipItem*>::iterator it;
- for ( it=Equipment.begin() ; it != Equipment.end(); it++ ){
- if((*it).second->CheckSubType()==NametoGet){
- return (*it).first.itemname;
- }
- }
- return 0;
- }
-}
Deleted: branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,52 +0,0 @@
-
-#ifndef _ShipEquipment_H__
-#define _ShipEquipment_H__
-#include <string>
-#include "SpaceShip.h"
-#include <map>
-
-
-/*
-multimap<std::string, BaseItem*> equipment_;
-equipment_.insert(pair<std::string, BaseItem*>("Weapon", new BaseItem()));*/
-
-
-/* std::map<std::itemtype, BaseItem*> EQClasses;
- EQClasses["jacke"] = 0;
- BaseItem* item = itemMap_["jacke"];
-
- if (itemMap_["jacke"])
- if (itemMap_.find("jacke") != itemMap_.end()) */
-namespace orxonox
-{
- class _OrxonoxExport ShipEquipment
- {
- public:
- /*void AddItem(Shipitem* toAddItem);
- void RemoveItem(Shipitem* toRemoveItem);
- bool CheckifValid(Shipitem* toBeChecked);
- bool CheckifSpace();
- void SwitchItem(Permanent* toSwitchItem);
- string GetNameofPermanent (subItemTypePermanent NametoGet);*/ //holt den Namen des getragenen Items im jeweiligen Slot.
-
- private:
- multimap<std::string, BaseItem*> Equipment;
- multimap<std::string, BaseItem*> Usable;
- multimap<std::string, BaseItem*> Trunk;
- };
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#endif
Deleted: branches/pickups2/src/orxonox/objects/pickup/ShipItem.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ShipItem.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/ShipItem.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,24 +0,0 @@
-#include "Shipitem.h"
-
-namespace orxonox
-{
- itemtype ShipItem::CheckType()
- {
- return this->type;
- }
-
- subItemTypePermanent CheckSubType()
- {
- return this->subtype_permanent;
- }
-
- subItemTypePowerups CheckSubType()
- {
- return this->subtype_powerups;
- }
- subItemTypeUsable CheckSubType()
- {
- return this->subtype_usables;
- }
-
-}
Deleted: branches/pickups2/src/orxonox/objects/pickup/ShipItem.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/ShipItem.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/ShipItem.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,91 +0,0 @@
-#ifndef _ShipItems_H__
-#define _ShipItems_H__
-#include <string>
-#include "SpaceShip.h"
-#include <map>
-#include "ShipEquipmentClasses.h"
-
-
-
-namespace orxonox
-{
- class _OrxonoxExport ShipItem
- {
- enum itemType //Diffrent Types of Items
- {
- Useable,
- Powerups,
- Permanent
- };
-
- public:
- itemType CheckType();
- //virtual ChecksubType();
-
- private:
- itemType type;
- string itemname;
- };
-
- /* Useables are Items the Player can choose when to activate and then show an instant action/effect
- * or for a certain duration */
- class _OrxonoxExport Useable : public ShipItem
- {
- enum subItemTypeUseable //Diffrent Types of Items of the Type Useable
- {
- Rockets,
- Repairkits,
- Triggers, //trigger events usable by the player (Quests f.exp.)
- Boosters,
- Shields,
- Appearance,
- };
-
- public:
- //subItemTypeUseable CheckSubType();
-
- private:
- subItemTypeUseable subtype_usable;
- };
-
- /* Permanents are Items, that effect the Player or his Ship from the instance he picks them up
- until he drops them again */
- class _OrxonoxExport Permanent : public ShipItem
- {
- enum subItemTypePermanent //Diffrent Types of Items of the Type Permanent
- {
- Weapon,
- Thrusters,
- Shields,
- Armor
- };
-
- public:
- subItemTypePermanent CheckSubType();
-
- private:
- subItemTypePermanent subtype_permanent;
- };
-
- // Powerups effect the Player right after he picks them up for a certain Duration /or permanently.
- class _OrxonoxExport Powerups : public ShipItem
- {
- enum subItem TypePowerups //Diffrent Types of Items of the Type Powerups
- {
- Weapon,
- Boosters,
- Shields,
- Repairkits,
- Appearance,
- Trigger
- };
-
- public:
- //subItemTypePowerups CheckSubType();
-
- private:
- subItemTypePowerups subtype_powerups;
- };
-}
-
-#endif
Deleted: branches/pickups2/src/orxonox/objects/pickup/Turbo.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/Turbo.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/Turbo.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,128 +0,0 @@
-#include "OrxonoxStableHeaders.h"
-#include "Turbo.h"
-
-#include "objects/worldentities/pawns/SpaceShip.h"
-#include "core/Executor.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-
-namespace orxonox
-{
-
-
- CreateFactory(Turbo);
-
- Turbo::Turbo(BaseObject* creator) : BaseItem(creator)
- {
- RegisterObject(Turbo);
-
- this->boost_ = 0;
- this->duration_ = 0;
- this->accboost_ = 1;
- this->rotacc_= 0;
- }
-
- Turbo::~Turbo()
- {
- }
-
- void Turbo::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(Turbo, XMLPort, xmlelement, mode);
-
- XMLPortParam(Turbo, "boost", setBoost, getBoost, xmlelement, mode);
- XMLPortParam(Turbo, "duration", setDuration, getDuration, xmlelement, mode);
- XMLPortParam(Turbo, "accboost", setAccBoost, getAccBoost, xmlelement, mode);
- XMLPortParam(Turbo, "rotacc", setRotAcc, getRotAcc, xmlelement, mode);
- }
-
- bool Turbo::pickedUp(Pawn* player)
- {
-
- if(player-> isA(this->getPlayerBaseClass()))
- {
- SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
- if(duration_==0 )
- {
- if(addTo(player))
- {
- COUT(3)<<"ITEM EQUIPPED"<<std::endl;
- this->setSpeedBoost(ship);
- return true;
- }
- return false;
- }
- else
- {
- this->setSpeedBoost(ship);
- return true;
- }
- return false;
- }
- return false;
-
- }
-
-
- void Turbo::unsetSpeedBoost(SpaceShip* ship)
- {
-/*
- ship->setMaxSpeed( ship->getMaxSpeed() - this->boost_);
- ship->setTransAcc( ship->getTransAcc()/this->accboost_);
- ship->setMaxRotation( ship->getMaxRotation()-this->rotacc_);
- ship->setRotAcc( ship->getRotAcc()-this->rotacc_);
- COUT(3)<<"BOOST UNSET"<<std::endl;
- COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
-*/
- ship->setPermanentBoost(false);
- }
-
- void Turbo::setSpeedBoost(SpaceShip* ship)
- {
-/*
- COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
- ship->setMaxSpeed( ship->getMaxSpeed() + this->boost_);
- ship->setTransAcc( ship->getTransAcc()*this->accboost_);
- ship->setMaxRotation( ship->getMaxRotation()+this->rotacc_);
- ship->setRotAcc( ship->getRotAcc()+this->rotacc_);
-*/
- ship->setPermanentBoost(true);
- ship->setBoost(true);
-
- if( this->duration_ != 0)
- {
- ExecutorMember<Turbo>* executor = createExecutor(createFunctor(&Turbo::unsetSpeedBoost));
- executor->setDefaultValues(ship);
- turbotimer_.setTimer(this->duration_, false, this, executor);
- }
-// COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
- }
- bool Turbo::dropped(Pawn* player)
- {
- if (this->duration_ == 0)
- {
- COUT(0) << "ITEM DROPPED" << std::endl;
- if(remove(player)==true)
- {
- SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
- this->unsetSpeedBoost(ship);
- }
- }
- return true;
- }
-
-}
-/*<Template baseclass="Turbo" name=turboitem>
- <Turbo playerclass="SpaceShip" boost=150 duration=10 accboost=10 />
- </Template>
-
- <PickupSpawner item=turboitem>
- <attached>
- <Billboard material="Examples/Flare" scale=0.2 colour="0.0, 0.0, 1.0, 1.0" />
- </attached>
- </PickupSpawner>*/
-
-
-
-
-
Deleted: branches/pickups2/src/orxonox/objects/pickup/Turbo.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/Turbo.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/Turbo.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,56 +0,0 @@
-#ifndef _Turbo_H__
-#define _Turbo_H__
-
-#include "tools/Timer.h"
-#include "BaseItem.h"
-#include "OrxonoxPrereqs.h"
-#include "util/Math.h"
-
-namespace orxonox
-{
- class _OrxonoxExport Turbo : public BaseItem
- {
-
- public:
- Turbo(BaseObject* creator);
- virtual ~Turbo();
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
- virtual bool pickedUp(Pawn* player);
- virtual bool dropped(Pawn* player); //erst bei festen Items
-
- void setSpeedBoost(SpaceShip* ship);
- void unsetSpeedBoost(SpaceShip* ship);
-
- inline void setBoost(float boost)
- { this->boost_ = boost; }
- inline float getBoost() const
- { return this->boost_; }
-
- inline void setDuration(float duration)
- { this->duration_ = duration; }
- inline float getDuration() const
- { return this->duration_; }
-
- inline void setRotAcc(Degree rotacc)
- { this->rotacc_ = rotacc; }
- inline Degree getRotAcc() const
- { return this->rotacc_; }
-
-
- inline void setAccBoost(float accboost)
- { this->accboost_ = accboost; }
- inline float getAccBoost() const
- { return this->accboost_; }
-
- private:
- Timer<Turbo> turbotimer_;
- float boost_;
- float duration_;
- float accboost_;
- Degree rotacc_;
- };
-}
-
-#endif /* _Turbo_H__ */
Deleted: branches/pickups2/src/orxonox/objects/pickup/Usable.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/Usable.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/pickup/Usable.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -1,12 +0,0 @@
-/*enum subItemType{ Subtypes (thrusters etc)*/
-
-namespace orxonox
-{
- class _OrxonoxExport Usable: public ShipItem
- {
- public:
- subtypeusable CheckSubType();
- private:
- subtypeusable subtype;
- };
-}
Copied: branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc (from rev 2916, branches/pickups/src/orxonox/objects/pickup/UsableItem.cc)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,52 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Implementation of UsableItem.
+*/
+
+#include "UsableItem.h"
+
+#include "core/CoreIncludes.h"
+
+namespace orxonox
+{
+ /**
+ @brief Constructor. Registers the UsableItem.
+ @param creator Pointer to the object which created this item.
+ */
+ UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator)
+ {
+ RegisterObject(UsableItem);
+ }
+ //! Deconstructor.
+ UsableItem::~UsableItem()
+ {
+ }
+}
Property changes on: branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pickups2/src/orxonox/objects/pickup/UsableItem.h (from rev 2916, branches/pickups/src/orxonox/objects/pickup/UsableItem.h)
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/UsableItem.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/UsableItem.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -0,0 +1,61 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Definition of UsableItem.
+*/
+
+#ifndef _UsableItem_H__
+#define _UsableItem_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "BaseItem.h"
+
+namespace orxonox
+{
+ /**
+ @brief Base class for all usable items (not usable yet).
+ @author Daniel 'Huty' Haggenmueller
+ */
+ class _OrxonoxExport UsableItem : public BaseItem
+ {
+ public:
+ UsableItem(BaseObject* creator);
+ virtual ~UsableItem();
+
+ /**
+ @brief Method invoked when the item is being used.
+ @param pawn Pawn which is using the item.
+ */
+ virtual void used(Pawn* pawn) { }
+ };
+}
+
+#endif /* _UsableItem_H__ */
Property changes on: branches/pickups2/src/orxonox/objects/pickup/UsableItem.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/pickups2/src/orxonox/objects/quest/AddQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/AddQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/AddQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuest.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/AddQuest.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/AddQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddQuest.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/AddQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuest.h:2357
/branches/network64/src/orxonox/objects/quest/AddQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/AddQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuest.h:2357
/branches/network64/src/orxonox/objects/quest/AddQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuest.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/AddQuest.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/AddQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/AddQuest.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/AddQuestHint.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddQuestHint.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuestHint.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuestHint.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuestHint.cc:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuestHint.cc:2357
/branches/network64/src/orxonox/objects/quest/AddQuestHint.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuestHint.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuestHint.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuestHint.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuestHint.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddQuestHint.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddQuestHint.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuestHint.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuestHint.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuestHint.cc:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuestHint.cc:2357
/branches/network64/src/orxonox/objects/quest/AddQuestHint.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuestHint.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuestHint.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuestHint.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/AddQuestHint.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuestHint.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddQuestHint.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/AddQuestHint.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddQuestHint.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuestHint.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuestHint.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuestHint.h:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuestHint.h:2357
/branches/network64/src/orxonox/objects/quest/AddQuestHint.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuestHint.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuestHint.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuestHint.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuestHint.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuestHint.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuestHint.h:2743-2891
/trunk/src/orxonox/objects/quest/AddQuestHint.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddQuestHint.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddQuestHint.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddQuestHint.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddQuestHint.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddQuestHint.h:2755-2825
/branches/network/src/orxonox/objects/quest/AddQuestHint.h:2357
/branches/network64/src/orxonox/objects/quest/AddQuestHint.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddQuestHint.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddQuestHint.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddQuestHint.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/AddQuestHint.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddQuestHint.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddQuestHint.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddQuestHint.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddQuestHint.h:2743-2891
/trunk/src/orxonox/objects/quest/AddQuestHint.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/AddReward.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddReward.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddReward.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddReward.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddReward.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddReward.cc:2755-2825
/branches/network/src/orxonox/objects/quest/AddReward.cc:2357
/branches/network64/src/orxonox/objects/quest/AddReward.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddReward.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddReward.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddReward.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddReward.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddReward.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddReward.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddReward.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddReward.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddReward.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddReward.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddReward.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddReward.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddReward.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/AddReward.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddReward.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddReward.cc:2755-2825
/branches/network/src/orxonox/objects/quest/AddReward.cc:2357
/branches/network64/src/orxonox/objects/quest/AddReward.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddReward.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddReward.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/AddReward.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddReward.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/AddReward.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/AddReward.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddReward.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddReward.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddReward.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddReward.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddReward.cc:2743-2891
/trunk/src/orxonox/objects/quest/AddReward.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/AddReward.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/AddReward.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddReward.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddReward.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddReward.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddReward.h:2755-2825
/branches/network/src/orxonox/objects/quest/AddReward.h:2357
/branches/network64/src/orxonox/objects/quest/AddReward.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddReward.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddReward.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddReward.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddReward.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/AddReward.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddReward.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddReward.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddReward.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddReward.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddReward.h:2743-2891
/trunk/src/orxonox/objects/quest/AddReward.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/AddReward.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/AddReward.h:2663-2709
/branches/gui/src/orxonox/objects/quest/AddReward.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/AddReward.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/AddReward.h:2755-2825
/branches/network/src/orxonox/objects/quest/AddReward.h:2357
/branches/network64/src/orxonox/objects/quest/AddReward.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/AddReward.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/AddReward.h:2118-2386
/branches/physics/src/orxonox/objects/quest/AddReward.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/AddReward.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/AddReward.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/AddReward.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/AddReward.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/AddReward.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/AddReward.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/AddReward.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/AddReward.h:2743-2891
/trunk/src/orxonox/objects/quest/AddReward.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/ChangeQuestStatus.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/ChangeQuestStatus.cc:2755-2825
/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.cc:2357
/branches/network64/src/orxonox/objects/quest/ChangeQuestStatus.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/ChangeQuestStatus.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/ChangeQuestStatus.cc:2743-2891
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/ChangeQuestStatus.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/ChangeQuestStatus.cc:2755-2825
/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.cc:2357
/branches/network64/src/orxonox/objects/quest/ChangeQuestStatus.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/ChangeQuestStatus.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/ChangeQuestStatus.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/ChangeQuestStatus.cc:2743-2891
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/ChangeQuestStatus.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.h:2663-2709
/branches/gui/src/orxonox/objects/quest/ChangeQuestStatus.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/ChangeQuestStatus.h:2755-2825
/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.h:2357
/branches/network64/src/orxonox/objects/quest/ChangeQuestStatus.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/ChangeQuestStatus.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/ChangeQuestStatus.h:2118-2386
/branches/physics/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/ChangeQuestStatus.h:2743-2891
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/ChangeQuestStatus.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/ChangeQuestStatus.h:2663-2709
/branches/gui/src/orxonox/objects/quest/ChangeQuestStatus.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/ChangeQuestStatus.h:2755-2825
/branches/network/src/orxonox/objects/quest/ChangeQuestStatus.h:2357
/branches/network64/src/orxonox/objects/quest/ChangeQuestStatus.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/ChangeQuestStatus.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/ChangeQuestStatus.h:2118-2386
/branches/physics/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/ChangeQuestStatus.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/ChangeQuestStatus.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/ChangeQuestStatus.h:2743-2891
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/CompleteQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/CompleteQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/CompleteQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/CompleteQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/CompleteQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/CompleteQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/CompleteQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/CompleteQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/CompleteQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/CompleteQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/CompleteQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/CompleteQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/CompleteQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/CompleteQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/CompleteQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/CompleteQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/CompleteQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/CompleteQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/CompleteQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/CompleteQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/CompleteQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/CompleteQuest.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/CompleteQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/CompleteQuest.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/CompleteQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/CompleteQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/CompleteQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/CompleteQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/CompleteQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/CompleteQuest.h:2357
/branches/network64/src/orxonox/objects/quest/CompleteQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/CompleteQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/CompleteQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/CompleteQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/CompleteQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/CompleteQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/CompleteQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/CompleteQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/CompleteQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/CompleteQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/CompleteQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/CompleteQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/CompleteQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/CompleteQuest.h:2357
/branches/network64/src/orxonox/objects/quest/CompleteQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/CompleteQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/CompleteQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/CompleteQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/CompleteQuest.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/CompleteQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/CompleteQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/CompleteQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/CompleteQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/CompleteQuest.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/FailQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/FailQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/FailQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/FailQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/FailQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/FailQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/FailQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/FailQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/FailQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/FailQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/FailQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/FailQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/FailQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/FailQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/FailQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/FailQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/FailQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/FailQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/FailQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/FailQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/FailQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/FailQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/FailQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/FailQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/FailQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/FailQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/FailQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/FailQuest.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/FailQuest.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/FailQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/FailQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/FailQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/FailQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/FailQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/FailQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/FailQuest.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/FailQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/FailQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/FailQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/FailQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/FailQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/FailQuest.h:2357
/branches/network64/src/orxonox/objects/quest/FailQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/FailQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/FailQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/FailQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/FailQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/FailQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/FailQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/FailQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/FailQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/FailQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/FailQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/FailQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/FailQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/FailQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/FailQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/FailQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/FailQuest.h:2357
/branches/network64/src/orxonox/objects/quest/FailQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/FailQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/FailQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/FailQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/FailQuest.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/FailQuest.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/FailQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/FailQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/FailQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/FailQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/FailQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/FailQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/FailQuest.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/GlobalQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/GlobalQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/GlobalQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/GlobalQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/GlobalQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/GlobalQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/GlobalQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/GlobalQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/GlobalQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/GlobalQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/GlobalQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/GlobalQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/GlobalQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/GlobalQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/GlobalQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/GlobalQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/GlobalQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/GlobalQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/GlobalQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/GlobalQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/GlobalQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/GlobalQuest.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/GlobalQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/GlobalQuest.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/GlobalQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/GlobalQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/GlobalQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/GlobalQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/GlobalQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/GlobalQuest.h:2357
/branches/network64/src/orxonox/objects/quest/GlobalQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/GlobalQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/GlobalQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/GlobalQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/GlobalQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/GlobalQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/GlobalQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/GlobalQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/GlobalQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/GlobalQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/GlobalQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/GlobalQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/GlobalQuest.h:2357
/branches/network64/src/orxonox/objects/quest/GlobalQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/GlobalQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/GlobalQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/GlobalQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/GlobalQuest.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/GlobalQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/GlobalQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/GlobalQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/GlobalQuest.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/LocalQuest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/LocalQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/LocalQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/LocalQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/LocalQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/LocalQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/LocalQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/LocalQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/LocalQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/LocalQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/LocalQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/LocalQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/LocalQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/LocalQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/LocalQuest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/LocalQuest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/LocalQuest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/LocalQuest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/LocalQuest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/LocalQuest.cc:2357
/branches/network64/src/orxonox/objects/quest/LocalQuest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/LocalQuest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/LocalQuest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/LocalQuest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/LocalQuest.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/LocalQuest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/LocalQuest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/LocalQuest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/LocalQuest.cc:2743-2891
/trunk/src/orxonox/objects/quest/LocalQuest.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/LocalQuest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/LocalQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/LocalQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/LocalQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/LocalQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/LocalQuest.h:2357
/branches/network64/src/orxonox/objects/quest/LocalQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/LocalQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/LocalQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/LocalQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/LocalQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/LocalQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/LocalQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/LocalQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/LocalQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/LocalQuest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/LocalQuest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/LocalQuest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/LocalQuest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/LocalQuest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/LocalQuest.h:2755-2825
/branches/network/src/orxonox/objects/quest/LocalQuest.h:2357
/branches/network64/src/orxonox/objects/quest/LocalQuest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/LocalQuest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/LocalQuest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/LocalQuest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/LocalQuest.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/LocalQuest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/LocalQuest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/LocalQuest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/LocalQuest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/LocalQuest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/LocalQuest.h:2743-2891
/trunk/src/orxonox/objects/quest/LocalQuest.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/Quest.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/Quest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Quest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/Quest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Quest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Quest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/Quest.cc:2357
/branches/network64/src/orxonox/objects/quest/Quest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Quest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/Quest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/Quest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Quest.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Quest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/Quest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Quest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Quest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Quest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Quest.cc:2743-2891
/trunk/src/orxonox/objects/quest/Quest.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/Quest.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Quest.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/Quest.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Quest.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Quest.cc:2755-2825
/branches/network/src/orxonox/objects/quest/Quest.cc:2357
/branches/network64/src/orxonox/objects/quest/Quest.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Quest.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/Quest.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/Quest.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Quest.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/Quest.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/Quest.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/Quest.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Quest.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Quest.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Quest.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Quest.cc:2743-2891
/trunk/src/orxonox/objects/quest/Quest.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/Quest.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/Quest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Quest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/Quest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Quest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Quest.h:2755-2825
/branches/network/src/orxonox/objects/quest/Quest.h:2357
/branches/network64/src/orxonox/objects/quest/Quest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Quest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/Quest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/Quest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Quest.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Quest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/Quest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Quest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Quest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Quest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Quest.h:2743-2891
/trunk/src/orxonox/objects/quest/Quest.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/Quest.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Quest.h:2663-2709
/branches/gui/src/orxonox/objects/quest/Quest.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Quest.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Quest.h:2755-2825
/branches/network/src/orxonox/objects/quest/Quest.h:2357
/branches/network64/src/orxonox/objects/quest/Quest.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Quest.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/Quest.h:2118-2386
/branches/physics/src/orxonox/objects/quest/Quest.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Quest.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/Quest.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/Quest.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/Quest.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Quest.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Quest.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Quest.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Quest.h:2743-2891
/trunk/src/orxonox/objects/quest/Quest.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestDescription.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestDescription.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestDescription.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestDescription.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestDescription.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestDescription.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestDescription.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestDescription.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestDescription.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestDescription.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestDescription.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestDescription.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestDescription.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestDescription.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestDescription.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestDescription.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestDescription.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestDescription.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestDescription.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestDescription.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestDescription.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestDescription.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestDescription.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestDescription.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestDescription.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestDescription.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestDescription.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestDescription.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestDescription.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestDescription.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestDescription.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestDescription.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestDescription.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestDescription.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestDescription.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestDescription.h:2357
/branches/network64/src/orxonox/objects/quest/QuestDescription.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestDescription.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestDescription.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestDescription.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestDescription.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestDescription.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestDescription.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestDescription.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestDescription.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestDescription.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestDescription.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestDescription.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestDescription.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestDescription.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestDescription.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestDescription.h:2357
/branches/network64/src/orxonox/objects/quest/QuestDescription.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestDescription.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestDescription.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestDescription.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestDescription.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestDescription.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestDescription.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestDescription.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestDescription.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestDescription.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestDescription.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestDescription.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestEffect.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestEffect.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestEffect.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestEffect.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestEffect.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestEffect.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestEffect.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestEffect.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestEffect.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestEffect.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestEffect.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestEffect.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestEffect.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestEffect.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestEffect.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestEffect.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestEffect.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestEffect.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestEffect.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestEffect.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestEffect.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestEffect.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestEffect.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestEffect.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestEffect.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestEffect.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestEffect.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestEffect.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestEffect.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestEffect.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestEffect.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestEffect.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestEffect.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestEffect.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestEffect.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestEffect.h:2357
/branches/network64/src/orxonox/objects/quest/QuestEffect.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestEffect.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestEffect.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestEffect.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestEffect.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestEffect.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestEffect.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestEffect.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestEffect.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestEffect.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestEffect.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestEffect.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestEffect.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestEffect.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestEffect.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestEffect.h:2357
/branches/network64/src/orxonox/objects/quest/QuestEffect.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestEffect.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestEffect.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestEffect.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestEffect.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestEffect.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestEffect.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestEffect.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestEffect.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestEffect.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestEffect.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestEffect.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestHint.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestHint.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestHint.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestHint.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestHint.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestHint.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestHint.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestHint.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestHint.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestHint.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestHint.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestHint.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestHint.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestHint.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestHint.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestHint.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestHint.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestHint.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestHint.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestHint.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestHint.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestHint.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestHint.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestHint.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestHint.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestHint.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestHint.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestHint.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestHint.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestHint.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestHint.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestHint.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestHint.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestHint.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestHint.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestHint.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestHint.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestHint.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestHint.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestHint.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestHint.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestHint.h:2357
/branches/network64/src/orxonox/objects/quest/QuestHint.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestHint.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestHint.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestHint.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestHint.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestHint.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestHint.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestHint.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestHint.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestHint.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestHint.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestHint.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestHint.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestHint.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestHint.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestHint.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestHint.h:2357
/branches/network64/src/orxonox/objects/quest/QuestHint.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestHint.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestHint.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestHint.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestHint.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestHint.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestHint.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestHint.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestHint.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestHint.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestHint.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestHint.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestHint.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestItem.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestItem.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestItem.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestItem.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestItem.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestItem.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestItem.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestItem.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestItem.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestItem.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestItem.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestItem.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestItem.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestItem.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestItem.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestItem.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestItem.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestItem.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestItem.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestItem.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestItem.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestItem.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestItem.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestItem.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestItem.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestItem.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestItem.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestItem.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestItem.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestItem.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestItem.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestItem.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestItem.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestItem.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestItem.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestItem.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestItem.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestItem.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestItem.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestItem.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestItem.h:2357
/branches/network64/src/orxonox/objects/quest/QuestItem.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestItem.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestItem.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestItem.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestItem.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestItem.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestItem.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestItem.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestItem.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestItem.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestItem.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestItem.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestItem.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestItem.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestItem.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestItem.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestItem.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestItem.h:2357
/branches/network64/src/orxonox/objects/quest/QuestItem.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestItem.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestItem.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestItem.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestItem.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestItem.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestItem.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestItem.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestItem.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestItem.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestItem.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestItem.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestItem.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestManager.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestManager.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestManager.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestManager.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestManager.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestManager.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestManager.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestManager.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestManager.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestManager.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestManager.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestManager.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestManager.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestManager.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestManager.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestManager.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestManager.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestManager.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestManager.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestManager.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestManager.cc:2755-2825
/branches/network/src/orxonox/objects/quest/QuestManager.cc:2357
/branches/network64/src/orxonox/objects/quest/QuestManager.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestManager.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestManager.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestManager.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestManager.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestManager.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestManager.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestManager.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestManager.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestManager.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestManager.cc:2743-2891
/trunk/src/orxonox/objects/quest/QuestManager.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/QuestManager.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/QuestManager.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestManager.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestManager.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestManager.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestManager.h:2357
/branches/network64/src/orxonox/objects/quest/QuestManager.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestManager.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestManager.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestManager.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestManager.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/QuestManager.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestManager.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestManager.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestManager.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestManager.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestManager.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/QuestManager.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/QuestManager.h:2663-2709
/branches/gui/src/orxonox/objects/quest/QuestManager.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/QuestManager.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/QuestManager.h:2755-2825
/branches/network/src/orxonox/objects/quest/QuestManager.h:2357
/branches/network64/src/orxonox/objects/quest/QuestManager.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/QuestManager.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/QuestManager.h:2118-2386
/branches/physics/src/orxonox/objects/quest/QuestManager.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/QuestManager.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/QuestManager.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/QuestManager.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/QuestManager.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/QuestManager.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/QuestManager.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/QuestManager.h:2743-2891
/trunk/src/orxonox/objects/quest/QuestManager.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/Rewardable.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/Rewardable.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/Rewardable.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Rewardable.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Rewardable.cc:2755-2825
/branches/network/src/orxonox/objects/quest/Rewardable.cc:2357
/branches/network64/src/orxonox/objects/quest/Rewardable.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Rewardable.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/Rewardable.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/Rewardable.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Rewardable.cc:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Rewardable.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/Rewardable.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Rewardable.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Rewardable.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Rewardable.cc:2743-2891
/trunk/src/orxonox/objects/quest/Rewardable.cc:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/Rewardable.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.cc:2663-2709
/branches/gui/src/orxonox/objects/quest/Rewardable.cc:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Rewardable.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Rewardable.cc:2755-2825
/branches/network/src/orxonox/objects/quest/Rewardable.cc:2357
/branches/network64/src/orxonox/objects/quest/Rewardable.cc:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Rewardable.cc:2172-2480
/branches/overlay/src/orxonox/objects/quest/Rewardable.cc:2118-2386
/branches/physics/src/orxonox/objects/quest/Rewardable.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Rewardable.cc:2437-2458
/branches/pickups/src/orxonox/objects/quest/Rewardable.cc:2828-2916
/branches/pickups2/src/orxonox/objects/quest/Rewardable.cc:2108-2498
/branches/presentation/src/orxonox/objects/quest/Rewardable.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Rewardable.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Rewardable.cc:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Rewardable.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Rewardable.cc:2743-2891
/trunk/src/orxonox/objects/quest/Rewardable.cc:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/quest/Rewardable.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/quest/Rewardable.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.h:2663-2709
/branches/gui/src/orxonox/objects/quest/Rewardable.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Rewardable.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Rewardable.h:2755-2825
/branches/network/src/orxonox/objects/quest/Rewardable.h:2357
/branches/network64/src/orxonox/objects/quest/Rewardable.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Rewardable.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/Rewardable.h:2118-2386
/branches/physics/src/orxonox/objects/quest/Rewardable.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Rewardable.h:2437-2458
/branches/pickups2/src/orxonox/objects/quest/Rewardable.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/Rewardable.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Rewardable.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Rewardable.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Rewardable.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Rewardable.h:2743-2891
/trunk/src/orxonox/objects/quest/Rewardable.h:2-2090
+ /branches/buildsystem2/src/orxonox/objects/quest/Rewardable.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/quest/Rewardable.h:2663-2709
/branches/gui/src/orxonox/objects/quest/Rewardable.h:2796-2895
/branches/lodfinal/src/orxonox/objects/quest/Rewardable.h:2373-2412
/branches/miniprojects/src/orxonox/objects/quest/Rewardable.h:2755-2825
/branches/network/src/orxonox/objects/quest/Rewardable.h:2357
/branches/network64/src/orxonox/objects/quest/Rewardable.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/quest/Rewardable.h:2172-2480
/branches/overlay/src/orxonox/objects/quest/Rewardable.h:2118-2386
/branches/physics/src/orxonox/objects/quest/Rewardable.h:2108-2440
/branches/physics_merge/src/orxonox/objects/quest/Rewardable.h:2437-2458
/branches/pickups/src/orxonox/objects/quest/Rewardable.h:2828-2916
/branches/pickups2/src/orxonox/objects/quest/Rewardable.h:2108-2498
/branches/presentation/src/orxonox/objects/quest/Rewardable.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/quest/Rewardable.h:2108-2260
/branches/questsystem5/src/orxonox/objects/quest/Rewardable.h:2777-2906
/branches/weapon2/src/orxonox/objects/quest/Rewardable.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/quest/Rewardable.h:2743-2891
/trunk/src/orxonox/objects/quest/Rewardable.h:2-2090
Property changes on: branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/WeaponSystem.cc:1803-1809
/branches/core3/src/orxonox/objects/WeaponSystem.cc:1573-1740
/branches/gcc43/src/orxonox/objects/WeaponSystem.cc:1581
/branches/gui/src/orxonox/objects/WeaponSystem.cc:1636-1724
/branches/gui/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2796-2895
/branches/input/src/orxonox/objects/WeaponSystem.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2755-2825
/branches/network/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2357
/branches/network64/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/WeaponSystem.cc:1912-2086,2101
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2437-2458
/branches/pickups/src/orxonox/objects/WeaponSystem.cc:1927-2087
/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/WeaponSystem.cc:1895-2089
/branches/questsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/WeaponSystem.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/WeaponSystem.cc:1926-2048
/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2743-2891
+ /branches/buildsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/WeaponSystem.cc:1803-1809
/branches/core3/src/orxonox/objects/WeaponSystem.cc:1573-1740
/branches/gcc43/src/orxonox/objects/WeaponSystem.cc:1581
/branches/gui/src/orxonox/objects/WeaponSystem.cc:1636-1724
/branches/gui/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2796-2895
/branches/input/src/orxonox/objects/WeaponSystem.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2755-2825
/branches/network/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2357
/branches/network64/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/WeaponSystem.cc:1912-2086,2101
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2437-2458
/branches/pickups/src/orxonox/objects/WeaponSystem.cc:1927-2087
/branches/pickups/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2828-2916
/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/WeaponSystem.cc:1895-2089
/branches/questsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/WeaponSystem.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/WeaponSystem.cc:1926-2048
/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2743-2891
Property changes on: branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/WeaponSystem.h:2663-2709
/branches/gui/src/orxonox/objects/weaponSystem/WeaponSystem.h:2796-2895
/branches/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.h:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/WeaponSystem.h:2755-2825
/branches/network/src/orxonox/objects/weaponSystem/WeaponSystem.h:2357
/branches/network64/src/orxonox/objects/weaponSystem/WeaponSystem.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/weaponSystem/WeaponSystem.h:2111-2170
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/WeaponSystem.h:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.h:2437-2458
/branches/pickups/src/orxonox/objects/weaponSystem/WeaponSystem.h:2128
/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2260
/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.h:2777-2906
/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.h:2743-2891
+ /branches/buildsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/WeaponSystem.h:2663-2709
/branches/gui/src/orxonox/objects/weaponSystem/WeaponSystem.h:2796-2895
/branches/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.h:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/WeaponSystem.h:2755-2825
/branches/network/src/orxonox/objects/weaponSystem/WeaponSystem.h:2357
/branches/network64/src/orxonox/objects/weaponSystem/WeaponSystem.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/weaponSystem/WeaponSystem.h:2111-2170
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/WeaponSystem.h:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.h:2437-2458
/branches/pickups/src/orxonox/objects/weaponSystem/WeaponSystem.h:2128,2828-2916
/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2260
/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.h:2777-2906
/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.h:2743-2891
Modified: branches/pickups2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -123,8 +123,13 @@
}
Pawn* victim = dynamic_cast<Pawn*>(otherObject);
+
+ float dmg = this->damage_;
+ if (this->owner_)
+ dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+
if (victim)
- victim->damage(this->damage_, this->owner_);
+ victim->damage(dmg, this->owner_);
}
return false;
}
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/Backlight.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/Backlight.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Backlight.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Backlight.cc:1803-1809
/branches/core3/src/orxonox/objects/Backlight.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Backlight.cc:1581
/branches/gui/src/orxonox/objects/Backlight.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Backlight.cc:2796-2895
/branches/input/src/orxonox/objects/Backlight.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Backlight.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/Backlight.cc:2357
/branches/network64/src/orxonox/objects/worldentities/Backlight.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Backlight.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Backlight.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Backlight.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Backlight.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Backlight.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Backlight.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/Backlight.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/Backlight.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Backlight.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Backlight.cc:1803-1809
/branches/core3/src/orxonox/objects/Backlight.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Backlight.cc:1581
/branches/gui/src/orxonox/objects/Backlight.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Backlight.cc:2796-2895
/branches/input/src/orxonox/objects/Backlight.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Backlight.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/Backlight.cc:2357
/branches/network64/src/orxonox/objects/worldentities/Backlight.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Backlight.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Backlight.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.cc:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/Backlight.cc:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/Backlight.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Backlight.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Backlight.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Backlight.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/Backlight.cc:2-2086
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/Backlight.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/Backlight.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Backlight.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Backlight.h:1803-1809
/branches/core3/src/orxonox/objects/Backlight.h:1573-1740
/branches/gcc43/src/orxonox/objects/Backlight.h:1581
/branches/gui/src/orxonox/objects/Backlight.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Backlight.h:2796-2895
/branches/input/src/orxonox/objects/Backlight.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Backlight.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/Backlight.h:2357
/branches/network64/src/orxonox/objects/worldentities/Backlight.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Backlight.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Backlight.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Backlight.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Backlight.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Backlight.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Backlight.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Backlight.h:2743-2891
/trunk/src/orxonox/objects/worldentities/Backlight.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/Backlight.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Backlight.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Backlight.h:1803-1809
/branches/core3/src/orxonox/objects/Backlight.h:1573-1740
/branches/gcc43/src/orxonox/objects/Backlight.h:1581
/branches/gui/src/orxonox/objects/Backlight.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Backlight.h:2796-2895
/branches/input/src/orxonox/objects/Backlight.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Backlight.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/Backlight.h:2357
/branches/network64/src/orxonox/objects/worldentities/Backlight.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Backlight.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Backlight.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Backlight.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.h:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/Backlight.h:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/Backlight.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Backlight.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Backlight.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Backlight.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Backlight.h:2743-2891
/trunk/src/orxonox/objects/worldentities/Backlight.h:2-2086
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/Camera.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/Camera.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Camera.cc:1803-1809
/branches/core3/src/orxonox/objects/Camera.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Camera.cc:1581
/branches/gui/src/orxonox/objects/Camera.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Camera.cc:2796-2895
/branches/input/src/orxonox/objects/Camera.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Camera.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/Camera.cc:2357
/branches/network64/src/orxonox/objects/worldentities/Camera.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Camera.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Camera.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Camera.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Camera.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Camera.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Camera.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Camera.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Camera.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Camera.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/Camera.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/Camera.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Camera.cc:1803-1809
/branches/core3/src/orxonox/objects/Camera.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Camera.cc:1581
/branches/gui/src/orxonox/objects/Camera.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Camera.cc:2796-2895
/branches/input/src/orxonox/objects/Camera.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Camera.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/Camera.cc:2357
/branches/network64/src/orxonox/objects/worldentities/Camera.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Camera.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Camera.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Camera.cc:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/Camera.cc:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/Camera.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Camera.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Camera.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Camera.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Camera.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Camera.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/Camera.cc:2-2086
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/Camera.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/Camera.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Camera.h:1803-1809
/branches/core3/src/orxonox/objects/Camera.h:1573-1740
/branches/gcc43/src/orxonox/objects/Camera.h:1581
/branches/gui/src/orxonox/objects/Camera.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Camera.h:2796-2895
/branches/input/src/orxonox/objects/Camera.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Camera.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/Camera.h:2357
/branches/network64/src/orxonox/objects/worldentities/Camera.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Camera.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Camera.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Camera.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/Camera.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Camera.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Camera.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Camera.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Camera.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Camera.h:2743-2891
/trunk/src/orxonox/objects/worldentities/Camera.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/Camera.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/Camera.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Camera.h:1803-1809
/branches/core3/src/orxonox/objects/Camera.h:1573-1740
/branches/gcc43/src/orxonox/objects/Camera.h:1581
/branches/gui/src/orxonox/objects/Camera.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/Camera.h:2796-2895
/branches/input/src/orxonox/objects/Camera.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/Camera.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/Camera.h:2357
/branches/network64/src/orxonox/objects/worldentities/Camera.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/Camera.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/Camera.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/Camera.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/Camera.h:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/Camera.h:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/Camera.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/Camera.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/Camera.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/Camera.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Camera.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/Camera.h:2743-2891
/trunk/src/orxonox/objects/worldentities/Camera.h:2-2086
Modified: branches/pickups2/src/orxonox/objects/worldentities/ControllableEntity.h
===================================================================
--- branches/pickups2/src/orxonox/objects/worldentities/ControllableEntity.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/worldentities/ControllableEntity.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -87,7 +87,7 @@
virtual void boost() {}
virtual void greet() {}
- virtual void use() {}
+ virtual void useItem() {}
virtual void dropItems() {}
virtual void switchCamera();
virtual void mouseLook();
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/MobileEntity.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.cc:2663-2709
/branches/gui/src/orxonox/objects/worldentities/MobileEntity.cc:2796-2895
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.cc:2755-2825
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc:2655-2661
/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.cc:2777-2906
/branches/weaponsystem/src/orxonox/objects/worldentities/MobileEntity.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/MobileEntity.cc:2-2661
+ /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.cc:2663-2709
/branches/gui/src/orxonox/objects/worldentities/MobileEntity.cc:2796-2895
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.cc:2755-2825
/branches/pickups/src/orxonox/objects/worldentities/MobileEntity.cc:2828-2916
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc:2655-2661
/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.cc:2777-2906
/branches/weaponsystem/src/orxonox/objects/worldentities/MobileEntity.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/MobileEntity.cc:2-2661
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/MobileEntity.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.h:2663-2709
/branches/gui/src/orxonox/objects/worldentities/MobileEntity.h:2796-2895
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.h:2755-2825
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h:2655-2661
/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.h:2777-2906
/branches/weaponsystem/src/orxonox/objects/worldentities/MobileEntity.h:2743-2891
/trunk/src/orxonox/objects/worldentities/MobileEntity.h:2-2661
+ /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.h:2663-2709
/branches/gui/src/orxonox/objects/worldentities/MobileEntity.h:2796-2895
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.h:2755-2825
/branches/pickups/src/orxonox/objects/worldentities/MobileEntity.h:2828-2916
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h:2655-2661
/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.h:2777-2906
/branches/weaponsystem/src/orxonox/objects/worldentities/MobileEntity.h:2743-2891
/trunk/src/orxonox/objects/worldentities/MobileEntity.h:2-2661
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/ParticleSpawner.cc:1803-1809
/branches/core3/src/orxonox/objects/ParticleSpawner.cc:1573-1740
/branches/gcc43/src/orxonox/objects/ParticleSpawner.cc:1581
/branches/gui/src/orxonox/objects/ParticleSpawner.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/ParticleSpawner.cc:2796-2895
/branches/input/src/orxonox/objects/ParticleSpawner.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/ParticleSpawner.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/ParticleSpawner.cc:2357
/branches/network64/src/orxonox/objects/worldentities/ParticleSpawner.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/ParticleSpawner.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/ParticleSpawner.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/ParticleSpawner.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/ParticleSpawner.cc:1803-1809
/branches/core3/src/orxonox/objects/ParticleSpawner.cc:1573-1740
/branches/gcc43/src/orxonox/objects/ParticleSpawner.cc:1581
/branches/gui/src/orxonox/objects/ParticleSpawner.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/ParticleSpawner.cc:2796-2895
/branches/input/src/orxonox/objects/ParticleSpawner.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/ParticleSpawner.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/ParticleSpawner.cc:2357
/branches/network64/src/orxonox/objects/worldentities/ParticleSpawner.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/ParticleSpawner.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.cc:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/ParticleSpawner.cc:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/ParticleSpawner.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/ParticleSpawner.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc:2-2086
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/ParticleSpawner.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.h:2663-2709
/branches/ceguilua/src/orxonox/objects/ParticleSpawner.h:1803-1809
/branches/core3/src/orxonox/objects/ParticleSpawner.h:1573-1740
/branches/gcc43/src/orxonox/objects/ParticleSpawner.h:1581
/branches/gui/src/orxonox/objects/ParticleSpawner.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/ParticleSpawner.h:2796-2895
/branches/input/src/orxonox/objects/ParticleSpawner.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/ParticleSpawner.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/ParticleSpawner.h:2357
/branches/network64/src/orxonox/objects/worldentities/ParticleSpawner.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleSpawner.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/ParticleSpawner.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.h:2777-2906
/branches/script_trigger/src/orxonox/objects/ParticleSpawner.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/ParticleSpawner.h:2743-2891
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/ParticleSpawner.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/ParticleSpawner.h:2663-2709
/branches/ceguilua/src/orxonox/objects/ParticleSpawner.h:1803-1809
/branches/core3/src/orxonox/objects/ParticleSpawner.h:1573-1740
/branches/gcc43/src/orxonox/objects/ParticleSpawner.h:1581
/branches/gui/src/orxonox/objects/ParticleSpawner.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/ParticleSpawner.h:2796-2895
/branches/input/src/orxonox/objects/ParticleSpawner.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/ParticleSpawner.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/ParticleSpawner.h:2357
/branches/network64/src/orxonox/objects/worldentities/ParticleSpawner.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/ParticleSpawner.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/ParticleSpawner.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.h:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/ParticleSpawner.h:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/ParticleSpawner.h:2777-2906
/branches/script_trigger/src/orxonox/objects/ParticleSpawner.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/ParticleSpawner.h:2743-2891
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h:2-2086
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/StaticEntity.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/StaticEntity.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.cc:1803-1809
/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.cc:1573-1740
/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.cc:1581
/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/StaticEntity.cc:2796-2895
/branches/input/src/orxonox/objects/worldentities/PositionableEntity.cc:1630-1637
/branches/miniprojects/src/orxonox/objects/worldentities/StaticEntity.cc:2755-2825
/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.cc:1912-2086,2101
/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.cc:1913-2056
/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.cc:1927-2087
/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.cc:2655-2661
/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.cc:1895-2089
/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.cc:1926-2095
/branches/weaponsystem/src/orxonox/objects/worldentities/StaticEntity.cc:2743-2891
+ /branches/buildsystem3/src/orxonox/objects/worldentities/StaticEntity.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.cc:1803-1809
/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.cc:1573-1740
/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.cc:1581
/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/StaticEntity.cc:2796-2895
/branches/input/src/orxonox/objects/worldentities/PositionableEntity.cc:1630-1637
/branches/miniprojects/src/orxonox/objects/worldentities/StaticEntity.cc:2755-2825
/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.cc:1912-2086,2101
/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.cc:1913-2056
/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.cc:1927-2087
/branches/pickups/src/orxonox/objects/worldentities/StaticEntity.cc:2828-2916
/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.cc:2655-2661
/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.cc:1895-2089
/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.cc:1926-2095
/branches/weaponsystem/src/orxonox/objects/worldentities/StaticEntity.cc:2743-2891
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/StaticEntity.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/StaticEntity.h:2663-2709
/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.h:1803-1809
/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.h:1573-1740
/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.h:1581
/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/StaticEntity.h:2796-2895
/branches/input/src/orxonox/objects/worldentities/PositionableEntity.h:1630-1637
/branches/miniprojects/src/orxonox/objects/worldentities/StaticEntity.h:2755-2825
/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h:1912-2086,2101
/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.h:1913-2056
/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.h:1927-2087
/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.h:2655-2661
/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.h:1895-2089
/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.h:2777-2906
/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.h:1926-2095
/branches/weaponsystem/src/orxonox/objects/worldentities/StaticEntity.h:2743-2891
+ /branches/buildsystem3/src/orxonox/objects/worldentities/StaticEntity.h:2663-2709
/branches/ceguilua/src/orxonox/objects/worldentities/PositionableEntity.h:1803-1809
/branches/core3/src/orxonox/objects/worldentities/PositionableEntity.h:1573-1740
/branches/gcc43/src/orxonox/objects/worldentities/PositionableEntity.h:1581
/branches/gui/src/orxonox/objects/worldentities/PositionableEntity.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/StaticEntity.h:2796-2895
/branches/input/src/orxonox/objects/worldentities/PositionableEntity.h:1630-1637
/branches/miniprojects/src/orxonox/objects/worldentities/StaticEntity.h:2755-2825
/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h:1912-2086,2101
/branches/physics/src/orxonox/objects/worldentities/PositionableEntity.h:1913-2056
/branches/pickups/src/orxonox/objects/worldentities/PositionableEntity.h:1927-2087
/branches/pickups/src/orxonox/objects/worldentities/StaticEntity.h:2828-2916
/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.h:2655-2661
/branches/questsystem/src/orxonox/objects/worldentities/PositionableEntity.h:1895-2089
/branches/questsystem5/src/orxonox/objects/worldentities/StaticEntity.h:2777-2906
/branches/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.h:1926-2095
/branches/weaponsystem/src/orxonox/objects/worldentities/StaticEntity.h:2743-2891
Modified: branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-04-15 15:03:58 UTC (rev 2917)
@@ -60,7 +60,7 @@
this->spawnparticleduration_ = 3.0f;
- this->getPickUp().setPlayer(this);
+ this->getPickups().setOwner(this);
if (GameMode::isMaster())
{
@@ -204,6 +204,8 @@
this->setDestroyWhenPlayerLeft(false);
+ this->dropItems();
+
if (this->getGametype())
this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
@@ -265,7 +267,7 @@
void Pawn::dropItems()
{
- pickUp.eraseAll();
+ this->getPickups().clear();
}
Modified: branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.h
===================================================================
--- branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-04-15 14:03:09 UTC (rev 2916)
+++ branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-04-15 15:03:58 UTC (rev 2917)
@@ -30,10 +30,10 @@
#define _Pawn_H__
#include "OrxonoxPrereqs.h"
-#include "objects/pickup/ShipEquipment.h"
#include "objects/worldentities/ControllableEntity.h"
#include "objects/RadarViewable.h"
#include "objects/weaponSystem/WeaponSystem.h"
+#include "objects/pickup/PickupCollection.h"
namespace orxonox
{
@@ -106,19 +106,20 @@
inline unsigned int getExplosionChunks() const
{ return this->numexplosionchunks_; }
- inline ShipEquipment& getPickUp()
- {return this->pickUp;}
-
virtual void dropItems();
+ inline PickupCollection& getPickups()
+ { return this->pickups_; }
+ virtual void useItem()
+ { this->pickups_.useItem(); }
protected:
virtual void death();
virtual void deatheffect();
virtual void spawneffect();
- ShipEquipment pickUp;
bool bAlive_;
+ PickupCollection pickups_;
float health_;
float maxHealth_;
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/DistanceTrigger.cc:1803-1809
/branches/core3/src/orxonox/objects/DistanceTrigger.cc:1573-1740
/branches/gcc43/src/orxonox/objects/DistanceTrigger.cc:1581
/branches/gui/src/orxonox/objects/DistanceTrigger.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2796-2895
/branches/input/src/orxonox/objects/DistanceTrigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/DistanceTrigger.cc:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/DistanceTrigger.cc:1803-1809
/branches/core3/src/orxonox/objects/DistanceTrigger.cc:1573-1740
/branches/gcc43/src/orxonox/objects/DistanceTrigger.cc:1581
/branches/gui/src/orxonox/objects/DistanceTrigger.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2796-2895
/branches/input/src/orxonox/objects/DistanceTrigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/DistanceTrigger.cc:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2-2086
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2663-2709
/branches/ceguilua/src/orxonox/objects/DistanceTrigger.h:1803-1809
/branches/core3/src/orxonox/objects/DistanceTrigger.h:1573-1740
/branches/gcc43/src/orxonox/objects/DistanceTrigger.h:1581
/branches/gui/src/orxonox/objects/DistanceTrigger.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2796-2895
/branches/input/src/orxonox/objects/DistanceTrigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2777-2906
/branches/script_trigger/src/orxonox/objects/DistanceTrigger.h:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2663-2709
/branches/ceguilua/src/orxonox/objects/DistanceTrigger.h:1803-1809
/branches/core3/src/orxonox/objects/DistanceTrigger.h:1573-1740
/branches/gcc43/src/orxonox/objects/DistanceTrigger.h:1581
/branches/gui/src/orxonox/objects/DistanceTrigger.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2796-2895
/branches/input/src/orxonox/objects/DistanceTrigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2777-2906
/branches/script_trigger/src/orxonox/objects/DistanceTrigger.h:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2-2086
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Trigger.cc:1803-1809
/branches/core3/src/orxonox/objects/Trigger.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Trigger.cc:1581
/branches/gui/src/orxonox/objects/Trigger.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/Trigger.cc:2796-2895
/branches/input/src/orxonox/objects/Trigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/Trigger.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/Trigger.cc:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/Trigger.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/Trigger.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.cc:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Trigger.cc:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/Trigger.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.cc:2663-2709
/branches/ceguilua/src/orxonox/objects/Trigger.cc:1803-1809
/branches/core3/src/orxonox/objects/Trigger.cc:1573-1740
/branches/gcc43/src/orxonox/objects/Trigger.cc:1581
/branches/gui/src/orxonox/objects/Trigger.cc:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/Trigger.cc:2796-2895
/branches/input/src/orxonox/objects/Trigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.cc:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/Trigger.cc:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/Trigger.cc:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/Trigger.cc:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.cc:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/Trigger.cc:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.cc:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/triggers/Trigger.cc:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.cc:2777-2906
/branches/script_trigger/src/orxonox/objects/Trigger.cc:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/Trigger.cc:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc:2-2086
Property changes on: branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/Trigger.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Trigger.h:1803-1809
/branches/core3/src/orxonox/objects/Trigger.h:1573-1740
/branches/gcc43/src/orxonox/objects/Trigger.h:1581
/branches/gui/src/orxonox/objects/Trigger.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/Trigger.h:2796-2895
/branches/input/src/orxonox/objects/Trigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/Trigger.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/Trigger.h:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/Trigger.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/Trigger.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/Trigger.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.h:2437-2458
/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Trigger.h:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/Trigger.h:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h:2-2086
+ /branches/buildsystem2/src/orxonox/objects/worldentities/triggers/Trigger.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/worldentities/triggers/Trigger.h:2663-2709
/branches/ceguilua/src/orxonox/objects/Trigger.h:1803-1809
/branches/core3/src/orxonox/objects/Trigger.h:1573-1740
/branches/gcc43/src/orxonox/objects/Trigger.h:1581
/branches/gui/src/orxonox/objects/Trigger.h:1636-1724
/branches/gui/src/orxonox/objects/worldentities/triggers/Trigger.h:2796-2895
/branches/input/src/orxonox/objects/Trigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.h:2373-2412
/branches/miniprojects/src/orxonox/objects/worldentities/triggers/Trigger.h:2755-2825
/branches/network/src/orxonox/objects/worldentities/triggers/Trigger.h:2357
/branches/network64/src/orxonox/objects/worldentities/triggers/Trigger.h:2211-2356
/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h:2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/worldentities/triggers/Trigger.h:2172-2480
/branches/overlay/src/orxonox/objects/worldentities/triggers/Trigger.h:2118-2386
/branches/physics/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2440
/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.h:2437-2458
/branches/pickups/src/orxonox/objects/worldentities/triggers/Trigger.h:2828-2916
/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2498
/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2260
/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.h:2777-2906
/branches/script_trigger/src/orxonox/objects/Trigger.h:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2489
/branches/weaponsystem/src/orxonox/objects/worldentities/triggers/Trigger.h:2743-2891
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h:2-2086
Property changes on: branches/pickups2/src/tolua/all-5.0.lua
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/tolua/all-5.0.lua:2279-2401
/branches/ceguilua/src/tolua/lua/all.lua:1803-1809
/branches/core3/src/tolua/lua/all.lua:1573-1740
/branches/gcc43/src/tolua/lua/all.lua:1581
/branches/gui/src/tolua/all-5.0.lua:2796-2895
/branches/gui/src/tolua/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.0.lua:2755-2825
/branches/questsystem5/src/tolua/all-5.0.lua:2777-2906
/branches/weaponsystem/src/tolua/all-5.0.lua:2743-2891
+ /branches/buildsystem/src/tolua/all-5.0.lua:2279-2401
/branches/ceguilua/src/tolua/lua/all.lua:1803-1809
/branches/core3/src/tolua/lua/all.lua:1573-1740
/branches/gcc43/src/tolua/lua/all.lua:1581
/branches/gui/src/tolua/all-5.0.lua:2796-2895
/branches/gui/src/tolua/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.0.lua:2755-2825
/branches/pickups/src/tolua/all-5.0.lua:2828-2916
/branches/questsystem5/src/tolua/all-5.0.lua:2777-2906
/branches/weaponsystem/src/tolua/all-5.0.lua:2743-2891
Property changes on: branches/pickups2/src/tolua/all-5.1.lua
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/tolua/all-5.1.lua:2279-2401
/branches/ceguilua/src/tolua/lua/all.lua:1803-1809
/branches/core3/src/tolua/lua/all.lua:1573-1740
/branches/gcc43/src/tolua/lua/all.lua:1581
/branches/gui/src/tolua/all-5.1.lua:2796-2895
/branches/gui/src/tolua/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.1.lua:2755-2825
/branches/questsystem5/src/tolua/all-5.1.lua:2777-2906
/branches/weaponsystem/src/tolua/all-5.1.lua:2743-2891
+ /branches/buildsystem/src/tolua/all-5.1.lua:2279-2401
/branches/ceguilua/src/tolua/lua/all.lua:1803-1809
/branches/core3/src/tolua/lua/all.lua:1573-1740
/branches/gcc43/src/tolua/lua/all.lua:1581
/branches/gui/src/tolua/all-5.1.lua:2796-2895
/branches/gui/src/tolua/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.1.lua:2755-2825
/branches/pickups/src/tolua/all-5.1.lua:2828-2916
/branches/questsystem5/src/tolua/all-5.1.lua:2777-2906
/branches/weaponsystem/src/tolua/all-5.1.lua:2743-2891
Property changes on: branches/pickups2/src/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/util:1875-2277,2279-2401
/branches/buildsystem2/src/util:2507-2659
/branches/buildsystem3/src/util:2663-2709
/branches/ceguilua/src/util:1803-1809
/branches/core3/src/util:1573-1740,1743-2015
/branches/gcc43/src/util:1581
/branches/gui/src/util:1636-1724,2796-2895
/branches/input/src/util:1630-1637
/branches/lodfinal/src/util:2373-2412
/branches/miniprojects/src/util:2755-2825
/branches/network/src/util:2357
/branches/network64/src/util:2211-2356
/branches/objecthierarchy/src/util:2101,2111-2170
/branches/objecthierarchy2/src/util:2172-2480
/branches/overlay/src/util:2118-2386
/branches/physics/src/util:1913-2056,2108-2440
/branches/physics_merge/src/util:2437-2458
/branches/pickups/src/util:1927-2087,2128
/branches/pickups2/src/util:2108-2498
/branches/presentation/src/util:2370-2653,2655-2661
/branches/questsystem/src/util:1895-2089
/branches/questsystem2/src/util:2108-2260
/branches/questsystem5/src/util:2777-2906
/branches/script_trigger/src/util:1296-1954,1956
/branches/weapon/src/util:1926-2095
/branches/weapon2/src/util:2108-2489
/branches/weaponsystem/src/util:2743-2891
+ /branches/buildsystem/src/util:1875-2277,2279-2401
/branches/buildsystem2/src/util:2507-2659
/branches/buildsystem3/src/util:2663-2709
/branches/ceguilua/src/util:1803-1809
/branches/core3/src/util:1573-1740,1743-2015
/branches/gcc43/src/util:1581
/branches/gui/src/util:1636-1724,2796-2895
/branches/input/src/util:1630-1637
/branches/lodfinal/src/util:2373-2412
/branches/miniprojects/src/util:2755-2825
/branches/network/src/util:2357
/branches/network64/src/util:2211-2356
/branches/objecthierarchy/src/util:2101,2111-2170
/branches/objecthierarchy2/src/util:2172-2480
/branches/overlay/src/util:2118-2386
/branches/physics/src/util:1913-2056,2108-2440
/branches/physics_merge/src/util:2437-2458
/branches/pickups/src/util:1927-2087,2128,2828-2916
/branches/pickups2/src/util:2108-2498
/branches/presentation/src/util:2370-2653,2655-2661
/branches/questsystem/src/util:1895-2089
/branches/questsystem2/src/util:2108-2260
/branches/questsystem5/src/util:2777-2906
/branches/script_trigger/src/util:1296-1954,1956
/branches/weapon/src/util:1926-2095
/branches/weapon2/src/util:2108-2489
/branches/weaponsystem/src/util:2743-2891
Property changes on: branches/pickups2/src/util/Exception.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/util/Exception.cc:1875-2277,2279-2401
/branches/buildsystem2/src/util/Exception.cc:2507-2659
/branches/buildsystem3/src/util/Exception.cc:2663-2709
/branches/ceguilua/src/util/Exception.cc:1803-1809
/branches/core3/src/core/Exception.cc:1573-1740
/branches/gcc43/src/core/Exception.cc:1581
/branches/gui/src/core/Exception.cc:1636-1637
/branches/gui/src/util/Exception.cc:2796-2895
/branches/input/src/core/Exception.cc:1630-1637
/branches/lodfinal/src/util/Exception.cc:2373-2412
/branches/miniprojects/src/util/Exception.cc:2755-2825
/branches/network/src/util/Exception.cc:2357
/branches/network64/src/util/Exception.cc:2211-2356
/branches/objecthierarchy/src/util/Exception.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/util/Exception.cc:2172-2480
/branches/overlay/src/util/Exception.cc:2118-2386
/branches/physics/src/util/Exception.cc:1913-2056,2108-2440
/branches/physics_merge/src/util/Exception.cc:2437-2458
/branches/pickups/src/util/Exception.cc:1927-2087,2128
/branches/pickups2/src/util/Exception.cc:2108-2498
/branches/presentation/src/util/Exception.cc:2370-2653,2655-2661
/branches/questsystem/src/util/Exception.cc:1895-2089
/branches/questsystem2/src/util/Exception.cc:2108-2260
/branches/questsystem5/src/util/Exception.cc:2777-2906
/branches/weapon/src/util/Exception.cc:1926-2095
/branches/weapon2/src/util/Exception.cc:2108-2489
/branches/weaponsystem/src/util/Exception.cc:2743-2891
+ /branches/buildsystem/src/util/Exception.cc:1875-2277,2279-2401
/branches/buildsystem2/src/util/Exception.cc:2507-2659
/branches/buildsystem3/src/util/Exception.cc:2663-2709
/branches/ceguilua/src/util/Exception.cc:1803-1809
/branches/core3/src/core/Exception.cc:1573-1740
/branches/gcc43/src/core/Exception.cc:1581
/branches/gui/src/core/Exception.cc:1636-1637
/branches/gui/src/util/Exception.cc:2796-2895
/branches/input/src/core/Exception.cc:1630-1637
/branches/lodfinal/src/util/Exception.cc:2373-2412
/branches/miniprojects/src/util/Exception.cc:2755-2825
/branches/network/src/util/Exception.cc:2357
/branches/network64/src/util/Exception.cc:2211-2356
/branches/objecthierarchy/src/util/Exception.cc:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/util/Exception.cc:2172-2480
/branches/overlay/src/util/Exception.cc:2118-2386
/branches/physics/src/util/Exception.cc:1913-2056,2108-2440
/branches/physics_merge/src/util/Exception.cc:2437-2458
/branches/pickups/src/util/Exception.cc:1927-2087,2128,2828-2916
/branches/pickups2/src/util/Exception.cc:2108-2498
/branches/presentation/src/util/Exception.cc:2370-2653,2655-2661
/branches/questsystem/src/util/Exception.cc:1895-2089
/branches/questsystem2/src/util/Exception.cc:2108-2260
/branches/questsystem5/src/util/Exception.cc:2777-2906
/branches/weapon/src/util/Exception.cc:1926-2095
/branches/weapon2/src/util/Exception.cc:2108-2489
/branches/weaponsystem/src/util/Exception.cc:2743-2891
Property changes on: branches/pickups2/src/util/Exception.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem/src/util/Exception.h:1875-2277,2279-2401
/branches/buildsystem2/src/util/Exception.h:2507-2659
/branches/buildsystem3/src/util/Exception.h:2663-2709
/branches/ceguilua/src/util/Exception.h:1803-1809
/branches/core3/src/core/Exception.h:1573-1740
/branches/gcc43/src/core/Exception.h:1581
/branches/gui/src/core/Exception.h:1636-1637
/branches/gui/src/util/Exception.h:2796-2895
/branches/input/src/core/Exception.h:1630-1637
/branches/lodfinal/src/util/Exception.h:2373-2412
/branches/miniprojects/src/util/Exception.h:2755-2825
/branches/network/src/util/Exception.h:2357
/branches/network64/src/util/Exception.h:2211-2356
/branches/objecthierarchy/src/util/Exception.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/util/Exception.h:2172-2480
/branches/overlay/src/util/Exception.h:2118-2386
/branches/physics/src/util/Exception.h:1913-2056,2108-2440
/branches/physics_merge/src/util/Exception.h:2437-2458
/branches/pickups/src/util/Exception.h:1927-2087,2128
/branches/pickups2/src/util/Exception.h:2108-2498
/branches/presentation/src/util/Exception.h:2370-2653,2655-2661
/branches/questsystem/src/util/Exception.h:1895-2089
/branches/questsystem2/src/util/Exception.h:2108-2260
/branches/questsystem5/src/util/Exception.h:2777-2906
/branches/weapon/src/util/Exception.h:1926-2095
/branches/weapon2/src/util/Exception.h:2108-2489
/branches/weaponsystem/src/util/Exception.h:2743-2891
+ /branches/buildsystem/src/util/Exception.h:1875-2277,2279-2401
/branches/buildsystem2/src/util/Exception.h:2507-2659
/branches/buildsystem3/src/util/Exception.h:2663-2709
/branches/ceguilua/src/util/Exception.h:1803-1809
/branches/core3/src/core/Exception.h:1573-1740
/branches/gcc43/src/core/Exception.h:1581
/branches/gui/src/core/Exception.h:1636-1637
/branches/gui/src/util/Exception.h:2796-2895
/branches/input/src/core/Exception.h:1630-1637
/branches/lodfinal/src/util/Exception.h:2373-2412
/branches/miniprojects/src/util/Exception.h:2755-2825
/branches/network/src/util/Exception.h:2357
/branches/network64/src/util/Exception.h:2211-2356
/branches/objecthierarchy/src/util/Exception.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/util/Exception.h:2172-2480
/branches/overlay/src/util/Exception.h:2118-2386
/branches/physics/src/util/Exception.h:1913-2056,2108-2440
/branches/physics_merge/src/util/Exception.h:2437-2458
/branches/pickups/src/util/Exception.h:1927-2087,2128,2828-2916
/branches/pickups2/src/util/Exception.h:2108-2498
/branches/presentation/src/util/Exception.h:2370-2653,2655-2661
/branches/questsystem/src/util/Exception.h:1895-2089
/branches/questsystem2/src/util/Exception.h:2108-2260
/branches/questsystem5/src/util/Exception.h:2777-2906
/branches/weapon/src/util/Exception.h:1926-2095
/branches/weapon2/src/util/Exception.h:2108-2489
/branches/weaponsystem/src/util/Exception.h:2743-2891
Property changes on: branches/pickups2/src/util/SignalHandler.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/util/SignalHandler.cc:2507-2659
/branches/buildsystem3/src/util/SignalHandler.cc:2663-2709
/branches/ceguilua/src/orxonox/SignalHandler.cc:1803-1809
/branches/core3/src/orxonox/SignalHandler.cc:1573-1606
/branches/gcc43/src/orxonox/SignalHandler.cc:1581
/branches/gui/src/orxonox/SignalHandler.cc:1636-1724
/branches/gui/src/util/SignalHandler.cc:2796-2895
/branches/input/src/orxonox/SignalHandler.cc:1630-1637
/branches/lodfinal/src/util/SignalHandler.cc:2373-2412
/branches/miniprojects/src/util/SignalHandler.cc:2755-2825
/branches/network/src/util/SignalHandler.cc:2357
/branches/network64/src/util/SignalHandler.cc:2211-2356
/branches/objecthierarchy/src/util/SignalHandler.cc:2101,2111-2170
/branches/objecthierarchy2/src/util/SignalHandler.cc:2172-2480
/branches/overlay/src/util/SignalHandler.cc:2118-2386
/branches/physics/src/util/SignalHandler.cc:2108-2440
/branches/physics_merge/src/util/SignalHandler.cc:2437-2458
/branches/pickups2/src/util/SignalHandler.cc:2108-2498
/branches/presentation/src/util/SignalHandler.cc:2370-2653,2655-2661
/branches/questsystem2/src/util/SignalHandler.cc:2108-2260
/branches/questsystem5/src/util/SignalHandler.cc:2777-2906
/branches/script_trigger/src/orxonox/SignalHandler.cc:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.cc:2108-2489
/branches/weaponsystem/src/util/SignalHandler.cc:2743-2891
/trunk/src/util/SignalHandler.cc:2-2086
+ /branches/buildsystem2/src/util/SignalHandler.cc:2507-2659
/branches/buildsystem3/src/util/SignalHandler.cc:2663-2709
/branches/ceguilua/src/orxonox/SignalHandler.cc:1803-1809
/branches/core3/src/orxonox/SignalHandler.cc:1573-1606
/branches/gcc43/src/orxonox/SignalHandler.cc:1581
/branches/gui/src/orxonox/SignalHandler.cc:1636-1724
/branches/gui/src/util/SignalHandler.cc:2796-2895
/branches/input/src/orxonox/SignalHandler.cc:1630-1637
/branches/lodfinal/src/util/SignalHandler.cc:2373-2412
/branches/miniprojects/src/util/SignalHandler.cc:2755-2825
/branches/network/src/util/SignalHandler.cc:2357
/branches/network64/src/util/SignalHandler.cc:2211-2356
/branches/objecthierarchy/src/util/SignalHandler.cc:2101,2111-2170
/branches/objecthierarchy2/src/util/SignalHandler.cc:2172-2480
/branches/overlay/src/util/SignalHandler.cc:2118-2386
/branches/physics/src/util/SignalHandler.cc:2108-2440
/branches/physics_merge/src/util/SignalHandler.cc:2437-2458
/branches/pickups/src/util/SignalHandler.cc:2828-2916
/branches/pickups2/src/util/SignalHandler.cc:2108-2498
/branches/presentation/src/util/SignalHandler.cc:2370-2653,2655-2661
/branches/questsystem2/src/util/SignalHandler.cc:2108-2260
/branches/questsystem5/src/util/SignalHandler.cc:2777-2906
/branches/script_trigger/src/orxonox/SignalHandler.cc:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.cc:2108-2489
/branches/weaponsystem/src/util/SignalHandler.cc:2743-2891
/trunk/src/util/SignalHandler.cc:2-2086
Property changes on: branches/pickups2/src/util/SignalHandler.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/util/SignalHandler.h:2507-2659
/branches/buildsystem3/src/util/SignalHandler.h:2663-2709
/branches/ceguilua/src/orxonox/SignalHandler.h:1803-1809
/branches/core3/src/orxonox/SignalHandler.h:1573-1606
/branches/gcc43/src/orxonox/SignalHandler.h:1581
/branches/gui/src/orxonox/SignalHandler.h:1636-1724
/branches/gui/src/util/SignalHandler.h:2796-2895
/branches/input/src/orxonox/SignalHandler.h:1630-1637
/branches/lodfinal/src/util/SignalHandler.h:2373-2412
/branches/miniprojects/src/util/SignalHandler.h:2755-2825
/branches/network/src/util/SignalHandler.h:2357
/branches/network64/src/util/SignalHandler.h:2211-2356
/branches/objecthierarchy/src/util/SignalHandler.h:2101,2111-2170
/branches/objecthierarchy2/src/util/SignalHandler.h:2172-2480
/branches/overlay/src/util/SignalHandler.h:2118-2386
/branches/physics/src/util/SignalHandler.h:2108-2440
/branches/physics_merge/src/util/SignalHandler.h:2437-2458
/branches/pickups2/src/util/SignalHandler.h:2108-2498
/branches/presentation/src/util/SignalHandler.h:2370-2653,2655-2661
/branches/questsystem2/src/util/SignalHandler.h:2108-2260
/branches/questsystem5/src/util/SignalHandler.h:2777-2906
/branches/script_trigger/src/orxonox/SignalHandler.h:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.h:2108-2489
/branches/weaponsystem/src/util/SignalHandler.h:2743-2891
/trunk/src/util/SignalHandler.h:2-2086
+ /branches/buildsystem2/src/util/SignalHandler.h:2507-2659
/branches/buildsystem3/src/util/SignalHandler.h:2663-2709
/branches/ceguilua/src/orxonox/SignalHandler.h:1803-1809
/branches/core3/src/orxonox/SignalHandler.h:1573-1606
/branches/gcc43/src/orxonox/SignalHandler.h:1581
/branches/gui/src/orxonox/SignalHandler.h:1636-1724
/branches/gui/src/util/SignalHandler.h:2796-2895
/branches/input/src/orxonox/SignalHandler.h:1630-1637
/branches/lodfinal/src/util/SignalHandler.h:2373-2412
/branches/miniprojects/src/util/SignalHandler.h:2755-2825
/branches/network/src/util/SignalHandler.h:2357
/branches/network64/src/util/SignalHandler.h:2211-2356
/branches/objecthierarchy/src/util/SignalHandler.h:2101,2111-2170
/branches/objecthierarchy2/src/util/SignalHandler.h:2172-2480
/branches/overlay/src/util/SignalHandler.h:2118-2386
/branches/physics/src/util/SignalHandler.h:2108-2440
/branches/physics_merge/src/util/SignalHandler.h:2437-2458
/branches/pickups/src/util/SignalHandler.h:2828-2916
/branches/pickups2/src/util/SignalHandler.h:2108-2498
/branches/presentation/src/util/SignalHandler.h:2370-2653,2655-2661
/branches/questsystem2/src/util/SignalHandler.h:2108-2260
/branches/questsystem5/src/util/SignalHandler.h:2777-2906
/branches/script_trigger/src/orxonox/SignalHandler.h:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.h:2108-2489
/branches/weaponsystem/src/util/SignalHandler.h:2743-2891
/trunk/src/util/SignalHandler.h:2-2086
More information about the Orxonox-commit
mailing list