[Orxonox-commit 137] r2826 - in trunk: . bin cmake src/core src/cpptcl src/network/synchronisable src/orxonox src/orxonox/gamestates src/orxonox/objects src/orxonox/objects/collisionshapes src/orxonox/objects/controllers src/orxonox/objects/gametypes src/orxonox/objects/infos src/orxonox/objects/pickup src/orxonox/objects/quest src/orxonox/objects/weaponSystem 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
Mon Mar 23 12:02:50 CET 2009
Author: landauf
Date: 2009-03-23 11:02:49 +0000 (Mon, 23 Mar 2009)
New Revision: 2826
Added:
trunk/src/orxonox/objects/Teamcolourable.cc
trunk/src/orxonox/objects/Teamcolourable.h
trunk/src/orxonox/objects/gametypes/Deathmatch.cc
trunk/src/orxonox/objects/gametypes/Deathmatch.h
trunk/src/orxonox/objects/gametypes/Pong.cc
trunk/src/orxonox/objects/gametypes/Pong.h
trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc
trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h
trunk/src/orxonox/objects/worldentities/PongBall.cc
trunk/src/orxonox/objects/worldentities/PongBall.h
trunk/src/orxonox/objects/worldentities/PongBat.cc
trunk/src/orxonox/objects/worldentities/PongBat.h
trunk/src/orxonox/objects/worldentities/PongCenterpoint.cc
trunk/src/orxonox/objects/worldentities/PongCenterpoint.h
trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.cc
trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.h
Modified:
trunk/
trunk/bin/client1.bat.in
trunk/bin/client2.bat.in
trunk/bin/dedicated.bat.in
trunk/bin/run.bat.in
trunk/bin/server.bat.in
trunk/cmake/FindDirectX.cmake
trunk/cmake/LibraryConfigTardis.cmake
trunk/src/core/LuaBind.cc
trunk/src/core/LuaBind.h
trunk/src/core/Template.cc
trunk/src/core/Template.h
trunk/src/core/XMLFile.h
trunk/src/core/XMLIncludes.h
trunk/src/cpptcl/cpptcl.cc
trunk/src/cpptcl/cpptcl.h
trunk/src/network/synchronisable/NetworkCallback.h
trunk/src/network/synchronisable/Synchronisable.cc
trunk/src/network/synchronisable/Synchronisable.h
trunk/src/orxonox/CameraManager.cc
trunk/src/orxonox/CameraManager.h
trunk/src/orxonox/OrxonoxPrereqs.h
trunk/src/orxonox/gamestates/GSLevel.cc
trunk/src/orxonox/objects/CMakeLists.txt
trunk/src/orxonox/objects/Level.cc
trunk/src/orxonox/objects/Level.h
trunk/src/orxonox/objects/collisionshapes/
trunk/src/orxonox/objects/controllers/Controller.cc
trunk/src/orxonox/objects/controllers/Controller.h
trunk/src/orxonox/objects/gametypes/CMakeLists.txt
trunk/src/orxonox/objects/gametypes/Gametype.cc
trunk/src/orxonox/objects/gametypes/Gametype.h
trunk/src/orxonox/objects/infos/GametypeInfo.cc
trunk/src/orxonox/objects/infos/GametypeInfo.h
trunk/src/orxonox/objects/infos/HumanPlayer.cc
trunk/src/orxonox/objects/infos/HumanPlayer.h
trunk/src/orxonox/objects/infos/PlayerInfo.cc
trunk/src/orxonox/objects/infos/PlayerInfo.h
trunk/src/orxonox/objects/pickup/Usable.h
trunk/src/orxonox/objects/quest/AddQuest.cc
trunk/src/orxonox/objects/quest/AddQuest.h
trunk/src/orxonox/objects/quest/AddQuestHint.cc
trunk/src/orxonox/objects/quest/AddQuestHint.h
trunk/src/orxonox/objects/quest/AddReward.cc
trunk/src/orxonox/objects/quest/AddReward.h
trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc
trunk/src/orxonox/objects/quest/ChangeQuestStatus.h
trunk/src/orxonox/objects/quest/CompleteQuest.cc
trunk/src/orxonox/objects/quest/CompleteQuest.h
trunk/src/orxonox/objects/quest/FailQuest.cc
trunk/src/orxonox/objects/quest/FailQuest.h
trunk/src/orxonox/objects/quest/GlobalQuest.cc
trunk/src/orxonox/objects/quest/GlobalQuest.h
trunk/src/orxonox/objects/quest/LocalQuest.cc
trunk/src/orxonox/objects/quest/LocalQuest.h
trunk/src/orxonox/objects/quest/Quest.cc
trunk/src/orxonox/objects/quest/Quest.h
trunk/src/orxonox/objects/quest/QuestDescription.cc
trunk/src/orxonox/objects/quest/QuestDescription.h
trunk/src/orxonox/objects/quest/QuestEffect.cc
trunk/src/orxonox/objects/quest/QuestEffect.h
trunk/src/orxonox/objects/quest/QuestHint.cc
trunk/src/orxonox/objects/quest/QuestHint.h
trunk/src/orxonox/objects/quest/QuestItem.cc
trunk/src/orxonox/objects/quest/QuestItem.h
trunk/src/orxonox/objects/quest/QuestManager.cc
trunk/src/orxonox/objects/quest/QuestManager.h
trunk/src/orxonox/objects/quest/Rewardable.cc
trunk/src/orxonox/objects/quest/Rewardable.h
trunk/src/orxonox/objects/weaponSystem/WeaponSystem.cc
trunk/src/orxonox/objects/weaponSystem/WeaponSystem.h
trunk/src/orxonox/objects/worldentities/Backlight.cc
trunk/src/orxonox/objects/worldentities/Backlight.h
trunk/src/orxonox/objects/worldentities/Billboard.h
trunk/src/orxonox/objects/worldentities/CMakeLists.txt
trunk/src/orxonox/objects/worldentities/Camera.cc
trunk/src/orxonox/objects/worldentities/Camera.h
trunk/src/orxonox/objects/worldentities/CameraPosition.cc
trunk/src/orxonox/objects/worldentities/CameraPosition.h
trunk/src/orxonox/objects/worldentities/ControllableEntity.cc
trunk/src/orxonox/objects/worldentities/Light.h
trunk/src/orxonox/objects/worldentities/MobileEntity.cc
trunk/src/orxonox/objects/worldentities/MobileEntity.h
trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc
trunk/src/orxonox/objects/worldentities/ParticleSpawner.h
trunk/src/orxonox/objects/worldentities/StaticEntity.cc
trunk/src/orxonox/objects/worldentities/StaticEntity.h
trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc
trunk/src/orxonox/objects/worldentities/pawns/Pawn.h
trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc
trunk/src/orxonox/objects/worldentities/triggers/Trigger.h
trunk/src/tolua/all-5.0.lua
trunk/src/tolua/all-5.1.lua
trunk/src/util/
trunk/src/util/Exception.cc
trunk/src/util/Exception.h
trunk/src/util/SignalHandler.cc
trunk/src/util/SignalHandler.h
Log:
merged miniprojects branch back to trunk
Property changes on: trunk
___________________________________________________________________
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
/branches/input:1630-1637
/branches/lodfinal:2373-2412
/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/script_trigger:1296-1954,1956
/branches/weapon:1926-2095
/branches/weapon2:2108-2489
+ /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
/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/script_trigger:1296-1954,1956
/branches/weapon:1926-2095
/branches/weapon2:2108-2489
Property changes on: trunk/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/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
+ /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/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client1.bat.in:2755-2825
Property changes on: trunk/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/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
+ /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/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/client2.bat.in:2755-2825
Property changes on: trunk/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/orxonox.bat:1636-1724
/branches/input/bin/orxonox.bat:1630-1637
+ /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/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/dedicated.bat.in:2755-2825
Property changes on: trunk/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/input/bin/orxonox.bat:1630-1637
+ /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/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/run.bat.in:2755-2825
Property changes on: trunk/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/input/bin/orxonox.bat:1630-1637
+ /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/input/bin/orxonox.bat:1630-1637
/branches/miniprojects/bin/server.bat.in:2755-2825
Property changes on: trunk/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
/branches/input/cmake/FindDirectX.cmake:1630-1637
/branches/lodfinal/cmake/FindDirectX.cmake:2373-2412
/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/script_trigger/cmake/FindDirectX.cmake:1296-1954,1956
/branches/weapon/cmake/FindDirectX.cmake:1926-2095
/branches/weapon2/cmake/FindDirectX.cmake:2108-2489
+ /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
/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/script_trigger/cmake/FindDirectX.cmake:1296-1954,1956
/branches/weapon/cmake/FindDirectX.cmake:1926-2095
/branches/weapon2/cmake/FindDirectX.cmake:2108-2489
Property changes on: trunk/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/input/cmake/CheckTardis.cmake:1630-1637
/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/script_trigger/cmake/CheckTardis.cmake:1296-1954,1956
/branches/weapon/cmake/CheckTardis.cmake:1926-2095
+ /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/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/script_trigger/cmake/CheckTardis.cmake:1296-1954,1956
/branches/weapon/cmake/CheckTardis.cmake:1926-2095
Property changes on: trunk/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
/branches/input/src/core/LuaBind.cc:1630-1637
/branches/lodfinal/src/core/LuaBind.cc:2373-2412
/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/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/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
/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/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
Property changes on: trunk/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
/branches/input/src/core/LuaBind.h:1630-1637
/branches/lodfinal/src/core/LuaBind.h:2373-2412
/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/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/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
/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/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
Property changes on: trunk/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/orxonox/objects/Template.cc:1636-1724
/branches/input/src/orxonox/objects/Template.cc:1630-1637
/branches/lodfinal/src/core/Template.cc:2373-2412
/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/script_trigger/src/orxonox/objects/Template.cc:1296-1954,1956
/branches/weapon2/src/core/Template.cc:2108-2489
+ /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/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/script_trigger/src/orxonox/objects/Template.cc:1296-1954,1956
/branches/weapon2/src/core/Template.cc:2108-2489
Property changes on: trunk/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/orxonox/objects/Template.h:1636-1724
/branches/input/src/orxonox/objects/Template.h:1630-1637
/branches/lodfinal/src/core/Template.h:2373-2412
/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/script_trigger/src/orxonox/objects/Template.h:1296-1954,1956
/branches/weapon2/src/core/Template.h:2108-2489
+ /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/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/script_trigger/src/orxonox/objects/Template.h:1296-1954,1956
/branches/weapon2/src/core/Template.h:2108-2489
Property changes on: trunk/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/input/src/core/Level.h:1630-1637
/branches/lodfinal/src/core/XMLFile.h:2373-2412
/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/script_trigger/src/core/Level.h:1296-1954,1956
/branches/weapon2/src/core/XMLFile.h:2108-2489
/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/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/script_trigger/src/core/Level.h:1296-1954,1956
/branches/weapon2/src/core/XMLFile.h:2108-2489
/trunk/src/core/XMLFile.h:2-2086
Property changes on: trunk/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/util/XMLIncludes.h:1636-1724
/branches/input/src/util/XMLIncludes.h:1630-1637
/branches/lodfinal/src/core/XMLIncludes.h:2373-2412
/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/weapon/src/core/XMLIncludes.h:1926-2095
/branches/weapon2/src/core/XMLIncludes.h:2108-2489
+ /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/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/weapon/src/core/XMLIncludes.h:1926-2095
/branches/weapon2/src/core/XMLIncludes.h:2108-2489
Property changes on: trunk/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/input/src/cpptcl/CppTcl.cc:1630-1637
/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/script_trigger/src/cpptcl/CppTcl.cc:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.cc:1926-2095
+ /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/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/script_trigger/src/cpptcl/CppTcl.cc:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.cc:1926-2095
Property changes on: trunk/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/input/src/cpptcl/CppTcl.h:1630-1637
/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/script_trigger/src/cpptcl/CppTcl.h:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.h:1926-2095
+ /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/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/script_trigger/src/cpptcl/CppTcl.h:1296-1954,1956
/branches/weapon/src/cpptcl/CppTcl.h:1926-2095
Property changes on: trunk/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/input/src/network/NetworkCallback.h:1630-1637
/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/script_trigger/src/network/NetworkCallback.h:1296-1954,1956
/branches/weapon/src/network/NetworkCallback.h:1926-2095
+ /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/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/script_trigger/src/network/NetworkCallback.h:1296-1954,1956
/branches/weapon/src/network/NetworkCallback.h:1926-2095
Property changes on: trunk/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/input/src/network/Synchronisable.cc:1630-1637
/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/script_trigger/src/network/Synchronisable.cc:1296-1954,1956
/branches/weapon/src/network/Synchronisable.cc:1926-2095
+ /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/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/script_trigger/src/network/Synchronisable.cc:1296-1954,1956
/branches/weapon/src/network/Synchronisable.cc:1926-2095
Property changes on: trunk/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/input/src/network/Synchronisable.h:1630-1637
/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/script_trigger/src/network/Synchronisable.h:1296-1954,1956
/branches/weapon/src/network/Synchronisable.h:1926-2095
+ /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/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/script_trigger/src/network/Synchronisable.h:1296-1954,1956
/branches/weapon/src/network/Synchronisable.h:1926-2095
Property changes on: trunk/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/objects/CameraHandler.cc:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.cc:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.cc:2373-2412
/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/script_trigger/src/orxonox/objects/CameraHandler.cc:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.cc:2108-2489
/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/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/script_trigger/src/orxonox/objects/CameraHandler.cc:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.cc:2108-2489
/trunk/src/orxonox/CameraManager.cc:2-2086
Property changes on: trunk/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/objects/CameraHandler.h:1636-1724
/branches/input/src/orxonox/objects/CameraHandler.h:1630-1637
/branches/lodfinal/src/orxonox/CameraManager.h:2373-2412
/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/script_trigger/src/orxonox/objects/CameraHandler.h:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.h:2108-2489
/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/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/script_trigger/src/orxonox/objects/CameraHandler.h:1296-1954,1956
/branches/weapon2/src/orxonox/CameraManager.h:2108-2489
/trunk/src/orxonox/CameraManager.h:2-2086
Modified: trunk/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- trunk/src/orxonox/OrxonoxPrereqs.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/OrxonoxPrereqs.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -103,6 +103,8 @@
class Radar;
class RadarListener;
+ class Teamcolourable;
+
class CameraManager;
class LevelManager;
class PawnManager;
@@ -148,9 +150,14 @@
class ParticleEmitter;
class ParticleSpawner;
+ class PongCenterpoint;
+ class PongBall;
+ class PongBat;
+
class Camera;
class CameraPosition;
class SpawnPoint;
+ class TeamSpawnPoint;
class Spectator;
class Pawn;
@@ -192,6 +199,9 @@
class GametypeInfo;
class Gametype;
+ class Deathmatch;
+ class TeamDeathmatch;
+ class Pong;
class Scores;
class CreateLines;
Modified: trunk/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- trunk/src/orxonox/gamestates/GSLevel.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/gamestates/GSLevel.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -48,7 +48,7 @@
namespace orxonox
{
- SetCommandLineArgument(level, "presentation.oxw").shortcut("l");
+ SetCommandLineArgument(level, "presentation_dm.oxw").shortcut("l");
GSLevel::GSLevel()
// : GameState<GSGraphics>(name)
Modified: trunk/src/orxonox/objects/CMakeLists.txt
===================================================================
--- trunk/src/orxonox/objects/CMakeLists.txt 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/CMakeLists.txt 2009-03-23 11:02:49 UTC (rev 2826)
@@ -7,6 +7,7 @@
Radar.cc
RadarListener.cc
RadarViewable.cc
+ Teamcolourable.cc
Tickable.cc
Test.cc
Scene.cc
Modified: trunk/src/orxonox/objects/Level.cc
===================================================================
--- trunk/src/orxonox/objects/Level.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/Level.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -104,19 +104,28 @@
void Level::setGametypeString(const std::string& gametype)
{
Identifier* identifier = ClassByString(gametype);
- if (identifier && identifier->isA(Class(Gametype)))
+
+ if (!identifier || !identifier->isA(Class(Gametype)))
{
+ COUT(0) << "Error: \"" << gametype << "\" is not a valid gametype." << std::endl;
+ identifier = Class(Gametype);
+ this->gametype_ = "Gametype";
+ }
+ else
this->gametype_ = gametype;
- Gametype* rootgametype = dynamic_cast<Gametype*>(identifier->fabricate(this));
- this->setGametype(rootgametype);
+std::cout << "Load Gametype: " << this->gametype_ << std::endl;
- for (std::list<BaseObject*>::iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)
- (*it)->setGametype(rootgametype);
+ Gametype* rootgametype = dynamic_cast<Gametype*>(identifier->fabricate(this));
+ this->setGametype(rootgametype);
- if (LevelManager::getInstancePtr())
- LevelManager::getInstance().requestActivity(this);
- }
+std::cout << "root gametype: " << rootgametype->getIdentifier()->getName() << std::endl;
+
+ for (std::list<BaseObject*>::iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)
+ (*it)->setGametype(rootgametype);
+
+ if (LevelManager::getInstancePtr())
+ LevelManager::getInstance().requestActivity(this);
}
Property changes on: trunk/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/lodfinal/src/orxonox/objects/Level.cc:2373-2412
/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
/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/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
/trunk/src/orxonox/objects/Level.cc:2-2170
Property changes on: trunk/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/lodfinal/src/orxonox/objects/Level.h:2373-2412
/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
/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/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
/trunk/src/orxonox/objects/Level.h:2-2170
Copied: trunk/src/orxonox/objects/Teamcolourable.cc (from rev 2825, branches/miniprojects/src/orxonox/objects/Teamcolourable.cc)
===================================================================
--- trunk/src/orxonox/objects/Teamcolourable.cc (rev 0)
+++ trunk/src/orxonox/objects/Teamcolourable.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,39 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "Teamcolourable.h"
+#include "core/CoreIncludes.h"
+
+namespace orxonox
+{
+ Teamcolourable::Teamcolourable()
+ {
+ RegisterRootObject(Teamcolourable);
+ }
+}
Copied: trunk/src/orxonox/objects/Teamcolourable.h (from rev 2825, branches/miniprojects/src/orxonox/objects/Teamcolourable.h)
===================================================================
--- trunk/src/orxonox/objects/Teamcolourable.h (rev 0)
+++ trunk/src/orxonox/objects/Teamcolourable.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,49 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _Teamcolourable_H__
+#define _Teamcolourable_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "util/Math.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport Teamcolourable : virtual public OrxonoxClass
+ {
+ public:
+ virtual void setTeamColour(const ColourValue& colour) = 0;
+
+ protected:
+ Teamcolourable();
+ };
+}
+
+#endif /* _Teamcolourable_H__ */
Property changes on: trunk/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
/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/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/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/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
/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/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
Modified: trunk/src/orxonox/objects/controllers/Controller.cc
===================================================================
--- trunk/src/orxonox/objects/controllers/Controller.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/controllers/Controller.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -42,41 +42,9 @@
this->player_ = 0;
this->controllableEntity_ = 0;
- this->hud_ = 0;
- this->bUpdateHUD_ = false;
}
Controller::~Controller()
{
- if (this->isInitialized() && this->hud_)
- delete this->hud_;
}
-
- void Controller::changedControllableEntity()
- {
- if (this->bUpdateHUD_)
- {
- this->updateHUD();
- this->bUpdateHUD_ = false;
- }
-
- if (this->hud_)
- this->hud_->setOwner(this->getControllableEntity());
- }
-
- void Controller::updateHUD()
- {
- if (this->hud_)
- {
- delete this->hud_;
- this->hud_ = 0;
- }
-
- if (this->hudtemplate_ != "")
- {
- this->hud_ = new OverlayGroup(this);
- this->hud_->addTemplate(this->hudtemplate_);
- this->hud_->setOwner(this->getControllableEntity());
- }
- }
}
Modified: trunk/src/orxonox/objects/controllers/Controller.h
===================================================================
--- trunk/src/orxonox/objects/controllers/Controller.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/controllers/Controller.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -56,33 +56,11 @@
}
inline ControllableEntity* getControllableEntity() const
{ return this->controllableEntity_; }
- virtual void changedControllableEntity();
+ virtual void changedControllableEntity() {}
- inline void setHUDTemplate(const std::string& name)
- {
- if (name != this->hudtemplate_)
- {
- this->hudtemplate_ = name;
- if (this->controllableEntity_)
- this->updateHUD();
- else
- this->bUpdateHUD_ = true;
- }
- }
- inline const std::string& getHUDTemplate() const
- { return this->hudtemplate_; }
-
- inline OverlayGroup* getHUD() const
- { return this->hud_; }
-
protected:
- void updateHUD();
-
PlayerInfo* player_;
ControllableEntity* controllableEntity_;
- std::string hudtemplate_;
- OverlayGroup* hud_;
- bool bUpdateHUD_;
};
}
Modified: trunk/src/orxonox/objects/gametypes/CMakeLists.txt
===================================================================
--- trunk/src/orxonox/objects/gametypes/CMakeLists.txt 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/gametypes/CMakeLists.txt 2009-03-23 11:02:49 UTC (rev 2826)
@@ -1,3 +1,6 @@
ADD_SOURCE_FILES(ORXONOX_SRC_FILES
Gametype.cc
+ Deathmatch.cc
+ TeamDeathmatch.cc
+ Pong.cc
)
Copied: trunk/src/orxonox/objects/gametypes/Deathmatch.cc (from rev 2825, branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.cc)
===================================================================
--- trunk/src/orxonox/objects/gametypes/Deathmatch.cc (rev 0)
+++ trunk/src/orxonox/objects/gametypes/Deathmatch.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,135 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "Deathmatch.h"
+
+#include "core/CoreIncludes.h"
+#include "objects/infos/PlayerInfo.h"
+#include "objects/worldentities/pawns/Pawn.h"
+
+#include "network/Host.h"
+
+namespace orxonox
+{
+ CreateUnloadableFactory(Deathmatch);
+
+ Deathmatch::Deathmatch(BaseObject* creator) : Gametype(creator)
+ {
+ RegisterObject(Deathmatch);
+ }
+
+ void Deathmatch::start()
+ {
+ Gametype::start();
+
+ std::string message = "The match has started!";
+ COUT(0) << message << std::endl;
+ Host::Broadcast(message);
+ }
+
+ void Deathmatch::end()
+ {
+ Gametype::end();
+
+ std::string message = "The match has ended.";
+ COUT(0) << message << std::endl;
+ Host::Broadcast(message);
+ }
+
+ void Deathmatch::playerEntered(PlayerInfo* player)
+ {
+ Gametype::playerEntered(player);
+
+ std::string message = player->getName() + " entered the game";
+ COUT(0) << message << std::endl;
+ Host::Broadcast(message);
+ }
+
+ bool Deathmatch::playerLeft(PlayerInfo* player)
+ {
+ bool valid_player = Gametype::playerLeft(player);
+
+ if (valid_player)
+ {
+ std::string message = player->getName() + " left the game";
+ COUT(0) << message << std::endl;
+ Host::Broadcast(message);
+ }
+
+ return valid_player;
+ }
+
+ bool Deathmatch::playerChangedName(PlayerInfo* player)
+ {
+ bool valid_player = Gametype::playerChangedName(player);
+
+ if (valid_player)
+ {
+ std::string message = player->getOldName() + " changed name to " + player->getName();
+ COUT(0) << message << std::endl;
+ Host::Broadcast(message);
+ }
+
+ return valid_player;
+ }
+
+ void Deathmatch::pawnKilled(Pawn* victim, Pawn* killer)
+ {
+ if (victim && victim->getPlayer())
+ {
+ std::string message;
+ if (killer)
+ {
+ if (killer->getPlayer())
+ message = victim->getPlayer()->getName() + " was killed by " + killer->getPlayer()->getName();
+ else
+ message = victim->getPlayer()->getName() + " was killed";
+ }
+ else
+ message = victim->getPlayer()->getName() + " died";
+
+ COUT(0) << message << std::endl;
+ Host::Broadcast(message);
+ }
+
+ Gametype::pawnKilled(victim, killer);
+ }
+
+ void Deathmatch::playerScored(PlayerInfo* player)
+ {
+ Gametype::playerScored(player);
+
+ if (player)
+ {
+ std::string message = player->getName() + " scores!";
+ COUT(0) << message << std::endl;
+ Host::Broadcast(message);
+ }
+ }
+}
Copied: trunk/src/orxonox/objects/gametypes/Deathmatch.h (from rev 2825, branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.h)
===================================================================
--- trunk/src/orxonox/objects/gametypes/Deathmatch.h (rev 0)
+++ trunk/src/orxonox/objects/gametypes/Deathmatch.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _Deathmatch_H__
+#define _Deathmatch_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "Gametype.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport Deathmatch : public Gametype
+ {
+ public:
+ Deathmatch(BaseObject* creator);
+ virtual ~Deathmatch() {}
+
+ virtual void start();
+ virtual void end();
+ virtual void playerEntered(PlayerInfo* player);
+ virtual bool playerLeft(PlayerInfo* player);
+ virtual bool playerChangedName(PlayerInfo* player);
+
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
+ virtual void playerScored(PlayerInfo* player);
+ };
+}
+
+#endif /* _Deathmatch_H__ */
Modified: trunk/src/orxonox/objects/gametypes/Gametype.cc
===================================================================
--- trunk/src/orxonox/objects/gametypes/Gametype.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/gametypes/Gametype.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -43,8 +43,6 @@
#include "objects/worldentities/SpawnPoint.h"
#include "objects/worldentities/Camera.h"
-#include "network/Host.h"
-
namespace orxonox
{
CreateUnloadableFactory(Gametype);
@@ -65,8 +63,6 @@
this->setConfigValues();
- this->addBots(this->numberOfBots_);
-
// load the corresponding score board
if (Core::showsGraphics() && this->scoreboardTemplate_ != "")
{
@@ -104,7 +100,8 @@
void Gametype::start()
{
- COUT(0) << "game started" << std::endl;
+ this->addBots(this->numberOfBots_);
+
this->gtinfo_.bStarted_ = true;
this->spawnPlayersIfRequested();
@@ -112,30 +109,23 @@
void Gametype::end()
{
- COUT(0) << "game ended" << std::endl;
this->gtinfo_.bEnded_ = true;
}
void Gametype::playerEntered(PlayerInfo* player)
{
this->players_[player].state_ = PlayerState::Joined;
-
- std::string message = player->getName() + " entered the game";
- COUT(0) << message << std::endl;
- Host::Broadcast(message);
}
- void Gametype::playerLeft(PlayerInfo* player)
+ bool Gametype::playerLeft(PlayerInfo* player)
{
std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
if (it != this->players_.end())
{
this->players_.erase(it);
-
- std::string message = player->getName() + " left the game";
- COUT(0) << message << std::endl;
- Host::Broadcast(message);
+ return true;
}
+ return false;
}
void Gametype::playerSwitched(PlayerInfo* player, Gametype* newgametype)
@@ -146,17 +136,16 @@
{
}
- void Gametype::playerChangedName(PlayerInfo* player)
+ bool Gametype::playerChangedName(PlayerInfo* player)
{
if (this->players_.find(player) != this->players_.end())
{
if (player->getName() != player->getOldName())
{
- std::string message = player->getOldName() + " changed name to " + player->getName();
- COUT(0) << message << std::endl;
- Host::Broadcast(message);
+ return true;
}
}
+ return false;
}
void Gametype::pawnPreSpawn(Pawn* pawn)
@@ -167,25 +156,39 @@
{
}
- void Gametype::pawnKilled(Pawn* victim, Pawn* killer)
+ void Gametype::playerPreSpawn(PlayerInfo* player)
{
- if (victim && victim->getPlayer())
- {
- std::string message;
- if (killer)
- {
- if (killer->getPlayer())
- message = victim->getPlayer()->getName() + " was killed by " + killer->getPlayer()->getName();
- else
- message = victim->getPlayer()->getName() + " was killed";
- }
- else
- message = victim->getPlayer()->getName() + " died";
+ }
- COUT(0) << message << std::endl;
- Host::Broadcast(message);
- }
+ void Gametype::playerPostSpawn(PlayerInfo* player)
+ {
+ }
+ void Gametype::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
+ {
+ }
+
+ void Gametype::playerStopsControllingPawn(PlayerInfo* player, Pawn* pawn)
+ {
+ }
+
+ bool Gametype::allowPawnHit(Pawn* victim, Pawn* originator)
+ {
+ return true;
+ }
+
+ bool Gametype::allowPawnDamage(Pawn* victim, Pawn* originator)
+ {
+ return true;
+ }
+
+ bool Gametype::allowPawnDeath(Pawn* victim, Pawn* originator)
+ {
+ return true;
+ }
+
+ void Gametype::pawnKilled(Pawn* victim, Pawn* killer)
+ {
if (victim && victim->getPlayer())
{
std::map<PlayerInfo*, Player>::iterator it = this->players_.find(victim->getPlayer());
@@ -196,15 +199,7 @@
// Reward killer
if (killer)
- {
- std::map<PlayerInfo*, Player>::iterator itKiller = this->players_.find(killer->getPlayer());
- if (itKiller != this->players_.end())
- {
- this->playerScored(itKiller->second);
- }
- else
- COUT(2) << "Warning: Killing Pawn was not in the playerlist" << std::endl;
- }
+ this->playerScored(killer->getPlayer());
ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getCreator());
if (victim->getCamera())
@@ -224,9 +219,11 @@
}
}
- void Gametype::playerScored(Player& player)
+ void Gametype::playerScored(PlayerInfo* player)
{
- player.frags_++;
+ std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
+ if (it != this->players_.end())
+ it->second.frags_++;
}
SpawnPoint* Gametype::getBestSpawnPoint(PlayerInfo* player) const
@@ -335,8 +332,10 @@
SpawnPoint* spawnpoint = this->getBestSpawnPoint(player);
if (spawnpoint)
{
+ this->playerPreSpawn(player);
player->startControl(spawnpoint->spawn());
this->players_[player].state_ = PlayerState::Alive;
+ this->playerPostSpawn(player);
}
else
{
Modified: trunk/src/orxonox/objects/gametypes/Gametype.h
===================================================================
--- trunk/src/orxonox/objects/gametypes/Gametype.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/gametypes/Gametype.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -83,17 +83,26 @@
virtual void start();
virtual void end();
virtual void playerEntered(PlayerInfo* player);
- virtual void playerLeft(PlayerInfo* player);
+ virtual bool playerLeft(PlayerInfo* player);
virtual void playerSwitched(PlayerInfo* player, Gametype* newgametype);
virtual void playerSwitchedBack(PlayerInfo* player, Gametype* oldgametype);
- virtual void playerChangedName(PlayerInfo* player);
+ virtual bool playerChangedName(PlayerInfo* player);
- virtual void playerScored(Player& player);
+ virtual void playerScored(PlayerInfo* player);
+ virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+
virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
virtual void pawnPreSpawn(Pawn* pawn);
virtual void pawnPostSpawn(Pawn* pawn);
+ virtual void playerPreSpawn(PlayerInfo* player);
+ virtual void playerPostSpawn(PlayerInfo* player);
+ virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
+ virtual void playerStopsControllingPawn(PlayerInfo* player, Pawn* pawn);
+
inline const std::map<PlayerInfo*, Player>& getPlayers() const
{ return this->players_; }
@@ -105,24 +114,26 @@
inline float getStartCountdown() const
{ return this->gtinfo_.startCountdown_; }
+ inline void setHUDTemplate(const std::string& name)
+ { this->gtinfo_.hudtemplate_ = name; }
+ inline const std::string& getHUDTemplate() const
+ { return this->gtinfo_.hudtemplate_; }
+
void addBots(unsigned int amount);
void killBots(unsigned int amount = 0);
inline unsigned int getNumberOfPlayers() const
{ return this->players_.size(); }
- private:
+ protected:
virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
- void addPlayer(PlayerInfo* player);
- void removePlayer(PlayerInfo* player);
+ virtual void assignDefaultPawnsIfNeeded();
+ virtual void checkStart();
+ virtual void spawnPlayer(PlayerInfo* player);
+ virtual void spawnPlayersIfRequested();
+ virtual void spawnDeadPlayersIfRequested();
- void assignDefaultPawnsIfNeeded();
- void checkStart();
- void spawnPlayer(PlayerInfo* player);
- void spawnPlayersIfRequested();
- void spawnDeadPlayersIfRequested();
-
GametypeInfo gtinfo_;
bool bAutoStart_;
Copied: trunk/src/orxonox/objects/gametypes/Pong.cc (from rev 2825, branches/miniprojects/src/orxonox/objects/gametypes/Pong.cc)
===================================================================
--- trunk/src/orxonox/objects/gametypes/Pong.cc (rev 0)
+++ trunk/src/orxonox/objects/gametypes/Pong.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,162 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "Pong.h"
+
+#include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
+#include "core/Executor.h"
+#include "objects/worldentities/Model.h"
+#include "objects/worldentities/PongCenterpoint.h"
+#include "objects/worldentities/PongBall.h"
+#include "objects/worldentities/PongBat.h"
+#include "objects/infos/PlayerInfo.h"
+
+namespace orxonox
+{
+ CreateUnloadableFactory(Pong);
+
+ Pong::Pong(BaseObject* creator) : Deathmatch(creator)
+ {
+ RegisterObject(Pong);
+
+ this->center_ = 0;
+ this->ball_ = 0;
+ this->bat_[0] = 0;
+ this->bat_[1] = 0;
+
+ this->bForceSpawn_ = true;
+
+ this->starttimer_.setTimer(1.0, false, this, createExecutor(createFunctor(&Pong::startBall)));
+ this->starttimer_.stopTimer();
+ }
+
+ void Pong::start()
+ {
+ if (this->center_)
+ {
+ if (!this->ball_)
+ {
+ this->ball_ = new PongBall(this->center_);
+ this->ball_->addTemplate(this->center_->getBalltemplate());
+ }
+
+ this->center_->attach(this->ball_);
+ this->ball_->setPosition(0, 0, 0);
+ this->ball_->setFieldDimension(this->center_->getFieldDimension());
+ this->ball_->setSpeed(0);
+ this->ball_->setBatLength(this->center_->getBatLength());
+
+ if (!this->bat_[0])
+ {
+ this->bat_[0] = new PongBat(this->center_);
+ this->bat_[0]->addTemplate(this->center_->getBattemplate());
+ }
+ if (!this->bat_[1])
+ {
+ this->bat_[1] = new PongBat(this->center_);
+ this->bat_[1]->addTemplate(this->center_->getBattemplate());
+ }
+
+ this->center_->attach(this->bat_[0]);
+ this->center_->attach(this->bat_[1]);
+ this->bat_[0]->setPosition(-this->center_->getFieldDimension().x / 2, 0, 0);
+ this->bat_[1]->setPosition( this->center_->getFieldDimension().x / 2, 0, 0);
+ this->bat_[0]->yaw(Degree(-90));
+ this->bat_[1]->yaw(Degree(90));
+ this->bat_[0]->setSpeed(this->center_->getBatSpeed());
+ this->bat_[1]->setSpeed(this->center_->getBatSpeed());
+ this->bat_[0]->setFieldHeight(this->center_->getFieldDimension().y);
+ this->bat_[1]->setFieldHeight(this->center_->getFieldDimension().y);
+ this->bat_[0]->setLength(this->center_->getBatLength());
+ this->bat_[1]->setLength(this->center_->getBatLength());
+
+ this->ball_->setBats(this->bat_);
+ }
+ else
+ {
+ COUT(1) << "Error: No Centerpoint specified." << std::endl;
+ }
+
+ this->starttimer_.startTimer();
+
+ Deathmatch::start();
+ }
+
+ void Pong::end()
+ {
+ if (this->ball_)
+ {
+ delete this->ball_;
+ this->ball_ = 0;
+ }
+
+ Deathmatch::end();
+ }
+
+ void Pong::spawnPlayer(PlayerInfo* player)
+ {
+ if (!this->bat_[0]->getPlayer())
+ {
+ player->startControl(this->bat_[0]);
+ this->players_[player].state_ = PlayerState::Alive;
+ }
+ else if (!this->bat_[1]->getPlayer())
+ {
+ player->startControl(this->bat_[1]);
+ this->players_[player].state_ = PlayerState::Alive;
+ }
+ }
+
+ void Pong::playerScored(PlayerInfo* player)
+ {
+ Deathmatch::playerScored(player);
+
+ if (this->ball_)
+ {
+ this->ball_->setPosition(Vector3::ZERO);
+ this->ball_->setVelocity(Vector3::ZERO);
+ this->ball_->setSpeed(0);
+ }
+
+ if (this->bat_[0] && this->bat_[1])
+ {
+ this->bat_[0]->setPosition(-this->center_->getFieldDimension().x / 2, 0, 0);
+ this->bat_[1]->setPosition( this->center_->getFieldDimension().x / 2, 0, 0);
+ }
+
+ this->starttimer_.startTimer();
+ }
+
+ void Pong::startBall()
+ {
+ if (this->ball_ && this->center_)
+ this->ball_->setSpeed(this->center_->getBallSpeed());
+ }
+}
Copied: trunk/src/orxonox/objects/gametypes/Pong.h (from rev 2825, branches/miniprojects/src/orxonox/objects/gametypes/Pong.h)
===================================================================
--- trunk/src/orxonox/objects/gametypes/Pong.h (rev 0)
+++ trunk/src/orxonox/objects/gametypes/Pong.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,65 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _Pong_H__
+#define _Pong_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "Deathmatch.h"
+#include "tools/Timer.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport Pong : public Deathmatch
+ {
+ public:
+ Pong(BaseObject* creator);
+ virtual ~Pong() {}
+
+ virtual void start();
+ virtual void end();
+
+ virtual void spawnPlayer(PlayerInfo* player);
+
+ virtual void playerScored(PlayerInfo* player);
+
+ void setCenterpoint(PongCenterpoint* center)
+ { this->center_ = center; }
+
+ protected:
+ void startBall();
+
+ PongCenterpoint* center_;
+ PongBall* ball_;
+ PongBat* bat_[2];
+ Timer<Pong> starttimer_;
+ };
+}
+
+#endif /* _Pong_H__ */
Copied: trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (from rev 2825, branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.cc)
===================================================================
--- trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc (rev 0)
+++ trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,191 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "TeamDeathmatch.h"
+
+#include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
+#include "objects/Teamcolourable.h"
+#include "objects/worldentities/TeamSpawnPoint.h"
+
+namespace orxonox
+{
+ CreateUnloadableFactory(TeamDeathmatch);
+
+ TeamDeathmatch::TeamDeathmatch(BaseObject* creator) : Deathmatch(creator)
+ {
+ RegisterObject(TeamDeathmatch);
+
+ this->teams_ = 2;
+
+ this->setConfigValues();
+ }
+
+ void TeamDeathmatch::setConfigValues()
+ {
+ SetConfigValue(teams_, 2);
+
+ static ColourValue colours[] =
+ {
+ ColourValue(1.0, 0.3, 0.3),
+ ColourValue(0.3, 0.3, 1.0),
+ ColourValue(0.3, 1.0, 0.3),
+ ColourValue(1.0, 1.0, 0.0)
+ };
+ static std::vector<ColourValue> defaultcolours(colours, colours + sizeof(colours) / sizeof(ColourValue));
+
+ SetConfigValueVector(teamcolours_, defaultcolours);
+ }
+
+ void TeamDeathmatch::playerEntered(PlayerInfo* player)
+ {
+ Deathmatch::playerEntered(player);
+
+ std::vector<unsigned int> playersperteam(this->teams_, 0);
+
+ for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
+ if (it->second < this->teams_ && it->second >= 0)
+ playersperteam[it->second]++;
+
+ unsigned int minplayers = (unsigned int)-1;
+ size_t minplayersteam = 0;
+ for (size_t i = 0; i < this->teams_; ++i)
+ {
+ if (playersperteam[i] < minplayers)
+ {
+ minplayers = playersperteam[i];
+ minplayersteam = i;
+ }
+ }
+
+ this->teamnumbers_[player] = minplayersteam;
+ }
+
+ bool TeamDeathmatch::playerLeft(PlayerInfo* player)
+ {
+ bool valid_player = Deathmatch::playerLeft(player);
+
+ if (valid_player)
+ this->players_.erase(player);
+
+ return valid_player;
+ }
+
+ bool TeamDeathmatch::allowPawnHit(Pawn* victim, Pawn* originator)
+ {
+ return (!this->pawnsAreInTheSameTeam(victim, originator));
+ }
+
+ bool TeamDeathmatch::allowPawnDamage(Pawn* victim, Pawn* originator)
+ {
+ return (!this->pawnsAreInTheSameTeam(victim, originator));
+ }
+
+ bool TeamDeathmatch::allowPawnDeath(Pawn* victim, Pawn* originator)
+ {
+ return (!this->pawnsAreInTheSameTeam(victim, originator));
+ }
+
+ SpawnPoint* TeamDeathmatch::getBestSpawnPoint(PlayerInfo* player) const
+ {
+ int desiredTeamNr = -1;
+ std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player);
+ if (it_player != this->teamnumbers_.end())
+ desiredTeamNr = it_player->second;
+
+ // Only use spawnpoints of the own team (or non-team-spawnpoints)
+ std::set<SpawnPoint*> teamSpawnPoints = this->spawnpoints_;
+ for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
+ {
+ if ((*it)->isA(Class(TeamSpawnPoint)))
+ {
+ TeamSpawnPoint* tsp = dynamic_cast<TeamSpawnPoint*>(*it);
+ if (tsp && tsp->getTeamNumber() != desiredTeamNr)
+ {
+ teamSpawnPoints.erase(it++);
+ continue;
+ }
+ }
+
+ ++it;
+ }
+
+ if (teamSpawnPoints.size() > 0)
+ {
+ unsigned int randomspawn = (unsigned int)rnd(teamSpawnPoints.size());
+ unsigned int index = 0;
+ for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); ++it)
+ {
+ if (index == randomspawn)
+ return (*it);
+
+ ++index;
+ }
+ }
+
+ return 0;
+ }
+
+ void TeamDeathmatch::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
+ {
+ if (!player)
+ return;
+
+ // Set the team colour
+ std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player);
+ if (it_player != this->teamnumbers_.end() && it_player->second >= 0 && it_player->second < this->teamcolours_.size())
+ {
+ if (pawn)
+ {
+ std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
+ for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it)
+ {
+ if ((*it)->isA(Class(Teamcolourable)))
+ {
+ Teamcolourable* tc = dynamic_cast<Teamcolourable*>(*it);
+ tc->setTeamColour(this->teamcolours_[it_player->second]);
+ }
+ }
+ }
+ }
+ }
+
+ bool TeamDeathmatch::pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2)
+ {
+ if (pawn1 && pawn2)
+ {
+ std::map<PlayerInfo*, int>::const_iterator it1 = this->teamnumbers_.find(pawn1->getPlayer());
+ std::map<PlayerInfo*, int>::const_iterator it2 = this->teamnumbers_.find(pawn2->getPlayer());
+
+ if (it1 != this->teamnumbers_.end() && it2 != this->teamnumbers_.end())
+ return (it1->second == it2->second);
+ }
+ return false;
+ }
+}
Copied: trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (from rev 2825, branches/miniprojects/src/orxonox/objects/gametypes/TeamDeathmatch.h)
===================================================================
--- trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h (rev 0)
+++ trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,67 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _TeamDeathmatch_H__
+#define _TeamDeathmatch_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <vector>
+
+#include "Deathmatch.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport TeamDeathmatch : public Deathmatch
+ {
+ public:
+ TeamDeathmatch(BaseObject* creator);
+ virtual ~TeamDeathmatch() {}
+
+ void setConfigValues();
+
+ virtual void playerEntered(PlayerInfo* player);
+ virtual bool playerLeft(PlayerInfo* player);
+
+ virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+
+ virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
+
+ protected:
+ virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
+ bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
+
+ std::map<PlayerInfo*, int> teamnumbers_;
+ std::vector<ColourValue> teamcolours_;
+ unsigned int teams_;
+ };
+}
+
+#endif /* _TeamDeathmatch_H__ */
Modified: trunk/src/orxonox/objects/infos/GametypeInfo.cc
===================================================================
--- trunk/src/orxonox/objects/infos/GametypeInfo.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/infos/GametypeInfo.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -57,5 +57,6 @@
registerVariable(this->bEnded_, variableDirection::toclient);
registerVariable(this->startCountdown_, variableDirection::toclient);
registerVariable(this->bStartCountdownRunning_, variableDirection::toclient);
+ registerVariable(this->hudtemplate_, variableDirection::toclient);
}
}
Modified: trunk/src/orxonox/objects/infos/GametypeInfo.h
===================================================================
--- trunk/src/orxonox/objects/infos/GametypeInfo.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/infos/GametypeInfo.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -55,11 +55,15 @@
inline float getStartCountdown() const
{ return this->startCountdown_; }
+ inline const std::string& getHUDTemplate() const
+ { return this->hudtemplate_; }
+
private:
bool bStarted_;
bool bEnded_;
bool bStartCountdownRunning_;
float startCountdown_;
+ std::string hudtemplate_;
};
}
Modified: trunk/src/orxonox/objects/infos/HumanPlayer.cc
===================================================================
--- trunk/src/orxonox/objects/infos/HumanPlayer.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/infos/HumanPlayer.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -52,12 +52,23 @@
this->bHumanPlayer_ = true;
this->defaultController_ = Class(HumanController);
+ this->humanHud_ = 0;
+ this->gametypeHud_ = 0;
+
this->setConfigValues();
this->registerVariables();
}
HumanPlayer::~HumanPlayer()
{
+ if (this->BaseObject::isInitialized())
+ {
+ if (this->humanHud_)
+ delete this->humanHud_;
+
+ if (this->gametypeHud_)
+ delete this->gametypeHud_;
+ }
}
void HumanPlayer::setConfigValues()
@@ -88,7 +99,7 @@
void HumanPlayer::configvaluecallback_changedHUDTemplate()
{
- this->changedController();
+ this->setHumanHUDTemplate(this->hudtemplate_);
}
void HumanPlayer::networkcallback_changednick()
@@ -110,6 +121,7 @@
this->setName(this->nick_);
this->createController();
+ this->updateHumanHUD();
}
}
@@ -145,14 +157,55 @@
this->networkcallback_clientIDchanged();
}
- void HumanPlayer::changedController()
+ void HumanPlayer::changedGametype()
{
- if (this->getController())
+ PlayerInfo::changedGametype();
+
+ if (this->isInitialized() && this->isLocalPlayer())
+ if (this->getGametype()->getHUDTemplate() != "")
+ this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate());
+ }
+
+ void HumanPlayer::changedControllableEntity()
+ {
+ PlayerInfo::changedControllableEntity();
+
+ if (this->humanHud_)
+ this->humanHud_->setOwner(this->getControllableEntity());
+
+ if (this->gametypeHud_)
+ this->gametypeHud_->setOwner(this->getControllableEntity());
+ }
+
+ void HumanPlayer::updateHumanHUD()
+ {
+ if (this->humanHud_)
{
- this->getController()->setHUDTemplate(this->hudtemplate_);
+ delete this->humanHud_;
+ this->humanHud_ = 0;
+ }
- if (this->getController() && this->getController()->getHUD())
- this->getController()->getHUD()->setOwner(this->getControllableEntity());
+ if (this->isLocalPlayer() && this->humanHudTemplate_ != "")
+ {
+ this->humanHud_ = new OverlayGroup(this);
+ this->humanHud_->addTemplate(this->humanHudTemplate_);
+ this->humanHud_->setOwner(this->getControllableEntity());
}
}
+
+ void HumanPlayer::updateGametypeHUD()
+ {
+ if (this->gametypeHud_)
+ {
+ delete this->gametypeHud_;
+ this->gametypeHud_ = 0;
+ }
+
+ if (this->isLocalPlayer() && this->gametypeHudTemplate_ != "")
+ {
+ this->gametypeHud_ = new OverlayGroup(this);
+ this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
+ this->gametypeHud_->setOwner(this->getControllableEntity());
+ }
+ }
}
Modified: trunk/src/orxonox/objects/infos/HumanPlayer.h
===================================================================
--- trunk/src/orxonox/objects/infos/HumanPlayer.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/infos/HumanPlayer.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -50,8 +50,35 @@
void setClientID(unsigned int clientID);
- virtual void changedController();
+ virtual void changedGametype();
+ virtual void changedControllableEntity();
+ inline void setHumanHUDTemplate(const std::string& name)
+ {
+ if (name != this->humanHudTemplate_)
+ {
+ this->humanHudTemplate_ = name;
+ this->updateHumanHUD();
+ }
+ }
+ inline const std::string& getHumanHUDTemplate() const
+ { return this->humanHudTemplate_; }
+ inline OverlayGroup* getHumanHUD() const
+ { return this->humanHud_; }
+
+ inline void setGametypeHUDTemplate(const std::string& name)
+ {
+ if (name != this->gametypeHudTemplate_)
+ {
+ this->gametypeHudTemplate_ = name;
+ this->updateGametypeHUD();
+ }
+ }
+ inline const std::string& getGametypeHUDTemplate() const
+ { return this->gametypeHudTemplate_; }
+ inline OverlayGroup* getGametypeHUD() const
+ { return this->gametypeHud_; }
+
protected:
void configvaluecallback_changednick();
void configvaluecallback_changedHUDTemplate();
@@ -60,11 +87,19 @@
void networkcallback_server_initialized();
void networkcallback_client_initialized();
+ void updateHumanHUD();
+ void updateGametypeHUD();
+
std::string nick_;
std::string synchronize_nick_;
std::string hudtemplate_;
bool server_initialized_;
bool client_initialized_;
+
+ std::string humanHudTemplate_;
+ OverlayGroup* humanHud_;
+ std::string gametypeHudTemplate_;
+ OverlayGroup* gametypeHud_;
};
}
Modified: trunk/src/orxonox/objects/infos/PlayerInfo.cc
===================================================================
--- trunk/src/orxonox/objects/infos/PlayerInfo.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/infos/PlayerInfo.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -140,6 +140,8 @@
if (this->controller_)
this->controller_->setControllableEntity(entity);
+
+ this->changedControllableEntity();
}
void PlayerInfo::stopControl(ControllableEntity* entity, bool callback)
@@ -154,6 +156,8 @@
if (callback)
entity->removePlayer();
+
+ this->changedControllableEntity();
}
}
Modified: trunk/src/orxonox/objects/infos/PlayerInfo.h
===================================================================
--- trunk/src/orxonox/objects/infos/PlayerInfo.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/infos/PlayerInfo.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -48,6 +48,9 @@
virtual void changedName();
virtual void changedGametype();
+ virtual void changedController() {}
+ virtual void changedControllableEntity() {}
+
inline bool isHumanPlayer() const
{ return this->bHumanPlayer_; }
inline bool isLocalPlayer() const
@@ -72,7 +75,6 @@
inline Controller* getController() const
{ return this->controller_; }
- virtual void changedController() {}
protected:
void createController();
Property changes on: trunk/src/orxonox/objects/pickup/Usable.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem2/src/orxonox/objects/pickup/Usable.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/pickup/Usable.h:2663-2709
/branches/ceguilua/src/orxonox/objects/pickup/Usable:1803-1809
/branches/core3/src/orxonox/objects/pickup/Usable:1573-1740
/branches/gcc43/src/orxonox/objects/pickup/Usable:1581
/branches/gui/src/orxonox/objects/pickup/Usable:1636-1724
/branches/input/src/orxonox/objects/pickup/Usable:1630-1637
/branches/lodfinal/src/orxonox/objects/pickup/Usable.h:2373-2412
/branches/network/src/orxonox/objects/pickup/Usable.h:2357
/branches/network64/src/orxonox/objects/pickup/Usable.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/pickup/Usable.h:2172-2480
/branches/overlay/src/orxonox/objects/pickup/Usable.h:2118-2386
/branches/physics/src/orxonox/objects/pickup/Usable.h:2108-2440
/branches/physics_merge/src/orxonox/objects/pickup/Usable.h:2437-2458
/branches/pickups/src/orxonox/objects/pickup/Usable.h:2128
/branches/pickups2/src/orxonox/objects/pickup/Usable.h:2108-2498
/branches/presentation/src/orxonox/objects/pickup/Usable.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/pickup/Usable.h:2108-2260
/branches/weapon2/src/orxonox/objects/pickup/Usable.h:2108-2489
+ /branches/buildsystem2/src/orxonox/objects/pickup/Usable.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/pickup/Usable.h:2663-2709
/branches/ceguilua/src/orxonox/objects/pickup/Usable:1803-1809
/branches/core3/src/orxonox/objects/pickup/Usable:1573-1740
/branches/gcc43/src/orxonox/objects/pickup/Usable:1581
/branches/gui/src/orxonox/objects/pickup/Usable:1636-1724
/branches/input/src/orxonox/objects/pickup/Usable:1630-1637
/branches/lodfinal/src/orxonox/objects/pickup/Usable.h:2373-2412
/branches/miniprojects/src/orxonox/objects/pickup/Usable.h:2755-2825
/branches/network/src/orxonox/objects/pickup/Usable.h:2357
/branches/network64/src/orxonox/objects/pickup/Usable.h:2211-2356
/branches/objecthierarchy2/src/orxonox/objects/pickup/Usable.h:2172-2480
/branches/overlay/src/orxonox/objects/pickup/Usable.h:2118-2386
/branches/physics/src/orxonox/objects/pickup/Usable.h:2108-2440
/branches/physics_merge/src/orxonox/objects/pickup/Usable.h:2437-2458
/branches/pickups/src/orxonox/objects/pickup/Usable.h:2128
/branches/pickups2/src/orxonox/objects/pickup/Usable.h:2108-2498
/branches/presentation/src/orxonox/objects/pickup/Usable.h:2370-2653,2655-2661
/branches/questsystem2/src/orxonox/objects/pickup/Usable.h:2108-2260
/branches/weapon2/src/orxonox/objects/pickup/Usable.h:2108-2489
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/AddQuest.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/AddQuest.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/AddQuest.cc:2108-2489
/trunk/src/orxonox/objects/quest/AddQuest.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/AddQuest.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/AddQuest.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/AddQuest.h:2108-2489
/trunk/src/orxonox/objects/quest/AddQuest.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/AddQuestHint.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/AddQuestHint.cc:2108-2489
/trunk/src/orxonox/objects/quest/AddQuestHint.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/AddQuestHint.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/AddQuestHint.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/AddQuestHint.h:2108-2489
/trunk/src/orxonox/objects/quest/AddQuestHint.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/AddReward.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/AddReward.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/AddReward.cc:2108-2489
/trunk/src/orxonox/objects/quest/AddReward.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/AddReward.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/AddReward.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/AddReward.h:2108-2489
/trunk/src/orxonox/objects/quest/AddReward.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.cc:2108-2489
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/ChangeQuestStatus.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/ChangeQuestStatus.h:2108-2489
/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/CompleteQuest.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/CompleteQuest.cc:2108-2489
/trunk/src/orxonox/objects/quest/CompleteQuest.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/CompleteQuest.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/CompleteQuest.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/CompleteQuest.h:2108-2489
/trunk/src/orxonox/objects/quest/CompleteQuest.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/FailQuest.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/FailQuest.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/FailQuest.cc:2108-2489
/trunk/src/orxonox/objects/quest/FailQuest.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/FailQuest.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/FailQuest.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/FailQuest.h:2108-2489
/trunk/src/orxonox/objects/quest/FailQuest.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/GlobalQuest.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/GlobalQuest.cc:2108-2489
/trunk/src/orxonox/objects/quest/GlobalQuest.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/GlobalQuest.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/GlobalQuest.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/GlobalQuest.h:2108-2489
/trunk/src/orxonox/objects/quest/GlobalQuest.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/LocalQuest.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/LocalQuest.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/LocalQuest.cc:2108-2489
/trunk/src/orxonox/objects/quest/LocalQuest.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/LocalQuest.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/LocalQuest.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/LocalQuest.h:2108-2489
/trunk/src/orxonox/objects/quest/LocalQuest.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/Quest.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/Quest.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/Quest.cc:2108-2489
/trunk/src/orxonox/objects/quest/Quest.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/Quest.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/Quest.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/Quest.h:2108-2489
/trunk/src/orxonox/objects/quest/Quest.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestDescription.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestDescription.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestDescription.cc:2108-2489
/trunk/src/orxonox/objects/quest/QuestDescription.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestDescription.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestDescription.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestDescription.h:2108-2489
/trunk/src/orxonox/objects/quest/QuestDescription.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestEffect.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestEffect.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestEffect.cc:2108-2489
/trunk/src/orxonox/objects/quest/QuestEffect.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestEffect.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestEffect.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestEffect.h:2108-2489
/trunk/src/orxonox/objects/quest/QuestEffect.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestHint.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestHint.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestHint.cc:2108-2489
/trunk/src/orxonox/objects/quest/QuestHint.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestHint.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestHint.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestHint.h:2108-2489
/trunk/src/orxonox/objects/quest/QuestHint.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestItem.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestItem.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestItem.cc:2108-2489
/trunk/src/orxonox/objects/quest/QuestItem.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestItem.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestItem.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestItem.h:2108-2489
/trunk/src/orxonox/objects/quest/QuestItem.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestManager.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestManager.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestManager.cc:2108-2489
/trunk/src/orxonox/objects/quest/QuestManager.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/QuestManager.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/QuestManager.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/QuestManager.h:2108-2489
/trunk/src/orxonox/objects/quest/QuestManager.h:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/Rewardable.cc:2373-2412
/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/weapon2/src/orxonox/objects/quest/Rewardable.cc:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/Rewardable.cc:2108-2489
/trunk/src/orxonox/objects/quest/Rewardable.cc:2-2090
Property changes on: trunk/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/lodfinal/src/orxonox/objects/quest/Rewardable.h:2373-2412
/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/weapon2/src/orxonox/objects/quest/Rewardable.h:2108-2489
/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/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/weapon2/src/orxonox/objects/quest/Rewardable.h:2108-2489
/trunk/src/orxonox/objects/quest/Rewardable.h:2-2090
Property changes on: trunk/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/input/src/orxonox/objects/WeaponSystem.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.cc:2373-2412
/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/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/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/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/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
Property changes on: trunk/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/lodfinal/src/orxonox/objects/weaponSystem/WeaponSystem.h:2373-2412
/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/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2489
+ /branches/buildsystem2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/WeaponSystem.h:2663-2709
/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/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h:2108-2489
Property changes on: trunk/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/input/src/orxonox/objects/Backlight.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.cc:2373-2412
/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/script_trigger/src/orxonox/objects/Backlight.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.cc:2108-2489
/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/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/script_trigger/src/orxonox/objects/Backlight.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.cc:2108-2489
/trunk/src/orxonox/objects/worldentities/Backlight.cc:2-2086
Property changes on: trunk/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/input/src/orxonox/objects/Backlight.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Backlight.h:2373-2412
/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/script_trigger/src/orxonox/objects/Backlight.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.h:2108-2489
/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/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/script_trigger/src/orxonox/objects/Backlight.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Backlight.h:2108-2489
/trunk/src/orxonox/objects/worldentities/Backlight.h:2-2086
Modified: trunk/src/orxonox/objects/worldentities/Billboard.h
===================================================================
--- trunk/src/orxonox/objects/worldentities/Billboard.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/worldentities/Billboard.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -33,10 +33,11 @@
#include "StaticEntity.h"
#include "util/Math.h"
#include "tools/BillboardSet.h"
+#include "objects/Teamcolourable.h"
namespace orxonox
{
- class _OrxonoxExport Billboard : public StaticEntity
+ class _OrxonoxExport Billboard : public StaticEntity, public Teamcolourable
{
public:
Billboard(BaseObject* creator);
@@ -60,6 +61,9 @@
inline const ColourValue& getColour() const
{ return this->colour_; }
+ virtual void setTeamColour(const ColourValue& colour)
+ { this->setColour(colour); }
+
protected:
inline BillboardSet& getBillboardSet()
{ return this->billboard_; }
Modified: trunk/src/orxonox/objects/worldentities/CMakeLists.txt
===================================================================
--- trunk/src/orxonox/objects/worldentities/CMakeLists.txt 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/worldentities/CMakeLists.txt 2009-03-23 11:02:49 UTC (rev 2826)
@@ -18,6 +18,10 @@
ParticleSpawner.cc
Planet.cc
SpawnPoint.cc
+ TeamSpawnPoint.cc
+ PongCenterpoint.cc
+ PongBall.cc
+ PongBat.cc
)
ADD_SUBDIRECTORY(pawns)
Property changes on: trunk/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/input/src/orxonox/objects/Camera.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.cc:2373-2412
/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/script_trigger/src/orxonox/objects/Camera.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.cc:2108-2489
/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/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/script_trigger/src/orxonox/objects/Camera.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.cc:2108-2489
/trunk/src/orxonox/objects/worldentities/Camera.cc:2-2086
Property changes on: trunk/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/input/src/orxonox/objects/Camera.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/Camera.h:2373-2412
/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/script_trigger/src/orxonox/objects/Camera.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.h:2108-2489
/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/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/script_trigger/src/orxonox/objects/Camera.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/Camera.h:2108-2489
/trunk/src/orxonox/objects/worldentities/Camera.h:2-2086
Modified: trunk/src/orxonox/objects/worldentities/CameraPosition.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/CameraPosition.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/worldentities/CameraPosition.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -43,6 +43,7 @@
this->bDrag_ = false;
this->bAllowMouseLook_ = false;
+ this->bAbsolute_ = false;
this->setObjectMode(0x0);
}
@@ -57,6 +58,7 @@
XMLPortParam(CameraPosition, "drag", setDrag, getDrag, xmlelement, mode).defaultValues(false);
XMLPortParam(CameraPosition, "mouselook", setAllowMouseLook, getAllowMouseLook, xmlelement, mode).defaultValues(false);
+ XMLPortParam(CameraPosition, "absolute", setIsAbsolute, getIsAbsolute, xmlelement, mode).defaultValues(false);
}
void CameraPosition::attachCamera(Camera* camera)
Modified: trunk/src/orxonox/objects/worldentities/CameraPosition.h
===================================================================
--- trunk/src/orxonox/objects/worldentities/CameraPosition.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/worldentities/CameraPosition.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -53,11 +53,17 @@
inline bool getAllowMouseLook() const
{ return this->bAllowMouseLook_; }
+ inline void setIsAbsolute(bool bAbsolute)
+ { this->bAbsolute_ = bAbsolute; }
+ inline bool getIsAbsolute() const
+ { return this->bAbsolute_; }
+
void attachCamera(Camera* camera);
private:
bool bDrag_;
bool bAllowMouseLook_;
+ bool bAbsolute_;
};
}
Modified: trunk/src/orxonox/objects/worldentities/ControllableEntity.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/ControllableEntity.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/worldentities/ControllableEntity.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -143,10 +143,19 @@
void ControllableEntity::addCameraPosition(CameraPosition* position)
{
- if (position->getAllowMouseLook())
- position->attachToNode(this->cameraPositionRootNode_);
+ if (!position->getIsAbsolute())
+ {
+ if (position->getAllowMouseLook())
+ position->attachToNode(this->cameraPositionRootNode_);
+ else
+ this->attach(position);
+ }
else
- this->attach(position);
+ {
+ WorldEntity* parent = this->getParent();
+ if (parent)
+ parent->attach(position);
+ }
this->cameraPositions_.push_back(position);
}
Modified: trunk/src/orxonox/objects/worldentities/Light.h
===================================================================
--- trunk/src/orxonox/objects/worldentities/Light.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/worldentities/Light.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -36,10 +36,11 @@
#include <OgreLight.h>
#include "util/Math.h"
+#include "objects/Teamcolourable.h"
namespace orxonox
{
- class _OrxonoxExport Light : public StaticEntity
+ class _OrxonoxExport Light : public StaticEntity, public Teamcolourable
{
public:
Light(BaseObject* creator);
@@ -68,6 +69,9 @@
inline const ColourValue& getSpecularColour() const
{ return this->specular_; }
+ virtual void setTeamColour(const ColourValue& colour)
+ { this->setDiffuseColour(colour); this->setSpecularColour(colour); }
+
/**
@brief Sets the attenuation parameters of the light source i.e. how it diminishes with distance.
Property changes on: trunk/src/orxonox/objects/worldentities/MobileEntity.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.cc:2663-2709
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc:2655-2661
/trunk/src/orxonox/objects/worldentities/MobileEntity.cc:2-2171
+ /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.cc:2663-2709
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.cc:2755-2825
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc:2655-2661
/trunk/src/orxonox/objects/worldentities/MobileEntity.cc:2-2661
Property changes on: trunk/src/orxonox/objects/worldentities/MobileEntity.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.h:2663-2709
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h:2655-2661
/trunk/src/orxonox/objects/worldentities/MobileEntity.h:2-2171
+ /branches/buildsystem3/src/orxonox/objects/worldentities/MobileEntity.h:2663-2709
/branches/miniprojects/src/orxonox/objects/worldentities/MobileEntity.h:2755-2825
/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h:2655-2661
/trunk/src/orxonox/objects/worldentities/MobileEntity.h:2-2661
Property changes on: trunk/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/input/src/orxonox/objects/ParticleSpawner.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.cc:2373-2412
/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/script_trigger/src/orxonox/objects/ParticleSpawner.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2489
/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/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/script_trigger/src/orxonox/objects/ParticleSpawner.cc:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.cc:2108-2489
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.cc:2-2086
Property changes on: trunk/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/input/src/orxonox/objects/ParticleSpawner.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/ParticleSpawner.h:2373-2412
/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/script_trigger/src/orxonox/objects/ParticleSpawner.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2489
/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/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/script_trigger/src/orxonox/objects/ParticleSpawner.h:1296-1954,1956
/branches/weapon2/src/orxonox/objects/worldentities/ParticleSpawner.h:2108-2489
/trunk/src/orxonox/objects/worldentities/ParticleSpawner.h:2-2086
Copied: trunk/src/orxonox/objects/worldentities/PongBall.cc (from rev 2825, branches/miniprojects/src/orxonox/objects/worldentities/PongBall.cc)
===================================================================
--- trunk/src/orxonox/objects/worldentities/PongBall.cc (rev 0)
+++ trunk/src/orxonox/objects/worldentities/PongBall.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,124 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "PongBall.h"
+
+#include "core/CoreIncludes.h"
+#include "objects/worldentities/PongBat.h"
+#include "objects/gametypes/Gametype.h"
+
+namespace orxonox
+{
+ CreateFactory(PongBall);
+
+ PongBall::PongBall(BaseObject* creator) : MovableEntity(creator)
+ {
+ RegisterObject(PongBall);
+
+ this->speed_ = 0;
+ this->bat_ = 0;
+ }
+
+ void PongBall::tick(float dt)
+ {
+ SUPER(PongBall, tick, dt);
+
+ if (Core::isMaster())
+ {
+ Vector3 position = this->getPosition();
+ Vector3 velocity = this->getVelocity();
+
+ if (position.z > this->fieldHeight_ / 2 || position.z < -this->fieldHeight_ / 2)
+ {
+ velocity.z = -velocity.z;
+
+ if (position.z > this->fieldHeight_ / 2)
+ position.z = this->fieldHeight_ / 2;
+ if (position.z < -this->fieldHeight_ / 2)
+ position.z = -this->fieldHeight_ / 2;
+ }
+
+ if (position.x > this->fieldWidth_ / 2 || position.x < -this->fieldWidth_ / 2)
+ {
+ velocity.x = -velocity.x;
+ float distance = 0;
+
+ if (position.x > this->fieldWidth_ / 2)
+ {
+ position.x = this->fieldWidth_ / 2;
+ if (this->bat_ && this->bat_[1])
+ {
+ distance = (position.z - this->bat_[1]->getPosition().z) / (this->fieldHeight_ * this->batlength_ / 2);
+ if (this->getGametype() && this->bat_[0] && fabs(distance) > 1)
+ {
+ this->getGametype()->playerScored(this->bat_[0]->getPlayer());
+ return;
+ }
+ }
+ }
+ if (position.x < -this->fieldWidth_ / 2)
+ {
+ position.x = -this->fieldWidth_ / 2;
+ if (this->bat_ && this->bat_[0])
+ {
+ distance = (position.z - this->bat_[0]->getPosition().z) / (this->fieldHeight_ * this->batlength_ / 2);
+ if (this->getGametype() && this->bat_[1] && fabs(distance) > 1)
+ {
+ this->getGametype()->playerScored(this->bat_[1]->getPlayer());
+ return;
+ }
+ }
+ }
+
+ velocity.z = distance * distance * sgn(distance) * 1.5 * this->speed_;
+ }
+
+ if (velocity != this->getVelocity())
+ this->setVelocity(velocity);
+ if (position != this->getPosition())
+ this->setPosition(position);
+ }
+ }
+
+ void PongBall::setSpeed(float speed)
+ {
+ if (speed != this->speed_)
+ {
+ this->speed_ = speed;
+
+ Vector3 velocity = this->getVelocity();
+ if (velocity.x != 0)
+ velocity.x = sgn(velocity.x) * this->speed_;
+ else
+ velocity.x = this->speed_ * sgn(rnd(-1,1));
+
+ this->setVelocity(velocity);
+ }
+ }
+}
Copied: trunk/src/orxonox/objects/worldentities/PongBall.h (from rev 2825, branches/miniprojects/src/orxonox/objects/worldentities/PongBall.h)
===================================================================
--- trunk/src/orxonox/objects/worldentities/PongBall.h (rev 0)
+++ trunk/src/orxonox/objects/worldentities/PongBall.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,72 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _PongBall_H__
+#define _PongBall_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "objects/worldentities/MovableEntity.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport PongBall : public MovableEntity
+ {
+ public:
+ PongBall(BaseObject* creator);
+ virtual ~PongBall() {}
+
+ virtual void tick(float dt);
+
+ void setFieldDimension(float width, float height)
+ { this->fieldWidth_ = width; this->fieldHeight_ = height; }
+ void setFieldDimension(const Vector2& dimension)
+ { this->setFieldDimension(dimension.x, dimension.y); }
+
+ void setSpeed(float speed);
+ float getSpeed() const
+ { return this->speed_; }
+
+ void setBatLength(float batlength)
+ { this->batlength_ = batlength; }
+ float getBatLength() const
+ { return this->batlength_; }
+
+ void setBats(PongBat** bats)
+ { this->bat_ = bats; }
+
+ private:
+ float fieldWidth_;
+ float fieldHeight_;
+ float speed_;
+ float batlength_;
+ PongBat** bat_;
+ };
+}
+
+#endif /* _PongBall_H__ */
Copied: trunk/src/orxonox/objects/worldentities/PongBat.cc (from rev 2825, branches/miniprojects/src/orxonox/objects/worldentities/PongBat.cc)
===================================================================
--- trunk/src/orxonox/objects/worldentities/PongBat.cc (rev 0)
+++ trunk/src/orxonox/objects/worldentities/PongBat.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,100 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "PongBat.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
+namespace orxonox
+{
+ CreateFactory(PongBat);
+
+ PongBat::PongBat(BaseObject* creator) : ControllableEntity(creator)
+ {
+ RegisterObject(PongBat);
+
+ this->movement_ = 0;
+ this->bMoveLocal_ = false;
+ this->speed_ = 60;
+ this->length_ = 0.25;
+ this->fieldHeight_ = 100;
+
+ this->registerVariables();
+ }
+
+ void PongBat::registerVariables()
+ {
+ registerVariable(this->speed_);
+ registerVariable(this->speed_);
+ registerVariable(this->speed_);
+ }
+
+ void PongBat::tick(float dt)
+ {
+ if (this->hasLocalController())
+ {
+ this->movement_ = clamp(this->movement_, -1.0f, 1.0f) * this->speed_;
+
+ if (this->bMoveLocal_)
+ this->setVelocity(this->getOrientation() * Vector3(this->movement_, 0, 0));
+ else
+ this->setVelocity(0, 0, this->movement_);
+
+ this->movement_ = 0;
+ }
+
+ SUPER(PongBat, tick, dt);
+
+ if (this->hasLocalController())
+ {
+ Vector3 position = this->getPosition();
+
+ if (position.z > this->fieldHeight_ / 2 - this->fieldHeight_ * this->length_ / 2)
+ position.z = this->fieldHeight_ / 2 - this->fieldHeight_ * this->length_ / 2;
+ if (position.z < -this->fieldHeight_ / 2 + this->fieldHeight_ * this->length_ / 2)
+ position.z = -this->fieldHeight_ / 2 + this->fieldHeight_ * this->length_ / 2;
+
+ if (position != this->getPosition())
+ this->setPosition(position);
+ }
+ }
+
+ void PongBat::moveFrontBack(const Vector2& value)
+ {
+ this->bMoveLocal_ = false;
+ this->movement_ -= value.x;
+ }
+
+ void PongBat::moveRightLeft(const Vector2& value)
+ {
+ this->bMoveLocal_ = true;
+ this->movement_ = value.x;
+ }
+}
Copied: trunk/src/orxonox/objects/worldentities/PongBat.h (from rev 2825, branches/miniprojects/src/orxonox/objects/worldentities/PongBat.h)
===================================================================
--- trunk/src/orxonox/objects/worldentities/PongBat.h (rev 0)
+++ trunk/src/orxonox/objects/worldentities/PongBat.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,74 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _PongBat_H__
+#define _PongBat_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "objects/worldentities/ControllableEntity.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport PongBat : public ControllableEntity
+ {
+ public:
+ PongBat(BaseObject* creator);
+ virtual ~PongBat() {}
+
+ void registerVariables();
+ virtual void tick(float dt);
+
+ virtual void moveFrontBack(const Vector2& value);
+ virtual void moveRightLeft(const Vector2& value);
+
+ void setSpeed(float speed)
+ { this->speed_ = speed; }
+ float getSpeed() const
+ { return this->speed_; }
+
+ void setFieldHeight(float height)
+ { this->fieldHeight_ = height; }
+ float getFieldHeight() const
+ { return this->fieldHeight_; }
+
+ void setLength(float length)
+ { this->length_ = length; }
+ float getLength() const
+ { return this->length_; }
+
+ private:
+ float movement_;
+ bool bMoveLocal_;
+ float speed_;
+ float length_;
+ float fieldHeight_;
+ };
+}
+
+#endif /* _PongBat_H__ */
Copied: trunk/src/orxonox/objects/worldentities/PongCenterpoint.cc (from rev 2825, branches/miniprojects/src/orxonox/objects/worldentities/PongCenterpoint.cc)
===================================================================
--- trunk/src/orxonox/objects/worldentities/PongCenterpoint.cc (rev 0)
+++ trunk/src/orxonox/objects/worldentities/PongCenterpoint.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,80 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "PongCenterpoint.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "objects/gametypes/Pong.h"
+
+namespace orxonox
+{
+ CreateFactory(PongCenterpoint);
+
+ PongCenterpoint::PongCenterpoint(BaseObject* creator) : StaticEntity(creator)
+ {
+ RegisterObject(PongCenterpoint);
+
+ this->width_ = 200;
+ this->height_ = 120;
+ this->ballspeed_ = 100;
+ this->batspeed_ = 60;
+ this->batlength_ = 0.25;
+
+ this->checkGametype();
+ }
+
+ void PongCenterpoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(PongCenterpoint, XMLPort, xmlelement, mode);
+
+ XMLPortParam(PongCenterpoint, "dimension", setFieldDimension, getFieldDimension, xmlelement, mode);
+ XMLPortParam(PongCenterpoint, "balltemplate", setBalltemplate, getBalltemplate, xmlelement, mode);
+ XMLPortParam(PongCenterpoint, "battemplate", setBattemplate, getBattemplate, xmlelement, mode);
+ XMLPortParam(PongCenterpoint, "ballspeed", setBallSpeed, getBallSpeed, xmlelement, mode);
+ XMLPortParam(PongCenterpoint, "batspeed", setBatSpeed, getBatSpeed, xmlelement, mode);
+ XMLPortParam(PongCenterpoint, "batlength", setBatLength, getBatLength, xmlelement, mode);
+ }
+
+ void PongCenterpoint::changedGametype()
+ {
+ SUPER(PongCenterpoint, changedGametype);
+
+ this->checkGametype();
+ }
+
+ void PongCenterpoint::checkGametype()
+ {
+ if (this->getGametype() && this->getGametype()->isA(Class(Pong)))
+ {
+ Pong* pong_gametype = dynamic_cast<Pong*>(this->getGametype());
+ pong_gametype->setCenterpoint(this);
+ }
+ }
+}
Copied: trunk/src/orxonox/objects/worldentities/PongCenterpoint.h (from rev 2825, branches/miniprojects/src/orxonox/objects/worldentities/PongCenterpoint.h)
===================================================================
--- trunk/src/orxonox/objects/worldentities/PongCenterpoint.h (rev 0)
+++ trunk/src/orxonox/objects/worldentities/PongCenterpoint.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,93 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _PongCenterpoint_H__
+#define _PongCenterpoint_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "objects/worldentities/StaticEntity.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport PongCenterpoint : public StaticEntity
+ {
+ public:
+ PongCenterpoint(BaseObject* creator);
+ virtual ~PongCenterpoint() {}
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
+ virtual void changedGametype();
+
+ void setBalltemplate(const std::string& balltemplate)
+ { this->balltemplate_ = balltemplate; }
+ const std::string& getBalltemplate() const
+ { return this->balltemplate_; }
+
+ void setBattemplate(const std::string& battemplate)
+ { this->battemplate_ = battemplate; }
+ const std::string& getBattemplate() const
+ { return this->battemplate_; }
+
+ void setFieldDimension(const Vector2& dimension)
+ { this->width_ = dimension.x; this->height_ = dimension.y; }
+ Vector2 getFieldDimension() const
+ { return Vector2(this->width_, this->height_); }
+
+ void setBallSpeed(float ballspeed)
+ { this->ballspeed_ = ballspeed; }
+ float getBallSpeed() const
+ { return this->ballspeed_; }
+
+ void setBatSpeed(float batspeed)
+ { this->batspeed_ = batspeed; }
+ float getBatSpeed() const
+ { return this->batspeed_; }
+
+ void setBatLength(float batlength)
+ { this->batlength_ = batlength; }
+ float getBatLength() const
+ { return this->batlength_; }
+
+ private:
+ void checkGametype();
+
+ std::string balltemplate_;
+ std::string battemplate_;
+
+ float ballspeed_;
+ float batspeed_;
+ float batlength_;
+
+ float width_;
+ float height_;
+ };
+}
+
+#endif /* _PongCenterpoint_H__ */
Property changes on: trunk/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/input/src/orxonox/objects/worldentities/PositionableEntity.cc:1630-1637
/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/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.cc:1926-2095
+ /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/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/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.cc:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.cc:1926-2095
Property changes on: trunk/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/input/src/orxonox/objects/worldentities/PositionableEntity.h:1630-1637
/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/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.h:1926-2095
+ /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/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/script_trigger/src/orxonox/objects/worldentities/PositionableEntity.h:1296-1954,1956
/branches/weapon/src/orxonox/objects/worldentities/PositionableEntity.h:1926-2095
Copied: trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.cc (from rev 2825, branches/miniprojects/src/orxonox/objects/worldentities/TeamSpawnPoint.cc)
===================================================================
--- trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.cc (rev 0)
+++ trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "TeamSpawnPoint.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
+namespace orxonox
+{
+ CreateFactory(TeamSpawnPoint);
+
+ TeamSpawnPoint::TeamSpawnPoint(BaseObject* creator) : SpawnPoint(creator)
+ {
+ RegisterObject(TeamSpawnPoint);
+
+ this->teamNumber_ = 0;
+ }
+
+ void TeamSpawnPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(TeamSpawnPoint, XMLPort, xmlelement, mode);
+
+ XMLPortParam(TeamSpawnPoint, "team", setTeamNumber, getTeamNumber, xmlelement, mode).defaultValues(0);
+ }
+}
Copied: trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.h (from rev 2825, branches/miniprojects/src/orxonox/objects/worldentities/TeamSpawnPoint.h)
===================================================================
--- trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.h (rev 0)
+++ trunk/src/orxonox/objects/worldentities/TeamSpawnPoint.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -0,0 +1,56 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _TeamSpawnPoint_H__
+#define _TeamSpawnPoint_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "SpawnPoint.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport TeamSpawnPoint : public SpawnPoint
+ {
+ public:
+ TeamSpawnPoint(BaseObject* creator);
+ virtual ~TeamSpawnPoint() {}
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
+ void setTeamNumber(unsigned int team)
+ { this->teamNumber_ = team; }
+ unsigned int getTeamNumber() const
+ { return this->teamNumber_; }
+
+ private:
+ unsigned int teamNumber_;
+ };
+}
+
+#endif /* _TeamSpawnPoint_H__ */
Modified: trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-03-23 11:02:49 UTC (rev 2826)
@@ -132,6 +132,22 @@
this->death();
}
+ void Pawn::setPlayer(PlayerInfo* player)
+ {
+ ControllableEntity::setPlayer(player);
+
+ if (this->getGametype())
+ this->getGametype()->playerStartsControllingPawn(player, this);
+ }
+
+ void Pawn::removePlayer()
+ {
+ if (this->getGametype())
+ this->getGametype()->playerStopsControllingPawn(this->getPlayer(), this);
+
+ ControllableEntity::removePlayer();
+ }
+
void Pawn::setHealth(float health)
{
this->health_ = min(health, this->maxHealth_);
@@ -139,18 +155,24 @@
void Pawn::damage(float damage, Pawn* originator)
{
- this->setHealth(this->health_ - damage);
- this->lastHitOriginator_ = originator;
+ if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
+ {
+ this->setHealth(this->health_ - damage);
+ this->lastHitOriginator_ = originator;
- // play damage effect
+ // play damage effect
+ }
}
void Pawn::hit(Pawn* originator, const Vector3& force, float damage)
{
- this->damage(damage, originator);
- this->setVelocity(this->getVelocity() + force);
+ if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
+ {
+ this->damage(damage, originator);
+ this->setVelocity(this->getVelocity() + force);
- // play hit effect
+ // play hit effect
+ }
}
void Pawn::kill()
@@ -175,19 +197,24 @@
void Pawn::death()
{
- // Set bAlive_ to false and wait for PawnManager to do the destruction
- this->bAlive_ = false;
+ if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
+ {
+ // Set bAlive_ to false and wait for PawnManager to do the destruction
+ this->bAlive_ = false;
- this->setDestroyWhenPlayerLeft(false);
+ this->setDestroyWhenPlayerLeft(false);
- if (this->getGametype())
- this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
+ if (this->getGametype())
+ this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
- if (this->getPlayer())
- this->getPlayer()->stopControl(this);
+ if (this->getPlayer())
+ this->getPlayer()->stopControl(this);
- if (Core::isMaster())
- this->deatheffect();
+ if (Core::isMaster())
+ this->deatheffect();
+ }
+ else
+ this->setHealth(1);
}
void Pawn::deatheffect()
Modified: trunk/src/orxonox/objects/worldentities/pawns/Pawn.h
===================================================================
--- trunk/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-03-23 10:32:02 UTC (rev 2825)
+++ trunk/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-03-23 11:02:49 UTC (rev 2826)
@@ -47,6 +47,9 @@
virtual void tick(float dt);
void registerVariables();
+ virtual void setPlayer(PlayerInfo* player);
+ virtual void removePlayer();
+
inline bool isAlive() const
{ return this->bAlive_; }
Property changes on: trunk/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/input/src/orxonox/objects/DistanceTrigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2373-2412
/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/script_trigger/src/orxonox/objects/DistanceTrigger.cc:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2489
/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/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/script_trigger/src/orxonox/objects/DistanceTrigger.cc:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2108-2489
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc:2-2086
Property changes on: trunk/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/input/src/orxonox/objects/DistanceTrigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2373-2412
/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/script_trigger/src/orxonox/objects/DistanceTrigger.h:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2489
/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/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/script_trigger/src/orxonox/objects/DistanceTrigger.h:1296-1692,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2108-2489
/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h:2-2086
Property changes on: trunk/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/input/src/orxonox/objects/Trigger.cc:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.cc:2373-2412
/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/script_trigger/src/orxonox/objects/Trigger.cc:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2489
/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/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/script_trigger/src/orxonox/objects/Trigger.cc:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.cc:2108-2489
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc:2-2086
Property changes on: trunk/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/input/src/orxonox/objects/Trigger.h:1630-1637
/branches/lodfinal/src/orxonox/objects/worldentities/triggers/Trigger.h:2373-2412
/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/script_trigger/src/orxonox/objects/Trigger.h:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2489
/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/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/script_trigger/src/orxonox/objects/Trigger.h:1296-1382,1956
/branches/weapon2/src/orxonox/objects/worldentities/triggers/Trigger.h:2108-2489
/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h:2-2086
Property changes on: trunk/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/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
+ /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/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.0.lua:2755-2825
Property changes on: trunk/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/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
+ /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/lua/all.lua:1636-1724
/branches/input/src/tolua/lua/all.lua:1630-1637
/branches/miniprojects/src/tolua/all-5.1.lua:2755-2825
Property changes on: trunk/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
/branches/input/src/util:1630-1637
/branches/lodfinal/src/util:2373-2412
/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/script_trigger/src/util:1296-1954,1956
/branches/weapon/src/util:1926-2095
/branches/weapon2/src/util:2108-2489
+ /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
/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/script_trigger/src/util:1296-1954,1956
/branches/weapon/src/util:1926-2095
/branches/weapon2/src/util:2108-2489
Property changes on: trunk/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/input/src/core/Exception.cc:1630-1637
/branches/lodfinal/src/util/Exception.cc:2373-2412
/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/weapon/src/util/Exception.cc:1926-2095
/branches/weapon2/src/util/Exception.cc:2108-2489
+ /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/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/weapon/src/util/Exception.cc:1926-2095
/branches/weapon2/src/util/Exception.cc:2108-2489
Property changes on: trunk/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/input/src/core/Exception.h:1630-1637
/branches/lodfinal/src/util/Exception.h:2373-2412
/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/weapon/src/util/Exception.h:1926-2095
/branches/weapon2/src/util/Exception.h:2108-2489
+ /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/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/weapon/src/util/Exception.h:1926-2095
/branches/weapon2/src/util/Exception.h:2108-2489
Property changes on: trunk/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/input/src/orxonox/SignalHandler.cc:1630-1637
/branches/lodfinal/src/util/SignalHandler.cc:2373-2412
/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/script_trigger/src/orxonox/SignalHandler.cc:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.cc:2108-2489
/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/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/script_trigger/src/orxonox/SignalHandler.cc:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.cc:2108-2489
/trunk/src/util/SignalHandler.cc:2-2086
Property changes on: trunk/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/input/src/orxonox/SignalHandler.h:1630-1637
/branches/lodfinal/src/util/SignalHandler.h:2373-2412
/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/script_trigger/src/orxonox/SignalHandler.h:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.h:2108-2489
/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/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/script_trigger/src/orxonox/SignalHandler.h:1296-1954,1956
/branches/weapon2/src/util/SignalHandler.h:2108-2489
/trunk/src/util/SignalHandler.h:2-2086
More information about the Orxonox-commit
mailing list