# # ChangeLog for code/branches # # Generated by Trac 1.0.9 # Nov 28, 2024, 8:27:53 PM Sun, 24 May 2009 21:27:14 GMT scheusso [3045] * code/branches/netp3/src/network/Client.cc (modified) * code/branches/netp3/src/network/Client.h (modified) * code/branches/netp3/src/network/ClientConnection.cc (modified) * code/branches/netp3/src/network/ClientConnection.h (modified) * code/branches/netp3/src/network/GamestateManager.cc (modified) * code/branches/netp3/src/network/GamestateManager.h (modified) * code/branches/netp3/src/network/Server.cc (modified) * code/branches/netp3/src/network/Server.h (modified) * code/branches/netp3/src/network/packet/Gamestate.cc (modified) * code/branches/netp3/src/network/packet/Gamestate.h (modified) * code/branches/netp3/src/network/synchronisable/SynchronisableVariable.cc (modified) * code/branches/netp3/src/network/synchronisable/SynchronisableVariable.h (modified) some cleaning up Sun, 24 May 2009 21:25:55 GMT scheusso [3044] * code/branches/netp3/src/orxonox/objects/worldentities/PongBall.cc (modified) clientside physics of pong now working Sun, 24 May 2009 20:38:06 GMT scheusso [3043] * code/branches/netp3/src/network/TrafficControl.cc (modified) * code/branches/netp3/src/network/packet/Gamestate.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/PongBall.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/PongBall.h (modified) first approach of having client-side pong physics some optimisations ... Sun, 24 May 2009 20:23:43 GMT bknecht [3042] * code/branches/pickups2/src/orxonox/objects/pickup/Jump.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h (modified) fixed some includes to make code compilable on Unix systems Sun, 24 May 2009 20:01:49 GMT danielh [3041] * code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (modified) Now creating some CEGUI windows for items as soon as the inventory is ... Sun, 24 May 2009 19:43:45 GMT landauf [3040] * code/branches/pickups2/src/orxonox/objects/pickup/Jump.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h (modified) added 2 typedefs in PickupCollection.cc to replace _Pairii which ... Sat, 23 May 2009 18:07:31 GMT landauf [3032] * code/branches/gametypes_test (deleted) test Sat, 23 May 2009 18:03:44 GMT landauf [3031] * code/branches/gametypes_test (modified) test Sat, 23 May 2009 17:57:07 GMT landauf [3030] * code/branches/gametypes_test (modified) * code/branches/gametypes_test/bin/client1.bat.in (modified) * code/branches/gametypes_test/bin/client2.bat.in (modified) * code/branches/gametypes_test/bin/dedicated.bat.in (modified) * code/branches/gametypes_test/bin/run.bat.in (modified) * code/branches/gametypes_test/bin/server.bat.in (modified) * code/branches/gametypes_test/bin/standalone.bat.in (modified) * code/branches/gametypes_test/cmake/FindDirectX.cmake (modified) * code/branches/gametypes_test/cmake/LibraryConfigTardis.cmake (modified) * code/branches/gametypes_test/src/core/LuaBind.cc (modified) * code/branches/gametypes_test/src/core/LuaBind.h (modified) * code/branches/gametypes_test/src/core/Template.cc (modified) * code/branches/gametypes_test/src/core/Template.h (modified) * code/branches/gametypes_test/src/core/XMLFile.h (modified) * code/branches/gametypes_test/src/core/XMLIncludes.h (modified) * code/branches/gametypes_test/src/cpptcl/cpptcl.cc (modified) * code/branches/gametypes_test/src/cpptcl/cpptcl.h (modified) * code/branches/gametypes_test/src/network/synchronisable/NetworkCallback.h (modified) * code/branches/gametypes_test/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/gametypes_test/src/network/synchronisable/Synchronisable.h (modified) * code/branches/gametypes_test/src/orxonox/CameraManager.cc (modified) * code/branches/gametypes_test/src/orxonox/CameraManager.h (modified) * code/branches/gametypes_test/src/orxonox/objects/Level.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/Level.h (modified) * code/branches/gametypes_test/src/orxonox/objects/collisionshapes (modified) * code/branches/gametypes_test/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) * code/branches/gametypes_test/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/Quest.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/gametypes_test/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/gametypes_test/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/gametypes_test/src/tolua/all-5.0.lua (modified) * code/branches/gametypes_test/src/tolua/all-5.1.lua (modified) * code/branches/gametypes_test/src/util (modified) * code/branches/gametypes_test/src/util/Exception.cc (modified) * code/branches/gametypes_test/src/util/Exception.h (modified) * code/branches/gametypes_test/src/util/SignalHandler.cc (modified) * code/branches/gametypes_test/src/util/SignalHandler.h (modified) test Sat, 23 May 2009 17:54:20 GMT landauf [3029] * code/branches/gametypes_test (copied) test Sat, 23 May 2009 17:04:10 GMT landauf [3020] * code/branches/gametypes/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified) * code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc (modified) * code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h (modified) some small adjustments in all the new gametype classes Sat, 23 May 2009 16:24:32 GMT landauf [3019] * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified) * code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc (modified) * code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h (modified) set eol-style:native, no codechanges Sat, 23 May 2009 15:24:40 GMT landauf [3018] * code/branches/lod (deleted) * code/branches/lod2 (deleted) removed lod and lod2. lodfinal is still in use. Sat, 23 May 2009 14:34:59 GMT landauf [3017] * code/branches/gui (deleted) * code/branches/questsystem4 (deleted) * code/branches/questsystem5 (deleted) * code/branches/weaponsystem (deleted) removed some branches Sat, 23 May 2009 07:53:13 GMT danielh [3016] * code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h (modified) - minor fix in PickupCollection - Made PickupInventory into a ... Fri, 22 May 2009 07:46:53 GMT scheusso [3015] * code/branches/netp3/src/network/TrafficControl.cc (modified) * code/branches/netp3/src/network/TrafficControl.h (modified) * code/branches/netp3/src/network/packet/Gamestate.cc (modified) * code/branches/netp3/src/network/packet/Gamestate.h (modified) trying to make some performance improvements in TrafficControl Fri, 22 May 2009 07:15:59 GMT scheusso [3014] * code/branches/netp3/src/core/input/InputManager.cc (modified) * code/branches/netp3/src/core/input/InputManager.h (modified) console command grabMouse / ungrabMouse now working (used for a ... Thu, 21 May 2009 19:25:16 GMT bknecht [3013] * code/branches/sound2 (modified) * code/branches/sound2/bin/client1.bat.in (modified) * code/branches/sound2/bin/client2.bat.in (modified) * code/branches/sound2/bin/dedicated.bat.in (modified) * code/branches/sound2/bin/run.bat.in (modified) * code/branches/sound2/bin/server.bat.in (modified) * code/branches/sound2/bin/standalone.bat.in (modified) * code/branches/sound2/cmake/FindDirectX.cmake (modified) * code/branches/sound2/cmake/LibraryConfigTardis.cmake (modified) * code/branches/sound2/src/CMakeLists.txt (modified) * code/branches/sound2/src/audio (deleted) * code/branches/sound2/src/core/LuaBind.cc (modified) * code/branches/sound2/src/core/LuaBind.h (modified) * code/branches/sound2/src/core/Template.cc (modified) * code/branches/sound2/src/core/Template.h (modified) * code/branches/sound2/src/core/XMLFile.h (modified) * code/branches/sound2/src/core/XMLIncludes.h (modified) * code/branches/sound2/src/cpptcl/cpptcl.cc (modified) * code/branches/sound2/src/cpptcl/cpptcl.h (modified) * code/branches/sound2/src/network/synchronisable/NetworkCallback.h (modified) * code/branches/sound2/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/sound2/src/network/synchronisable/Synchronisable.h (modified) * code/branches/sound2/src/orxonox/CMakeLists.txt (modified) * code/branches/sound2/src/orxonox/CameraManager.cc (modified) * code/branches/sound2/src/orxonox/CameraManager.h (modified) * code/branches/sound2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/sound2/src/orxonox/objects/Level.cc (modified) * code/branches/sound2/src/orxonox/objects/Level.h (modified) * code/branches/sound2/src/orxonox/objects/collisionshapes (modified) * code/branches/sound2/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/branches/sound2/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) * code/branches/sound2/src/orxonox/objects/items/Engine.cc (modified) * code/branches/sound2/src/orxonox/objects/items/Engine.h (modified) * code/branches/sound2/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/sound2/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/sound2/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/sound2/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/sound2/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/sound2/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/sound2/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/sound2/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/sound2/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/sound2/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/Quest.h (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/sound2/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/sound2/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/sound2/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/sound2/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/sound2/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/sound2/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/sound2/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/sound2/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/sound2/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/sound2/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/sound2/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/sound2/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/sound2/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/sound2/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/branches/sound2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/sound2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/sound2/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/sound2/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/sound2/src/orxonox/sound (copied) * code/branches/sound2/src/orxonox/sound/CMakeLists.txt (copied) * code/branches/sound2/src/orxonox/sound/SoundBase.cc (copied) * code/branches/sound2/src/orxonox/sound/SoundBase.h (copied) * code/branches/sound2/src/orxonox/sound/SoundManager.cc (copied) * code/branches/sound2/src/orxonox/sound/SoundManager.h (copied) * code/branches/sound2/src/tolua/all-5.0.lua (modified) * code/branches/sound2/src/tolua/all-5.1.lua (modified) * code/branches/sound2/src/util (modified) * code/branches/sound2/src/util/Exception.cc (modified) * code/branches/sound2/src/util/Exception.h (modified) * code/branches/sound2/src/util/SignalHandler.cc (modified) * code/branches/sound2/src/util/SignalHandler.h (modified) merged sound changes into sound2 use sound2 from now on Thu, 21 May 2009 18:17:33 GMT rgrieder [3012] * code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponSystem.cc (modified) Build fix: Member functions marked as const should only iterate over ... Thu, 21 May 2009 17:14:05 GMT bknecht [3011] * code/branches/sound2 (copied) Created sound2 branch to be able to implement sound in mainmenu Thu, 21 May 2009 16:41:59 GMT rgrieder [3010] * code/branches/sound/src/orxonox/objects/items/Engine.cc (modified) Bufix in Engine.cc (revealed with runtest on windows/msvc). Please ... Thu, 21 May 2009 15:43:14 GMT rgrieder [3009] * code/branches/ggz/cmake/LibraryConfig.cmake (modified) Inadvertently forgot to adjust the ENDIF statement. Thu, 21 May 2009 10:12:33 GMT rgrieder [3007] * code/branches/netp3/src/CMakeLists.txt (modified) Strange happenings... Thu, 21 May 2009 10:08:06 GMT rgrieder [3006] * code/branches/netp3/src/CMakeLists.txt (modified) Fix following the hack before. Thu, 21 May 2009 09:57:52 GMT rgrieder [3005] * code/branches/netp3/src/core/input/InputManager.cc (modified) * code/branches/netp3/src/core/input/InputManager.h (modified) Ugly hacking for a nearing presentation ^^ You should now be able to ... Wed, 20 May 2009 23:18:46 GMT scheusso [3004] * code/branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.h (modified) reverted changes of ControllableEntity synchronisation now again ... Wed, 20 May 2009 22:55:44 GMT scheusso [3003] * code/branches/netp3/src/network/Client.cc (modified) * code/branches/netp3/src/network/ClientConnection.cc (modified) * code/branches/netp3/src/network/packet/Gamestate.cc (modified) - fix in connection handling - reduced debug cpu load on ... Wed, 20 May 2009 20:45:36 GMT rgrieder [3002] * code/branches/ggz/cmake/LibraryConfig.cmake (modified) * code/branches/ggz/src/CMakeLists.txt (modified) Possible build bug: in the compiler config files (BuildConfig, etc.) ... Wed, 20 May 2009 19:01:17 GMT danielh [3001] * code/branches/pickups2/src/orxonox/CMakeLists.txt (modified) * code/branches/pickups2/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/Jump.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/Jump.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h (modified) - Added helper method to HumanController to get it's ... Wed, 20 May 2009 18:47:08 GMT adrfried [3000] * code/branches/ggz/bin/ggz (added) * code/branches/ggz/bin/ggz/module.dsc (added) * code/branches/ggz/bin/ggz/orxonox.dsc (added) * code/branches/ggz/bin/ggz/orxonox.room (added) * code/branches/ggz/cmake/FindGGZ.cmake (modified) * code/branches/ggz/cmake/LibraryConfig.cmake (modified) * code/branches/ggz/src/orxonox/CMakeLists.txt (modified) * code/branches/ggz/src/orxonox/GGZClient.cc (modified) * code/branches/ggz/src/orxonox/GGZClient.h (modified) * code/branches/ggz/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/ggz/src/orxonox/gamestates/GSClient.h (modified) some ggz things Wed, 20 May 2009 18:45:29 GMT erwin [2999] * code/branches/sound/src/orxonox/objects/items/Engine.cc (modified) fixed segfault bug on tardis Wed, 20 May 2009 18:31:23 GMT erwin [2998] * code/branches/sound/src/orxonox/objects/items/Engine.cc (modified) * code/branches/sound/src/orxonox/sound/SoundBase.cc (modified) * code/branches/sound/src/orxonox/sound/SoundManager.cc (modified) * code/branches/sound/src/orxonox/sound/SoundManager.h (modified) fixed some bugs Wed, 20 May 2009 14:18:02 GMT adrfried [2997] * code/branches/ggz/cmake/BuildConfigGCC.cmake (modified) * code/branches/ggz/src/orxonox/GGZClient.cc (modified) * code/branches/ggz/src/orxonox/GGZClient.h (modified) * code/branches/ggz/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/ggz/src/orxonox/objects/FDWatcher.cc (deleted) * code/branches/ggz/src/orxonox/objects/FDWatcher.h (deleted) some asio functionality Wed, 20 May 2009 14:13:26 GMT rgrieder [2996] * code/branches/netp3/src/core/Game.cc (modified) * code/branches/netp3/src/core/Game.h (modified) * code/branches/netp3/src/core/GameState.cc (modified) * code/branches/netp3/src/core/GameState.h (modified) * code/branches/netp3/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/netp3/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/netp3/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/netp3/src/orxonox/gamestates/GSRoot.h (modified) Fixed tick-time issue: Not all tick times were being taken into ... Wed, 20 May 2009 14:10:02 GMT rgrieder [2995] * code/branches/netp3/src/network/NetworkFunction.h (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestManager.cc (modified) Fixed two small build problems. Tue, 19 May 2009 20:05:30 GMT scheusso [2992] * code/branches/netp3/src/network/Client.cc (modified) * code/branches/netp3/src/network/ConnectionManager.cc (modified) some fixes (in tick, getDeltaTime) and error output Tue, 19 May 2009 20:04:39 GMT scheusso [2991] * code/branches/netp3/src/network/synchronisable/SynchronisableVariable.cc (modified) * code/branches/netp3/src/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/netp3/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/netp3/src/orxonox/objects/controllers/AIController.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) forgot some things Tue, 19 May 2009 19:35:10 GMT scheusso [2990] * code/branches/netp3 (modified) * code/branches/netp3/bin/client1.bat.in (modified) * code/branches/netp3/bin/client2.bat.in (modified) * code/branches/netp3/bin/dedicated.bat.in (modified) * code/branches/netp3/bin/run.bat.in (modified) * code/branches/netp3/bin/server.bat.in (modified) * code/branches/netp3/bin/standalone.bat.in (modified) * code/branches/netp3/cmake/FindDirectX.cmake (modified) * code/branches/netp3/cmake/LibraryConfigTardis.cmake (modified) * code/branches/netp3/src/core/LuaBind.cc (modified) * code/branches/netp3/src/core/LuaBind.h (modified) * code/branches/netp3/src/core/Template.cc (modified) * code/branches/netp3/src/core/Template.h (modified) * code/branches/netp3/src/core/XMLFile.h (modified) * code/branches/netp3/src/core/XMLIncludes.h (modified) * code/branches/netp3/src/cpptcl/cpptcl.cc (modified) * code/branches/netp3/src/cpptcl/cpptcl.h (modified) * code/branches/netp3/src/network/CMakeLists.txt (modified) * code/branches/netp3/src/network/Client.cc (modified) * code/branches/netp3/src/network/Client.h (modified) * code/branches/netp3/src/network/ClientConnection.cc (modified) * code/branches/netp3/src/network/ClientConnection.h (modified) * code/branches/netp3/src/network/ConnectionManager.cc (modified) * code/branches/netp3/src/network/ConnectionManager.h (modified) * code/branches/netp3/src/network/FunctionCallManager.cc (copied) * code/branches/netp3/src/network/FunctionCallManager.h (copied) * code/branches/netp3/src/network/Host.h (modified) * code/branches/netp3/src/network/NetworkFunction.cc (copied) * code/branches/netp3/src/network/NetworkFunction.h (copied) * code/branches/netp3/src/network/NetworkPrereqs.h (modified) * code/branches/netp3/src/network/Server.cc (modified) * code/branches/netp3/src/network/Server.h (modified) * code/branches/netp3/src/network/TrafficControl.cc (modified) * code/branches/netp3/src/network/packet/CMakeLists.txt (modified) * code/branches/netp3/src/network/packet/ClassID.cc (modified) * code/branches/netp3/src/network/packet/FunctionCalls.cc (copied) * code/branches/netp3/src/network/packet/FunctionCalls.h (copied) * code/branches/netp3/src/network/packet/FunctionIDs.cc (copied) * code/branches/netp3/src/network/packet/FunctionIDs.h (copied) * code/branches/netp3/src/network/packet/Gamestate.cc (modified) * code/branches/netp3/src/network/packet/Packet.cc (modified) * code/branches/netp3/src/network/packet/Packet.h (modified) * code/branches/netp3/src/network/synchronisable/NetworkCallback.h (modified) * code/branches/netp3/src/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/netp3/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/netp3/src/network/synchronisable/Synchronisable.h (modified) * code/branches/netp3/src/network/synchronisable/SynchronisableSpecialisations.cc (modified) * code/branches/netp3/src/network/synchronisable/SynchronisableVariable.cc (copied) * code/branches/netp3/src/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/netp3/src/orxonox/CameraManager.cc (modified) * code/branches/netp3/src/orxonox/CameraManager.h (modified) * code/branches/netp3/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/netp3/src/orxonox/objects/Level.cc (modified) * code/branches/netp3/src/orxonox/objects/Level.h (modified) * code/branches/netp3/src/orxonox/objects/Test.cc (modified) * code/branches/netp3/src/orxonox/objects/Test.h (modified) * code/branches/netp3/src/orxonox/objects/collisionshapes (modified) * code/branches/netp3/src/orxonox/objects/controllers/AIController.cc (modified) * code/branches/netp3/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/branches/netp3/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) * code/branches/netp3/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/netp3/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/netp3/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/netp3/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/netp3/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/netp3/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/netp3/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/netp3/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/netp3/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/netp3/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/Quest.h (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/netp3/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/netp3/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/netp3/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/netp3/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/netp3/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/netp3/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/netp3/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/netp3/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/netp3/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/netp3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/netp3/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/netp3/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/netp3/src/tolua/all-5.0.lua (modified) * code/branches/netp3/src/tolua/all-5.1.lua (modified) * code/branches/netp3/src/util (modified) * code/branches/netp3/src/util/Exception.cc (modified) * code/branches/netp3/src/util/Exception.h (modified) * code/branches/netp3/src/util/MultiType.h (modified) * code/branches/netp3/src/util/MultiTypeValue.h (modified) * code/branches/netp3/src/util/Serialise.h (copied) * code/branches/netp3/src/util/SignalHandler.cc (modified) * code/branches/netp3/src/util/SignalHandler.h (modified) merged netp2 -> netp3 Tue, 19 May 2009 19:13:54 GMT scheusso [2989] * code/branches/netp3 (copied) created now netp3 branch Mon, 18 May 2009 17:26:11 GMT rgrieder [2987] * code/branches/weapons/src/orxonox/objects/weaponsystem/CMakeLists.txt~ (deleted) * code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.h~ (deleted) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt~ (deleted) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc~ (deleted) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h~ (deleted) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc~ (deleted) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h~ (deleted) Removed temporary editor files. Mon, 18 May 2009 16:00:13 GMT Aurelian [2986] * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (modified) * code/branches/gametypes/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified) Respawning changed, not possible anymore, not completely working. ... Mon, 18 May 2009 15:01:45 GMT vmikos [2985] * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (modified) final version Mon, 18 May 2009 14:52:26 GMT erwin [2984] * code/branches/sound/cmake/LibraryConfig.cmake (modified) * code/branches/sound/src/orxonox/sound/SoundBase.cc (modified) * code/branches/sound/src/orxonox/sound/SoundManager.cc (modified) implemented a fallback ogg loader via libvorbisfile Mon, 18 May 2009 14:29:40 GMT Hagen [2983] * code/branches/weapons/src/orxonox/objects/weaponsystem/CMakeLists.txt~ (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.cc (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.h (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/MuzzleFlash.h~ (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt~ (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc~ (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h~ (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc~ (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h~ (added) MuzzleFlash finally there, EnergyDrink weapon Mon, 18 May 2009 13:38:22 GMT erwin [2982] * code/branches/sound/src/orxonox/objects/items/Engine.cc (modified) * code/branches/sound/src/orxonox/sound/SoundManager.cc (modified) added some error checking Mon, 18 May 2009 12:46:12 GMT Hagen [2981] * code/branches/weapons/src/orxonox/objects/weaponsystem/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/worldentities/CMakeLists.txt (modified) moved MuzzleFlash into weaponsystem Folder Mon, 18 May 2009 12:24:34 GMT erwin [2980] * code/branches/sound/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/sound/src/orxonox/objects/Level.cc (modified) * code/branches/sound/src/orxonox/objects/Level.h (modified) * code/branches/sound/src/orxonox/objects/items/Engine.cc (modified) * code/branches/sound/src/orxonox/objects/items/Engine.h (modified) * code/branches/sound/src/orxonox/sound/SoundBase.cc (modified) * code/branches/sound/src/orxonox/sound/SoundBase.h (modified) * code/branches/sound/src/orxonox/sound/SoundManager.cc (modified) added config ability to sound, few other changes Mon, 18 May 2009 12:06:04 GMT Hagen [2979] * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h (modified) * code/branches/weapons/src/orxonox/objects/worldentities/CMakeLists.txt (modified) working laser style weapon with muzzleflash Sun, 17 May 2009 19:23:41 GMT Aurelian [2978] * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified) * code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc (modified) some fixes on the timer, visibility of checkpoint removed (done in ... Thu, 14 May 2009 12:35:54 GMT Naaduun [2977] * code/branches/map/src/orxonox/objects/RadarViewable.cc (modified) * code/branches/map/src/orxonox/overlays/map/Map.cc (modified) * code/branches/map/src/orxonox/overlays/map/Map.h (modified) * code/branches/map/src/util/SubString.cc (modified) =movable plane Wed, 13 May 2009 13:14:08 GMT scheusso [2976] * code/branches/netp2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) removed some debug output Wed, 13 May 2009 12:25:04 GMT rgrieder [2975] * code/branches/netp2/src/network/Host.h (modified) * code/branches/netp2/src/orxonox/objects/worldentities/MobileEntity.h (modified) - Fixed stupid bug in MobileEntity.h - Removed a compiler warning Wed, 13 May 2009 11:58:44 GMT scheusso [2974] * code/branches/netp2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) debug output for reto Mon, 11 May 2009 16:03:40 GMT danielh [2972] * code/branches/pickups2/src/orxonox/CMakeLists.txt (modified) * code/branches/pickups2/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt (modified) * code/branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h (modified) * code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (added) * code/branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h (added) * code/branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc (modified) * code/branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.cc (modified) * code/branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.h (modified) Update - Minor changes in BaseItem - Updated to NotificationQueue ... Mon, 11 May 2009 15:31:21 GMT mockm [2971] * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (modified) new revision of Gametype UnderAttack: Timerfunction and some color added Mon, 11 May 2009 15:00:55 GMT Aurelian [2970] * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified) * code/branches/gametypes/src/orxonox/overlays/hud/CMakeLists.txt (modified) * code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc (added) * code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h (added) Added timer in class gametype, timer working in asteroids, modified ... Mon, 11 May 2009 13:58:38 GMT jsmely [2969] * code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc (added) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h (added) * code/branches/weapons/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/weapons/src/orxonox/objects/worldentities/Billboard.h (modified) weapon updated Mon, 11 May 2009 13:37:19 GMT erwin [2968] * code/branches/sound/src/orxonox/sound/SoundBase.cc (modified) corrected typo Mon, 11 May 2009 13:29:23 GMT erwin [2967] * code/branches/sound/src/CMakeLists.txt (modified) * code/branches/sound/src/orxonox/CMakeLists.txt (modified) * code/branches/sound/src/orxonox/sound/SoundBase.cc (modified) * code/branches/sound/src/orxonox/sound/SoundBase.h (modified) SoundBase now loads files relative to the mediapath Mon, 11 May 2009 12:30:54 GMT erwin [2966] * code/branches/sound/src/orxonox/CMakeLists.txt (modified) * code/branches/sound/src/orxonox/objects/Level.cc (modified) * code/branches/sound/src/orxonox/objects/Level.h (modified) * code/branches/sound/src/orxonox/sound (added) * code/branches/sound/src/orxonox/sound/CMakeLists.txt (copied) * code/branches/sound/src/orxonox/sound/SoundBase.cc (copied) * code/branches/sound/src/orxonox/sound/SoundBase.h (copied) * code/branches/sound/src/orxonox/sound/SoundManager.cc (copied) * code/branches/sound/src/orxonox/sound/SoundManager.h (copied) * code/branches/sound/src/sound (deleted) moved files, modified to support multiple contexts Mon, 11 May 2009 11:42:10 GMT scheusso [2965] * code/branches/netp2/src/network/Client.cc (modified) * code/branches/netp2/src/network/Client.h (modified) * code/branches/netp2/src/network/ClientConnection.cc (modified) * code/branches/netp2/src/network/ClientConnection.h (modified) * code/branches/netp2/src/network/ConnectionManager.cc (modified) * code/branches/netp2/src/network/ConnectionManager.h (modified) * code/branches/netp2/src/network/Host.h (modified) * code/branches/netp2/src/network/Server.h (modified) some fixes (bidirectional variables, ...), some changes (client ... Mon, 11 May 2009 11:30:17 GMT scheusso [2964] * code/branches/netp2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/netp2/src/orxonox/objects/worldentities/ControllableEntity.h (modified) changed synchronisation of controllable entity steering not fully ... Sun, 10 May 2009 20:49:36 GMT Aurelian [2961] * code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc (modified) Gametype Asteroids - ForceField working Thu, 07 May 2009 14:44:12 GMT Naaduun [2956] * code/branches/map/src/orxonox/objects/RadarViewable.cc (modified) * code/branches/map/src/orxonox/objects/RadarViewable.h (modified) * code/branches/map/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/map/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/map/src/orxonox/overlays/map/Map.cc (modified) * code/branches/map/src/orxonox/overlays/map/Map.h (modified) added rotate and zoom to map. using static mapscenemanager now Mon, 04 May 2009 18:31:03 GMT erwin [2955] * code/branches/sound/src/orxonox/objects/Level.cc (modified) * code/branches/sound/src/sound/SoundBase.h (modified) corrected typo Mon, 04 May 2009 15:28:59 GMT Aurelian [2954] * code/branches/gametypes/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc (added) * code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.h (added) * code/branches/gametypes/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/MobileEntity.h (modified) ForceField not working jet, but no errors... Mon, 04 May 2009 15:04:58 GMT scheusso [2953] * code/branches/netp2/src/network/ConnectionManager.cc (modified) * code/branches/netp2/src/network/Server.cc (modified) some changes for testing purpose Mon, 04 May 2009 14:34:48 GMT mockm [2952] * code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/SpawnPoint.cc (modified) new revision of gametype UnderAttack: Ship is now moving Mon, 04 May 2009 14:03:02 GMT scheusso [2951] * code/branches/netp2/src/network/NetworkFunction.h (modified) small fix for memberfunction calls with non-existing (or not anymore ... Mon, 04 May 2009 13:40:08 GMT erwin [2950] * code/branches/sound/cmake/LibraryConfig.cmake (modified) * code/branches/sound/src/orxonox/CMakeLists.txt (modified) * code/branches/sound/src/orxonox/objects/Level.cc (modified) * code/branches/sound/src/orxonox/objects/Level.h (modified) * code/branches/sound/src/sound/CMakeLists.txt (added) * code/branches/sound/src/sound/SoundBase.cc (modified) * code/branches/sound/src/sound/SoundBase.h (modified) * code/branches/sound/src/sound/SoundManager.cc (modified) * code/branches/sound/src/sound/SoundManager.h (modified) * code/branches/sound/src/sound/copyheader (deleted) ambient sound loading for levels Sat, 02 May 2009 14:19:43 GMT scheusso [2949] * code/branches/netp2/src/network/FunctionCallManager.cc (modified) * code/branches/netp2/src/network/FunctionCallManager.h (modified) * code/branches/netp2/src/network/Server.cc (modified) * code/branches/netp2/src/network/packet/FunctionCalls.cc (modified) * code/branches/netp2/src/network/packet/FunctionCalls.h (modified) * code/branches/netp2/src/orxonox/objects/Test.cc (modified) * code/branches/netp2/src/orxonox/objects/Test.h (modified) * code/branches/netp2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/netp2/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/netp2/src/util/MultiType.h (modified) Network Function calls possible now (already used in ... Fri, 01 May 2009 21:34:14 GMT scheusso [2948] * code/branches/netp2/src/network/Client.cc (modified) * code/branches/netp2/src/network/NetworkFunction.cc (modified) * code/branches/netp2/src/network/NetworkFunction.h (modified) * code/branches/netp2/src/orxonox/objects/Test.cc (modified) * code/branches/netp2/src/orxonox/objects/Test.h (modified) member function calls should work now argument transfer still untested Fri, 01 May 2009 20:24:27 GMT scheusso [2947] * code/branches/netp2/src/OrxonoxConfig.h.in (modified) applying change from trunk (r2946) Fri, 01 May 2009 13:16:12 GMT scheusso [2945] * code/branches/netp2/src/network/FunctionCallManager.cc (modified) * code/branches/netp2/src/network/packet/FunctionCalls.cc (modified) fixed some bugs Fri, 01 May 2009 07:47:34 GMT scheusso [2944] * code/branches/netp2/src/network/FunctionCallManager.cc (modified) * code/branches/netp2/src/network/NetworkFunction.cc (modified) * code/branches/netp2/src/network/NetworkFunction.h (modified) * code/branches/netp2/src/network/Server.cc (modified) * code/branches/netp2/src/network/packet/FunctionCalls.cc (modified) * code/branches/netp2/src/network/packet/Packet.cc (modified) * code/branches/netp2/src/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/netp2/src/orxonox/objects/Test.cc (modified) * code/branches/netp2/src/orxonox/objects/Test.h (modified) this is another commit for testing purpose still trying to get ... Thu, 30 Apr 2009 12:54:44 GMT scheusso [2943] * code/branches/netp2/src/network/NetworkFunction.h (modified) fixed a problem with copying function pointers Thu, 30 Apr 2009 12:12:57 GMT Naaduun [2942] * code/branches/map/src/orxonox/objects/RadarViewable.cc (modified) * code/branches/map/src/orxonox/objects/RadarViewable.h (modified) * code/branches/map/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/map/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/map/src/orxonox/overlays/map/Map.cc (modified) * code/branches/map/src/orxonox/overlays/map/Map.h (modified) * code/branches/map/src/orxonox/tools/CMakeLists.txt (modified) * code/branches/map/src/orxonox/tools/DynamicLines.cpp (added) * code/branches/map/src/orxonox/tools/DynamicLines.h (added) * code/branches/map/src/orxonox/tools/DynamicRenderable.cpp (added) * code/branches/map/src/orxonox/tools/DynamicRenderable.h (added) * code/branches/map/src/util/CMakeLists.txt (modified) =added dynamic libs to orxonox/tools. changed humancontroller to use ... Wed, 29 Apr 2009 18:07:43 GMT rgrieder [2941] * code/branches/netp2/src/network/NetworkFunction.h (modified) Small mvsc build fix. Wed, 29 Apr 2009 17:05:51 GMT scheusso [2940] * code/branches/netp2/src/network/synchronisable/Synchronisable.h (modified) fixed bug for bidirectional variables Wed, 29 Apr 2009 14:38:35 GMT stefalie [2939] * code/branches/toonshader/src/orxonox/objects/worldentities/Model.cc (modified) ugly hacks to get shaders up runnin Wed, 29 Apr 2009 14:10:35 GMT scheusso [2938] * code/branches/netp2/src/network/packet/FunctionCalls.cc (added) * code/branches/netp2/src/network/packet/FunctionCalls.h (added) forgot two files Wed, 29 Apr 2009 14:05:35 GMT scheusso [2937] * code/branches/netp2/src/network/CMakeLists.txt (modified) * code/branches/netp2/src/network/FunctionCallManager.cc (added) * code/branches/netp2/src/network/FunctionCallManager.h (added) * code/branches/netp2/src/network/NetworkFunction.cc (added) * code/branches/netp2/src/network/NetworkFunction.h (added) * code/branches/netp2/src/network/NetworkPrereqs.h (modified) * code/branches/netp2/src/network/packet/CMakeLists.txt (modified) * code/branches/netp2/src/network/packet/ClassID.cc (modified) * code/branches/netp2/src/network/packet/FunctionIDs.cc (added) * code/branches/netp2/src/network/packet/FunctionIDs.h (added) * code/branches/netp2/src/network/packet/Packet.cc (modified) * code/branches/netp2/src/network/packet/Packet.h (modified) * code/branches/netp2/src/network/synchronisable/Synchronisable.h (modified) * code/branches/netp2/src/network/synchronisable/SynchronisableVariableSpecialisations.h (deleted) * code/branches/netp2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/netp2/src/orxonox/objects/Test.cc (modified) * code/branches/netp2/src/orxonox/objects/Test.h (modified) * code/branches/netp2/src/util/MultiType.h (modified) commit for testing reasons - added possibility to transfer function ... Mon, 27 Apr 2009 15:15:04 GMT Aurelian [2936] * code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) Checkpoints in a row working with final destination-> end of game Mon, 27 Apr 2009 15:12:59 GMT mockm [2935] * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc (modified) new revision of gametype UnderAttack Mon, 27 Apr 2009 14:26:49 GMT vmikos [2934] * code/branches/gametypes/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (added) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (modified) fast endversion TeamBaseMatch Mon, 27 Apr 2009 13:58:25 GMT mockm [2933] * code/branches/gametypes/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc (added) * code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h (added) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc (added) * code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h (added) Gametype UnderAttack added Mon, 27 Apr 2009 13:30:34 GMT erwin [2932] * code/branches/sound/src/sound/SoundBase.cc (modified) * code/branches/sound/src/sound/SoundBase.h (modified) * code/branches/sound/src/sound/SoundManager.cc (modified) * code/branches/sound/src/sound/SoundManager.h (modified) Sound: implemented sample file loading via alut Mon, 27 Apr 2009 12:41:50 GMT erwin [2931] * code/branches/sound/src/sound/SoundBase.cc (modified) * code/branches/sound/src/sound/SoundBase.h (modified) * code/branches/sound/src/sound/SoundManager.cc (modified) Sound: SoundBase complete Mon, 27 Apr 2009 11:18:13 GMT erwin [2930] * code/branches/sound/src/CMakeLists.txt (modified) * code/branches/sound/src/sound/SoundBase.h (modified) * code/branches/sound/src/sound/SoundManager.cc (modified) * code/branches/sound/src/sound/SoundManager.h (modified) Sound: Added building things, corrected some typos Thu, 23 Apr 2009 11:50:52 GMT stefalie [2929] * code/branches/toonshader (copied) new branch for toon/cell shading... lets go comic Sat, 18 Apr 2009 17:28:41 GMT landauf [2924] * code/branches/weapons/src/orxonox/objects/weaponsystem/WeaponMode.cc (modified) fixed a small bug concerning the muzzle offset. it makes much more ... Sat, 18 Apr 2009 17:21:36 GMT landauf [2923] * code/branches/weapons/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h (modified) * code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) adjusted weaponsystem-path in (hopefully) all files. Sat, 18 Apr 2009 17:12:25 GMT landauf [2922] * code/branches/weapons/src/orxonox/objects/weaponsystem (moved) Renamed directory 'weaponSystem' as 'weaponsystem' to avoid mixed- ... Sat, 18 Apr 2009 17:06:36 GMT landauf [2921] * code/branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes (moved) * code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/CMakeLists.txt (copied) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Fusion.cc (deleted) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Fusion.h (deleted) * code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.cc (copied) * code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.h (copied) * code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.cc (copied) * code/branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.h (copied) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (deleted) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (deleted) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.cc (deleted) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.h (deleted) renamed directory "weapons" as "weaponmodes" Sat, 18 Apr 2009 16:59:02 GMT landauf [2920] * code/branches/weapons/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc (moved) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h (moved) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc (modified) renamed LaserGunMunition as LaserMunition Sat, 18 Apr 2009 16:41:00 GMT landauf [2919] * code/branches/weapons/src/orxonox/objects/weaponSystem/DefaultWeaponmodeLink.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.cc (modified) removed some debug output, cleanup in WeaponMode Sat, 18 Apr 2009 16:14:52 GMT landauf [2918] * code/branches/weapons/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/weapons/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/weapons/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/Munition.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.cc (added) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.h (added) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/ReplenishingMunition.cc (added) * code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/ReplenishingMunition.h (added) * code/branches/weapons/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/projectiles/Projectile.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.cc (moved) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.h (moved) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc (moved) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.h (moved) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.cc (deleted) * code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.h (deleted) * code/branches/weapons/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) Added many new features in the Munition class: - there are now 3 ... Wed, 15 Apr 2009 15:03:58 GMT landauf [2917] * code/branches/pickups2 (modified) * code/branches/pickups2/bin/client1.bat.in (modified) * code/branches/pickups2/bin/client2.bat.in (modified) * code/branches/pickups2/bin/dedicated.bat.in (modified) * code/branches/pickups2/bin/run.bat.in (modified) * code/branches/pickups2/bin/server.bat.in (modified) * code/branches/pickups2/bin/standalone.bat.in (modified) * code/branches/pickups2/cmake/FindDirectX.cmake (modified) * code/branches/pickups2/cmake/LibraryConfigTardis.cmake (modified) * code/branches/pickups2/src/core/LuaBind.cc (modified) * code/branches/pickups2/src/core/LuaBind.h (modified) * code/branches/pickups2/src/core/Template.cc (modified) * code/branches/pickups2/src/core/Template.h (modified) * code/branches/pickups2/src/core/XMLFile.h (modified) * code/branches/pickups2/src/core/XMLIncludes.h (modified) * code/branches/pickups2/src/cpptcl/cpptcl.cc (modified) * code/branches/pickups2/src/cpptcl/cpptcl.h (modified) * code/branches/pickups2/src/network/synchronisable/NetworkCallback.h (modified) * code/branches/pickups2/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/pickups2/src/network/synchronisable/Synchronisable.h (modified) * code/branches/pickups2/src/orxonox/CameraManager.cc (modified) * code/branches/pickups2/src/orxonox/CameraManager.h (modified) * code/branches/pickups2/src/orxonox/objects/Level.cc (modified) * code/branches/pickups2/src/orxonox/objects/Level.h (modified) * code/branches/pickups2/src/orxonox/objects/collisionshapes (modified) * code/branches/pickups2/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/pickups2/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/pickups2/src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) * code/branches/pickups2/src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) * code/branches/pickups2/src/orxonox/objects/items/Engine.cc (modified) * code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc (copied) * code/branches/pickups2/src/orxonox/objects/pickup/BaseItem.h (copied) * code/branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt (modified) * code/branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc (copied) * code/branches/pickups2/src/orxonox/objects/pickup/DroppedItem.h (copied) * code/branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.cc (copied) * code/branches/pickups2/src/orxonox/objects/pickup/EquipmentItem.h (copied) * code/branches/pickups2/src/orxonox/objects/pickup/Jump.cc (copied) * code/branches/pickups2/src/orxonox/objects/pickup/Jump.h (copied) * code/branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.cc (copied) * code/branches/pickups2/src/orxonox/objects/pickup/ModifierPickup.h (copied) * code/branches/pickups2/src/orxonox/objects/pickup/ModifierType.h (copied) * code/branches/pickups2/src/orxonox/objects/pickup/PassiveItem.cc (copied) * code/branches/pickups2/src/orxonox/objects/pickup/PassiveItem.h (copied) * code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (copied) * code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h (copied) * code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc (copied) * code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h (copied) * code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc (deleted) * code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h (deleted) * code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.cc (deleted) * code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipmentClasses.h (deleted) * code/branches/pickups2/src/orxonox/objects/pickup/ShipItem.cc (deleted) * code/branches/pickups2/src/orxonox/objects/pickup/ShipItem.h (deleted) * code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc (deleted) * code/branches/pickups2/src/orxonox/objects/pickup/Turbo.h (deleted) * code/branches/pickups2/src/orxonox/objects/pickup/Usable.h (deleted) * code/branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc (copied) * code/branches/pickups2/src/orxonox/objects/pickup/UsableItem.h (copied) * code/branches/pickups2/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/Quest.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/pickups2/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/pickups2/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/pickups2/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/pickups2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/StaticEntity.h (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/pickups2/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/pickups2/src/tolua/all-5.0.lua (modified) * code/branches/pickups2/src/tolua/all-5.1.lua (modified) * code/branches/pickups2/src/util (modified) * code/branches/pickups2/src/util/Exception.cc (modified) * code/branches/pickups2/src/util/Exception.h (modified) * code/branches/pickups2/src/util/SignalHandler.cc (modified) * code/branches/pickups2/src/util/SignalHandler.h (modified) merged pickup into pickup2 Wed, 15 Apr 2009 14:03:09 GMT bknecht [2916] * code/branches/pickups2 (copied) Creating new pickups branche. Changes from old pickups branch need ... Sat, 11 Apr 2009 22:34:55 GMT landauf [2915] * code/branches/weapons/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/DefaultWeaponmodeLink.cc (added) * code/branches/weapons/src/orxonox/objects/weaponSystem/DefaultWeaponmodeLink.h (added) * code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) - switched back to std::vector for the WeaponSlots to keep them in ...