# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 25, 2024, 4:17:09 PM Sun, 28 Dec 2008 18:18:39 GMT rgrieder [2536] * code/branches/presentation/src/core/XMLPort.h (modified) FINALLY! Fixed the presentation bug, which was of my creation... I ... Sun, 28 Dec 2008 18:15:55 GMT rgrieder [2535] * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/presentation/src/util/Math.h (modified) - Renamed TransformSpace::Space to TransformSpace::Enum - Small ... Sun, 28 Dec 2008 18:12:44 GMT rgrieder [2534] * code/branches/buildsystem2/TODO_buildsystem (deleted) * code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/buildsystem2/src/util/String.cc (modified) * code/branches/buildsystem2/src/util/String.h (modified) * code/branches/buildsystem2/visual_studio/vc8/core.vcproj (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj (modified) - Removed ugly hack with windows/unix file path conversion. - ... Tue, 23 Dec 2008 22:34:35 GMT rgrieder [2533] * code/branches/bugger (modified) * code/branches/bugger/src/core/Template.cc (modified) * code/branches/bugger/src/core/Template.h (modified) * code/branches/bugger/src/core/XMLFile.h (modified) * code/branches/bugger/src/core/XMLIncludes.h (modified) * code/branches/bugger/src/network/NetworkPrereqs.h (modified) * code/branches/bugger/src/network/Server.cc (modified) * code/branches/bugger/src/network/Server.h (modified) * code/branches/bugger/src/network/TrafficControl.cc (modified) * code/branches/bugger/src/network/TrafficControl.h (modified) * code/branches/bugger/src/network/packet/Gamestate.cc (modified) * code/branches/bugger/src/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/bugger/src/network/synchronisable/NetworkCallbackManager.h (modified) * code/branches/bugger/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/bugger/src/network/synchronisable/Synchronisable.h (modified) * code/branches/bugger/src/orxonox/CameraManager.cc (modified) * code/branches/bugger/src/orxonox/CameraManager.h (modified) * code/branches/bugger/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/bugger/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/bugger/src/orxonox/objects/Level.cc (modified) * code/branches/bugger/src/orxonox/objects/Level.h (modified) * code/branches/bugger/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/bugger/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/bugger/src/orxonox/objects/quest/CMakeLists.txt (modified) * code/branches/bugger/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/bugger/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/Quest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestListener.cc (copied) * code/branches/bugger/src/orxonox/objects/quest/QuestListener.h (copied) * code/branches/bugger/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/bugger/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/bugger/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/bugger/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Planet.cc (copied) * code/branches/bugger/src/orxonox/objects/worldentities/Planet.h (copied) * code/branches/bugger/src/orxonox/objects/worldentities/PositionableEntity.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/bugger/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/bugger/src/orxonox/overlays/notifications (copied) * code/branches/bugger/src/orxonox/overlays/notifications/CMakeLists.txt (copied) * code/branches/bugger/src/orxonox/overlays/notifications/Notification.cc (copied) * code/branches/bugger/src/orxonox/overlays/notifications/Notification.h (copied) * code/branches/bugger/src/orxonox/overlays/notifications/NotificationManager.cc (copied) * code/branches/bugger/src/orxonox/overlays/notifications/NotificationManager.h (copied) * code/branches/bugger/src/orxonox/overlays/notifications/NotificationQueue.cc (copied) * code/branches/bugger/src/orxonox/overlays/notifications/NotificationQueue.h (copied) * code/branches/bugger/src/tolua/tolua-5.1.pkg (modified) * code/branches/bugger/src/util (modified) * code/branches/bugger/src/util/Exception.cc (modified) * code/branches/bugger/src/util/Exception.h (modified) * code/branches/bugger/src/util/SignalHandler.cc (modified) * code/branches/bugger/src/util/SignalHandler.h (modified) * code/branches/bugger/visual_studio/vc8/audio.vsprops (modified) * code/branches/bugger/visual_studio/vc8/base.vsprops (modified) * code/branches/bugger/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/bugger/visual_studio/vc8/core.vsprops (modified) * code/branches/bugger/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/bugger/visual_studio/vc8/debug.vsprops (modified) * code/branches/bugger/visual_studio/vc8/lua.vsprops (modified) * code/branches/bugger/visual_studio/vc8/network.vcproj (modified) * code/branches/bugger/visual_studio/vc8/network.vsprops (modified) * code/branches/bugger/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/bugger/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/bugger/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/bugger/visual_studio/vc8/release.vsprops (modified) * code/branches/bugger/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/bugger/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/bugger/visual_studio/vc8/tolua.vsprops (modified) * code/branches/bugger/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/bugger/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/bugger/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/bugger/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/bugger/visual_studio/vc8/util.vsprops (modified) Merged revisions 2384-2436 from presentation branch to bugger. Tue, 23 Dec 2008 22:15:09 GMT rgrieder [2532] * code/branches/bugger/src/network/GamestateManager.cc (modified) * code/branches/bugger/src/network/GamestateManager.h (modified) * code/branches/bugger/src/network/TrafficControl.cc (modified) * code/branches/bugger/src/network/TrafficControl.h (modified) * code/branches/bugger/src/network/packet/Gamestate.cc (modified) * code/branches/bugger/src/network/packet/Gamestate.h (modified) Merged revisions 2377-2382 to bugger from presentation. Tue, 23 Dec 2008 22:09:55 GMT rgrieder [2531] * code/branches/bugger (modified) * code/branches/bugger/src/core/Factory.cc (modified) * code/branches/bugger/src/core/Factory.h (modified) * code/branches/bugger/src/core/Identifier.cc (modified) * code/branches/bugger/src/core/Identifier.h (modified) * code/branches/bugger/src/core/Template.cc (modified) * code/branches/bugger/src/core/Template.h (modified) * code/branches/bugger/src/core/XMLFile.h (modified) * code/branches/bugger/src/core/XMLIncludes.h (modified) * code/branches/bugger/src/network/CMakeLists.txt (modified) * code/branches/bugger/src/network/Client.cc (modified) * code/branches/bugger/src/network/ClientInformation.cc (modified) * code/branches/bugger/src/network/ClientInformation.h (modified) * code/branches/bugger/src/network/ConnectionManager.cc (modified) * code/branches/bugger/src/network/GamestateClient.cc (modified) * code/branches/bugger/src/network/GamestateManager.cc (modified) * code/branches/bugger/src/network/NetworkCallback.h (deleted) * code/branches/bugger/src/network/NetworkPrereqs.h (modified) * code/branches/bugger/src/network/Synchronisable.cc (deleted) * code/branches/bugger/src/network/Synchronisable.h (deleted) * code/branches/bugger/src/network/TrafficControl.cc (copied) * code/branches/bugger/src/network/TrafficControl.h (copied) * code/branches/bugger/src/network/packet/DeleteObjects.cc (modified) * code/branches/bugger/src/network/packet/Gamestate.cc (modified) * code/branches/bugger/src/network/packet/Gamestate.h (modified) * code/branches/bugger/src/network/packet/Welcome.cc (modified) * code/branches/bugger/src/network/synchronisable (copied) * code/branches/bugger/src/network/synchronisable/CMakeLists.txt (copied) * code/branches/bugger/src/network/synchronisable/NetworkCallback.h (copied) * code/branches/bugger/src/network/synchronisable/NetworkCallbackManager.cc (copied) * code/branches/bugger/src/network/synchronisable/NetworkCallbackManager.h (copied) * code/branches/bugger/src/network/synchronisable/Synchronisable.cc (copied) * code/branches/bugger/src/network/synchronisable/Synchronisable.h (copied) * code/branches/bugger/src/network/synchronisable/SynchronisableSpecialisations.cc (copied) * code/branches/bugger/src/network/synchronisable/SynchronisableVariable.cc (copied) * code/branches/bugger/src/network/synchronisable/SynchronisableVariable.h (copied) * code/branches/bugger/src/orxonox/CameraManager.cc (modified) * code/branches/bugger/src/orxonox/CameraManager.h (modified) * code/branches/bugger/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/bugger/src/orxonox/objects/GlobalShader.cc (modified) * code/branches/bugger/src/orxonox/objects/GlobalShader.h (modified) * code/branches/bugger/src/orxonox/objects/Level.cc (modified) * code/branches/bugger/src/orxonox/objects/Level.h (modified) * code/branches/bugger/src/orxonox/objects/Scene.cc (modified) * code/branches/bugger/src/orxonox/objects/Scene.h (modified) * code/branches/bugger/src/orxonox/objects/Test.cc (modified) * code/branches/bugger/src/orxonox/objects/Test.h (modified) * code/branches/bugger/src/orxonox/objects/infos/GametypeInfo.cc (modified) * code/branches/bugger/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/branches/bugger/src/orxonox/objects/infos/Info.h (modified) * code/branches/bugger/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/bugger/src/orxonox/objects/items/Engine.cc (modified) * code/branches/bugger/src/orxonox/objects/items/Item.h (modified) * code/branches/bugger/src/orxonox/objects/items/MultiStateEngine.cc (modified) * code/branches/bugger/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/bugger/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/bugger/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/bugger/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/Quest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/bugger/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/bugger/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/bugger/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ExplosionChunk.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/FadingBillboard.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/PositionableEntity.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/bugger/src/tolua/tolua-5.1.pkg (modified) * code/branches/bugger/src/util (modified) * code/branches/bugger/src/util/Exception.cc (modified) * code/branches/bugger/src/util/Exception.h (modified) * code/branches/bugger/src/util/SignalHandler.cc (modified) * code/branches/bugger/src/util/SignalHandler.h (modified) * code/branches/bugger/src/util/mbool.h (modified) * code/branches/bugger/visual_studio/vc8/audio.vsprops (modified) * code/branches/bugger/visual_studio/vc8/base.vsprops (modified) * code/branches/bugger/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/bugger/visual_studio/vc8/core.vsprops (modified) * code/branches/bugger/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/bugger/visual_studio/vc8/debug.vsprops (modified) * code/branches/bugger/visual_studio/vc8/lua.vsprops (modified) * code/branches/bugger/visual_studio/vc8/network.vcproj (modified) * code/branches/bugger/visual_studio/vc8/network.vsprops (modified) * code/branches/bugger/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/bugger/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/bugger/visual_studio/vc8/release.vsprops (modified) * code/branches/bugger/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/bugger/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/bugger/visual_studio/vc8/tolua.vsprops (modified) * code/branches/bugger/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/bugger/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/bugger/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/bugger/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/bugger/visual_studio/vc8/util.vsprops (modified) Merged revision 2371 to bugger branch. Tue, 23 Dec 2008 21:40:38 GMT rgrieder [2530] * code/branches/bugger (modified) * code/branches/bugger/src/core/LuaBind.cc (modified) * code/branches/bugger/src/core/Template.cc (modified) * code/branches/bugger/src/core/Template.h (modified) * code/branches/bugger/src/core/XMLFile.h (modified) * code/branches/bugger/src/core/XMLIncludes.h (modified) * code/branches/bugger/src/orxonox/CameraManager.cc (modified) * code/branches/bugger/src/orxonox/CameraManager.h (modified) * code/branches/bugger/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/bugger/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/bugger/src/orxonox/objects/Level.cc (modified) * code/branches/bugger/src/orxonox/objects/Level.h (modified) * code/branches/bugger/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/bugger/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/bugger/src/orxonox/objects/quest/CMakeLists.txt (modified) * code/branches/bugger/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/bugger/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/Quest.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestEffectBeacon.cc (copied) * code/branches/bugger/src/orxonox/objects/quest/QuestEffectBeacon.h (copied) * code/branches/bugger/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/bugger/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/bugger/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/bugger/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/bugger/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc (copied) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (copied) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/bugger/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/bugger/src/tolua/tolua-5.1.pkg (modified) * code/branches/bugger/src/util (modified) * code/branches/bugger/src/util/CMakeLists.txt (modified) * code/branches/bugger/src/util/Exception.cc (modified) * code/branches/bugger/src/util/Exception.h (modified) * code/branches/bugger/src/util/SignalHandler.cc (modified) * code/branches/bugger/src/util/SignalHandler.h (modified) * code/branches/bugger/visual_studio/vc8/audio.vsprops (modified) * code/branches/bugger/visual_studio/vc8/base.vsprops (modified) * code/branches/bugger/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/bugger/visual_studio/vc8/core.vsprops (modified) * code/branches/bugger/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/bugger/visual_studio/vc8/debug.vsprops (modified) * code/branches/bugger/visual_studio/vc8/lua.vsprops (modified) * code/branches/bugger/visual_studio/vc8/network.vsprops (modified) * code/branches/bugger/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/bugger/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/bugger/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/bugger/visual_studio/vc8/release.vsprops (modified) * code/branches/bugger/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/bugger/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/bugger/visual_studio/vc8/tolua.vsprops (modified) * code/branches/bugger/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/bugger/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/bugger/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/bugger/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/bugger/visual_studio/vc8/util.vsprops (modified) merged revisions 2260 - 2508 from trunk to buggy. I'm sorry that I ... Tue, 23 Dec 2008 21:32:48 GMT rgrieder [2529] * code/branches/bugger (copied) Created test branch to merge the other way round incrementally with ... Mon, 22 Dec 2008 21:38:10 GMT rgrieder [2528] * code/branches/overlay (deleted) * code/branches/physics (deleted) * code/branches/physics_merge (deleted) Removed obsolete branches: physics, physics_merge and overlay. Mon, 22 Dec 2008 21:23:29 GMT rgrieder [2527] * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h (modified) - Forgot to account for collision shape position and orientation when ... Mon, 22 Dec 2008 20:09:18 GMT rgrieder [2526] * code/branches/buildsystem2/CMakeLists.txt (modified) * code/branches/buildsystem2/cmake/CheckOrxonoxWinDeps.cmake (modified) Reenabled -fPIC flag, but only for non MINGW boxes because MinGW will ... Mon, 22 Dec 2008 19:35:19 GMT rgrieder [2525] * code/branches/buildsystem2/src/util/MultiType.cc (modified) * code/branches/buildsystem2/src/util/MultiType.h (modified) Fixed MT reset bug in this branch as well to test for another ... Mon, 22 Dec 2008 19:12:32 GMT rgrieder [2524] * code/branches/buildsystem2/src/network/packet/Packet.cc (modified) * code/branches/buildsystem2/src/orxonox/overlays/hud/HUDBar.cc (modified) Removed two gcc warnings. Mon, 22 Dec 2008 18:56:49 GMT rgrieder [2523] * code/branches/buildsystem2/bin/CMakeLists.txt (modified) def_masterKeybindings.ini was missing in the config files. Mon, 22 Dec 2008 18:53:51 GMT rgrieder [2522] * code/branches/buildsystem2/src/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified) Commented building of audio library since it's no use anyway. Mon, 22 Dec 2008 18:48:30 GMT rgrieder [2521] * code/branches/buildsystem2/CMakeLists.txt (modified) Removed -fPIC flags (CMake does that automatically) Mon, 22 Dec 2008 18:17:46 GMT rgrieder [2520] * code/branches/buildsystem2/src/tolua/lua/doit.lua (modified) * code/branches/buildsystem2/src/tolua/lua/package.lua (modified) * code/branches/buildsystem2/visual_studio/vc8/base.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/core.vcproj (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln (modified) - Complete out-of-source builds working now with msvc (moved tolua ... Sun, 21 Dec 2008 22:06:12 GMT rgrieder [2519] * code/branches/buildsystem2/cmake/UseTolua.cmake (modified) * code/branches/buildsystem2/src/CMakeLists.txt (modified) * code/branches/buildsystem2/src/core/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified) * code/branches/buildsystem2/src/tolua/CMakeLists.txt (modified) It is no more necessary to include UseTolua.cmake just before the ... Sun, 21 Dec 2008 21:36:51 GMT rgrieder [2518] * code/branches/buildsystem2/cmake/AddSourceFiles.cmake (modified) * code/branches/buildsystem2/src/core/CMakeLists.txt (modified) * code/branches/buildsystem2/src/core/input/CMakeLists.txt (modified) * code/branches/buildsystem2/src/network/CMakeLists.txt (modified) * code/branches/buildsystem2/src/network/packet/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/gamestates/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/gui/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/controllers/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/infos/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/pickup/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/quest/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/weaponSystem/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/weaponSystem/projectiles/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/overlays/console/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/overlays/debug/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/overlays/hud/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/tools/CMakeLists.txt (modified) Adjusted source file macros to cmake 2.6 because it offers ... Sun, 21 Dec 2008 17:59:57 GMT rgrieder [2517] * code/branches/buildsystem2/CMakeLists.txt (modified) removed -Wextra from C and CXX flags because the amount of warnings ... Sun, 21 Dec 2008 17:57:40 GMT rgrieder [2516] * code/branches/buildsystem2/bin/msvc/orxonox_vc8 (added) * code/branches/buildsystem2/bin/msvc/orxonox_vc8/debug (added) * code/branches/buildsystem2/bin/msvc/orxonox_vc8/debug/orxonox.ini (added) * code/branches/buildsystem2/bin/msvc/orxonox_vc8/release (added) * code/branches/buildsystem2/bin/msvc/orxonox_vc8/release/orxonox.ini (added) * code/branches/buildsystem2/init (deleted) * code/branches/buildsystem2/visual_studio/vc8/base.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/core.vcproj (modified) * code/branches/buildsystem2/visual_studio/vc8/core.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/network.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/ois.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj.user (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln (modified) Fixed msvc build and adjusted some settings. Also removed init ... Sun, 21 Dec 2008 14:13:57 GMT rgrieder [2515] * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.h (modified) Callbacks with function pointers work virtually after all. Sun, 21 Dec 2008 13:44:00 GMT rgrieder [2514] * code/branches/presentation/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/BoxCollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/ConeCollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/SphereCollisionShape.h (modified) Resolved four issues with the collision shapes: - NetworkCallback ... Thu, 18 Dec 2008 10:28:50 GMT rgrieder [2513] * code/branches/presentation/src/core/Iterator.h (modified) * code/branches/presentation/src/orxonox/tools/Timer.h (modified) Fixed a bug in Timer.h: Include of Executor was missing, but when ... Wed, 17 Dec 2008 21:25:05 GMT rgrieder [2512] * code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/buildsystem2/src/util/CMakeLists.txt (modified) Fixed build due to merge Wed, 17 Dec 2008 20:08:17 GMT rgrieder [2511] * code/branches/buildsystem2/cmake/FindDirectX.cmake (modified) Merged non 64 bit part of revision 2278 of buildsystem to buildsystem2. Wed, 17 Dec 2008 20:05:10 GMT rgrieder [2510] * code/branches/buildsystem2 (modified) * code/branches/buildsystem2/CMakeLists.txt (modified) * code/branches/buildsystem2/TODO_buildsystem (modified) * code/branches/buildsystem2/bin/CMakeLists.txt (modified) * code/branches/buildsystem2/bin/linux/orxonox.ini (modified) * code/branches/buildsystem2/bin/linux/run-script (modified) * code/branches/buildsystem2/bin/mingw/orxonox.bat (modified) * code/branches/buildsystem2/bin/mingw/orxonox.ini (modified) * code/branches/buildsystem2/bin/tardis/ogre.cfg (copied) * code/branches/buildsystem2/bin/tardis/orxonox.ini (modified) * code/branches/buildsystem2/cmake/CheckOrxonoxWinDeps.cmake (modified) * code/branches/buildsystem2/cmake/CheckTardis.cmake (modified) * code/branches/buildsystem2/cmake/FindCEGUI.cmake (modified) * code/branches/buildsystem2/cmake/FindDirectX.cmake (modified) * code/branches/buildsystem2/cmake/FindENet.cmake (modified) * code/branches/buildsystem2/cmake/FindOGRE.cmake (modified) * code/branches/buildsystem2/cmake/FindOggVorbis.cmake (modified) * code/branches/buildsystem2/cmake/UseTolua.cmake (modified) * code/branches/buildsystem2/src/CMakeLists.txt (modified) * code/branches/buildsystem2/src/audio/CMakeLists.txt (modified) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CMakeLists.txt (modified) * code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified) * code/branches/buildsystem2/src/core/CMakeLists.txt (modified) * code/branches/buildsystem2/src/core/LuaBind.cc (modified) * code/branches/buildsystem2/src/core/LuaBind.h (modified) * code/branches/buildsystem2/src/core/XMLIncludes.h (modified) * code/branches/buildsystem2/src/cpptcl/CMakeLists.txt (modified) * code/branches/buildsystem2/src/network/CMakeLists.txt (modified) * code/branches/buildsystem2/src/ois/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified) * code/branches/buildsystem2/src/tinyxml/CMakeLists.txt (modified) * code/branches/buildsystem2/src/tolua/CMakeLists.txt (modified) * code/branches/buildsystem2/src/tolua/all-5.0.lua (modified) * code/branches/buildsystem2/src/tolua/all-5.1.lua (modified) * code/branches/buildsystem2/src/util (modified) * code/branches/buildsystem2/src/util/CMakeLists.txt (modified) * code/branches/buildsystem2/src/util/Exception.cc (modified) * code/branches/buildsystem2/src/util/Exception.h (modified) * code/branches/buildsystem2/updateMedia.sh (deleted) * code/branches/buildsystem2/update_media (copied) * code/branches/buildsystem2/visual_studio/vc8/audio.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/base.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/core.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/debug.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/directories.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/network.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/buildsystem2/visual_studio/vc8/release.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/buildsystem2/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/tolua.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/util.vsprops (modified) Merged revisions 2279-2401 of the buildsystem branch to buildsystem2. Wed, 17 Dec 2008 19:59:48 GMT rgrieder [2509] * code/branches/buildsystem2 (modified) * code/branches/buildsystem2/CMakeLists.txt (modified) * code/branches/buildsystem2/TODO_buildsystem (copied) * code/branches/buildsystem2/bin/CMakeLists.txt (copied) * code/branches/buildsystem2/bin/Plugins.cfg (deleted) * code/branches/buildsystem2/bin/linux (copied) * code/branches/buildsystem2/bin/linux/orxonox.ini (copied) * code/branches/buildsystem2/bin/linux/run-script (copied) * code/branches/buildsystem2/bin/mingw (copied) * code/branches/buildsystem2/bin/mingw/orxonox.bat (copied) * code/branches/buildsystem2/bin/mingw/orxonox.ini (copied) * code/branches/buildsystem2/bin/msvc (copied) * code/branches/buildsystem2/bin/msvc/debug (copied) * code/branches/buildsystem2/bin/msvc/debug/orxonox_d.ini (copied) * code/branches/buildsystem2/bin/msvc/release (copied) * code/branches/buildsystem2/bin/msvc/release/orxonox.ini (copied) * code/branches/buildsystem2/bin/ogre.cfg-init (deleted) * code/branches/buildsystem2/bin/orxonox.bat (deleted) * code/branches/buildsystem2/bin/plugins.cfg-init (deleted) * code/branches/buildsystem2/bin/run-script (deleted) * code/branches/buildsystem2/bin/tardis (copied) * code/branches/buildsystem2/bin/tardis/orxonox.ini (copied) * code/branches/buildsystem2/cmake/CheckOrxonoxWinDeps.cmake (copied) * code/branches/buildsystem2/cmake/CheckTardis.cmake (modified) * code/branches/buildsystem2/cmake/FindALUT.cmake (modified) * code/branches/buildsystem2/cmake/FindBoost.cmake (deleted) * code/branches/buildsystem2/cmake/FindCEGUI.cmake (modified) * code/branches/buildsystem2/cmake/FindCEGUI_OGRE.cmake (deleted) * code/branches/buildsystem2/cmake/FindENet.cmake (modified) * code/branches/buildsystem2/cmake/FindLua.cmake (deleted) * code/branches/buildsystem2/cmake/FindODE.cmake (deleted) * code/branches/buildsystem2/cmake/FindOGRE.cmake (modified) * code/branches/buildsystem2/cmake/FindOggVorbis.cmake (modified) * code/branches/buildsystem2/cmake/FindOpenAL.cmake (deleted) * code/branches/buildsystem2/cmake/FindPkgConfig.cmake (deleted) * code/branches/buildsystem2/cmake/FindTCL.cmake (deleted) * code/branches/buildsystem2/cmake/FindZLIB.cmake (deleted) * code/branches/buildsystem2/cmake/UseTolua.cmake (copied) * code/branches/buildsystem2/run (modified) * code/branches/buildsystem2/src/CMakeLists.txt (modified) * code/branches/buildsystem2/src/ceguilua-0.5.0 (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CEGUILua.cpp (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CEGUILua.h (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CEGUILuaFunctor.cpp (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CEGUILuaFunctor.h (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/CMakeLists.txt (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/lua_CEGUI.cpp (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/required.cpp (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0/ceguilua/required.h (copied) * code/branches/buildsystem2/src/ceguilua-0.5.0b (deleted) * code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CEGUILua.cpp (modified) * code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp (modified) * code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified) * code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/lua_CEGUI.cpp (modified) * code/branches/buildsystem2/src/core/CMakeLists.txt (modified) * code/branches/buildsystem2/src/core/CommandExecutor.h (modified) * code/branches/buildsystem2/src/core/LuaBind.cc (modified) * code/branches/buildsystem2/src/core/LuaBind.h (modified) * code/branches/buildsystem2/src/core/XMLIncludes.h (modified) * code/branches/buildsystem2/src/core/tolua (deleted) * code/branches/buildsystem2/src/lua (deleted) * code/branches/buildsystem2/src/network/CMakeLists.txt (modified) * code/branches/buildsystem2/src/ois/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified) * code/branches/buildsystem2/src/orxonox/Settings.cc (modified) * code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/buildsystem2/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/buildsystem2/src/orxonox/gui/GUIManager.cc (modified) * code/branches/buildsystem2/src/orxonox/gui/GUIManager.h (modified) * code/branches/buildsystem2/src/orxonox/tolua (deleted) * code/branches/buildsystem2/src/tinyxml/changes.txt (copied) * code/branches/buildsystem2/src/tinyxml/readme.txt (copied) * code/branches/buildsystem2/src/tinyxml/ticpp.cc (modified) * code/branches/buildsystem2/src/tinyxml/ticpp.h (modified) * code/branches/buildsystem2/src/tinyxml/ticpp_trunk_r98 (copied) * code/branches/buildsystem2/src/tinyxml/ticpprc.h (modified) * code/branches/buildsystem2/src/tinyxml/tinyxml.h (modified) * code/branches/buildsystem2/src/tolua/CMakeLists.txt (modified) * code/branches/buildsystem2/src/tolua/README (copied) * code/branches/buildsystem2/src/tolua/all-5.0.lua (copied) * code/branches/buildsystem2/src/tolua/all-5.1.lua (copied) * code/branches/buildsystem2/src/tolua/lua/array.lua (modified) * code/branches/buildsystem2/src/tolua/lua/basic.lua (modified) * code/branches/buildsystem2/src/tolua/lua/class.lua (modified) * code/branches/buildsystem2/src/tolua/lua/clean.lua (modified) * code/branches/buildsystem2/src/tolua/lua/code.lua (modified) * code/branches/buildsystem2/src/tolua/lua/compat-5.1.lua (modified) * code/branches/buildsystem2/src/tolua/lua/compat.lua (modified) * code/branches/buildsystem2/src/tolua/lua/container.lua (modified) * code/branches/buildsystem2/src/tolua/lua/custom.lua (modified) * code/branches/buildsystem2/src/tolua/lua/custom_hide.lua (modified) * code/branches/buildsystem2/src/tolua/lua/declaration.lua (modified) * code/branches/buildsystem2/src/tolua/lua/define.lua (modified) * code/branches/buildsystem2/src/tolua/lua/doit.lua (modified) * code/branches/buildsystem2/src/tolua/lua/enumerate.lua (modified) * code/branches/buildsystem2/src/tolua/lua/feature.lua (modified) * code/branches/buildsystem2/src/tolua/lua/function.lua (modified) * code/branches/buildsystem2/src/tolua/lua/module.lua (modified) * code/branches/buildsystem2/src/tolua/lua/namespace.lua (modified) * code/branches/buildsystem2/src/tolua/lua/operator.lua (modified) * code/branches/buildsystem2/src/tolua/lua/package.lua (modified) * code/branches/buildsystem2/src/tolua/lua/typedef.lua (modified) * code/branches/buildsystem2/src/tolua/lua/variable.lua (modified) * code/branches/buildsystem2/src/tolua/lua/verbatim.lua (modified) * code/branches/buildsystem2/src/tolua/tolua++.h (modified) * code/branches/buildsystem2/src/tolua/tolua-5.1.pkg (deleted) * code/branches/buildsystem2/src/tolua/tolua.c (modified) * code/branches/buildsystem2/src/tolua/tolua_is.c (modified) * code/branches/buildsystem2/src/tolua/tolua_map.c (modified) * code/branches/buildsystem2/src/tolua/tolua_push.c (modified) * code/branches/buildsystem2/src/tolua/toluabind.c (deleted) * code/branches/buildsystem2/src/tolua/toluabind.h (deleted) * code/branches/buildsystem2/src/util (modified) * code/branches/buildsystem2/src/util/CMakeLists.txt (modified) * code/branches/buildsystem2/src/util/Exception.cc (modified) * code/branches/buildsystem2/src/util/Exception.h (modified) * code/branches/buildsystem2/src/util/String.cc (modified) * code/branches/buildsystem2/src/util/String.h (modified) * code/branches/buildsystem2/visual_studio/vc8/audio.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/base.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/core.vcproj (modified) * code/branches/buildsystem2/visual_studio/vc8/core.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/debug.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/directories.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/lua.vcproj (deleted) * code/branches/buildsystem2/visual_studio/vc8/lua.vsprops (deleted) * code/branches/buildsystem2/visual_studio/vc8/lua_static.vcproj (deleted) * code/branches/buildsystem2/visual_studio/vc8/lua_static.vsprops (deleted) * code/branches/buildsystem2/visual_studio/vc8/network.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/buildsystem2/visual_studio/vc8/release.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/buildsystem2/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/tolua.vsprops (modified) * code/branches/buildsystem2/visual_studio/vc8/tolua_static.vcproj (deleted) * code/branches/buildsystem2/visual_studio/vc8/tolua_static.vsprops (deleted) * code/branches/buildsystem2/visual_studio/vc8/toluaexe.vcproj (added) * code/branches/buildsystem2/visual_studio/vc8/toluaexe.vsprops (added) * code/branches/buildsystem2/visual_studio/vc8/toluagen.vcproj (deleted) * code/branches/buildsystem2/visual_studio/vc8/toluagen.vsprops (deleted) * code/branches/buildsystem2/visual_studio/vc8/toluagen_orxonox.vcproj (deleted) * code/branches/buildsystem2/visual_studio/vc8/toluagen_orxonox.vsprops (deleted) * code/branches/buildsystem2/visual_studio/vc8/util.vsprops (modified) Merged revisions 1875-2278 of the buildsystem branch to buildsystem2. Wed, 17 Dec 2008 19:43:19 GMT rgrieder [2508] * code/trunk/src/core/LuaBind.cc (modified) Bugfix in LuaBind.cc Wed, 17 Dec 2008 19:39:35 GMT rgrieder [2507] * code/branches/buildsystem2 (copied) Added merger branch for the build system. Probably going to merge ... Wed, 17 Dec 2008 17:18:41 GMT rgrieder [2506] * code/branches/presentation/src/core/Iterator.h (modified) * code/branches/presentation/src/network/packet/DeleteObjects.cc (modified) * code/branches/presentation/src/orxonox/objects/controllers/ArtificialController.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/tools/Timer.h (modified) Changed all C-Style casts with C++ casts that I was able to find with ... Wed, 17 Dec 2008 16:23:02 GMT rgrieder [2505] * code/branches/presentation/src/core/ObjectListIterator.h (modified) * code/branches/presentation/src/core/XMLPort.h (modified) - Removed XMLPortVariableOnLoad macro (can't possibly work at all) - ... Wed, 17 Dec 2008 16:21:09 GMT rgrieder [2504] * code/branches/presentation/src/orxonox/objects/pickup/Turbo.cc (modified) Typo or not? Wed, 17 Dec 2008 09:51:07 GMT rgrieder [2503] * code/branches/presentation/src/orxonox/objects/pickup/BaseItem.cc (modified) * code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.cc (modified) * code/branches/presentation/src/orxonox/objects/pickup/ShipEquipment.cc (modified) * code/branches/presentation/src/orxonox/objects/pickup/Turbo.cc (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vcproj (modified) Updated msvc files. Maybe fixed a bug in: if (condition); // Note ... Wed, 17 Dec 2008 08:52:46 GMT landauf [2502] * code/branches/presentation/src/orxonox/objects/pickup/CMakeLists.txt (modified) ups Wed, 17 Dec 2008 08:11:12 GMT landauf [2501] * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/orxonox/objects/GlobalShader.cc (modified) * code/branches/presentation/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.cc (modified) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.h (modified) - GlobalShader in dedicated mode works again - Shooting as a client ... Wed, 17 Dec 2008 07:00:43 GMT landauf [2500] * code/branches/presentation (modified) * code/branches/presentation/bin/def_keybindings.ini (modified) * code/branches/presentation/src/core/Template.cc (modified) * code/branches/presentation/src/core/Template.h (modified) * code/branches/presentation/src/core/XMLFile.h (modified) * code/branches/presentation/src/core/XMLIncludes.h (modified) * code/branches/presentation/src/orxonox/CameraManager.cc (modified) * code/branches/presentation/src/orxonox/CameraManager.h (modified) * code/branches/presentation/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/presentation/src/orxonox/objects/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/objects/pickup/BaseItem.cc (added) * code/branches/presentation/src/orxonox/objects/pickup/BaseItem.h (added) * code/branches/presentation/src/orxonox/objects/pickup/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.cc (copied) * code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.h (copied) * code/branches/presentation/src/orxonox/objects/pickup/ShipEquipment.cc (copied) * code/branches/presentation/src/orxonox/objects/pickup/ShipEquipment.h (modified) * code/branches/presentation/src/orxonox/objects/pickup/ShipEquipmentClasses.cc (modified) * code/branches/presentation/src/orxonox/objects/pickup/ShipEquipmentClasses.h (modified) * code/branches/presentation/src/orxonox/objects/pickup/ShipItem.cc (modified) * code/branches/presentation/src/orxonox/objects/pickup/ShipItem.h (modified) * code/branches/presentation/src/orxonox/objects/pickup/Turbo.cc (copied) * code/branches/presentation/src/orxonox/objects/pickup/Turbo.h (copied) * code/branches/presentation/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/tolua/tolua-5.1.pkg (modified) * code/branches/presentation/src/util (modified) * code/branches/presentation/src/util/Exception.cc (modified) * code/branches/presentation/src/util/Exception.h (modified) * code/branches/presentation/src/util/SignalHandler.cc (modified) * code/branches/presentation/src/util/SignalHandler.h (modified) * code/branches/presentation/visual_studio/vc8/audio.vsprops (modified) * code/branches/presentation/visual_studio/vc8/base.vsprops (modified) * code/branches/presentation/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/core.vsprops (modified) * code/branches/presentation/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/presentation/visual_studio/vc8/debug.vsprops (modified) * code/branches/presentation/visual_studio/vc8/directories.vsprops (modified) * code/branches/presentation/visual_studio/vc8/lua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/network.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/presentation/visual_studio/vc8/release.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tolua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/util.vsprops (modified) merged pickups2 to presentation Wed, 17 Dec 2008 06:54:23 GMT scheusso [2499] * code/branches/presentation/src/orxonox/overlays/stats/CMakeLists.txt (modified) small fix in cmakelists ( client cannot steer, if server spawned ... Wed, 17 Dec 2008 05:02:47 GMT landauf [2498] * code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.cc (modified) * code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.h (modified) removed additional gametype_ from scoreboard initialize scoreboard ... Wed, 17 Dec 2008 04:41:29 GMT landauf [2497] * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) - some changes, maybe fixed a crash, not sure - fixed strange ... Wed, 17 Dec 2008 03:10:52 GMT rgrieder [2496] * code/branches/presentation/bin/def_keybindings.ini (modified) added def keybinding for stats overlay. Wed, 17 Dec 2008 03:05:25 GMT rgrieder [2495] * code/branches/presentation/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/presentation/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/presentation/src/orxonox/overlays/stats/CreateLines.cc (modified) * code/branches/presentation/src/orxonox/overlays/stats/CreateLines.h (modified) * code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.cc (modified) * code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.h (modified) * code/branches/presentation/src/orxonox/overlays/stats/Stats.cc (modified) * code/branches/presentation/src/orxonox/overlays/stats/Stats.h (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vcproj (modified) Added stats overlay. "OverlayGroup toggleVisibility Stats" will do ... Wed, 17 Dec 2008 02:20:25 GMT landauf [2494] * code/branches/presentation/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/Fusion.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) shooting, hitting and killing works Wed, 17 Dec 2008 01:10:11 GMT landauf [2493] * code/branches/presentation (modified) * code/branches/presentation/bin/def_keybindings.ini (modified) * code/branches/presentation/src/core/Template.cc (modified) * code/branches/presentation/src/core/Template.h (modified) * code/branches/presentation/src/core/XMLFile.h (modified) * code/branches/presentation/src/core/XMLIncludes.h (modified) * code/branches/presentation/src/orxonox/CameraManager.cc (modified) * code/branches/presentation/src/orxonox/CameraManager.h (modified) * code/branches/presentation/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation/src/orxonox/objects/controllers/AIController.cc (modified) * code/branches/presentation/src/orxonox/objects/controllers/ArtificialController.cc (modified) * code/branches/presentation/src/orxonox/objects/controllers/ArtificialController.h (modified) * code/branches/presentation/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/Munition.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/Munition.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/Weapon.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/Weapon.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponPack.cc (copied) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponPack.h (copied) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSet.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSlot.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSlot.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/Fusion.cc (copied) * code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/Fusion.h (copied) * code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/presentation/src/orxonox/tools/BillboardSet.h (modified) * code/branches/presentation/src/tolua/tolua-5.1.pkg (modified) * code/branches/presentation/src/util (modified) * code/branches/presentation/src/util/Exception.cc (modified) * code/branches/presentation/src/util/Exception.h (modified) * code/branches/presentation/src/util/SignalHandler.cc (modified) * code/branches/presentation/src/util/SignalHandler.h (modified) * code/branches/presentation/visual_studio/vc8/audio.vsprops (modified) * code/branches/presentation/visual_studio/vc8/base.vsprops (modified) * code/branches/presentation/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/core.vsprops (modified) * code/branches/presentation/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/presentation/visual_studio/vc8/debug.vsprops (modified) * code/branches/presentation/visual_studio/vc8/directories.vsprops (modified) * code/branches/presentation/visual_studio/vc8/lua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/network.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/presentation/visual_studio/vc8/release.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tolua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/util.vsprops (modified) merged weapon2 branch to presentation Tue, 16 Dec 2008 23:55:03 GMT rgrieder [2492] * code/branches/presentation (modified) * code/branches/presentation/src/core/Template.cc (modified) * code/branches/presentation/src/core/Template.h (modified) * code/branches/presentation/src/core/XMLFile.h (modified) * code/branches/presentation/src/core/XMLIncludes.h (modified) * code/branches/presentation/src/orxonox/CameraManager.cc (modified) * code/branches/presentation/src/orxonox/CameraManager.h (modified) * code/branches/presentation/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/presentation/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/presentation/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/presentation/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentation/src/orxonox/overlays/stats (copied) * code/branches/presentation/src/orxonox/overlays/stats/CMakeLists.txt (added) * code/branches/presentation/src/orxonox/overlays/stats/CreateLines.cc (copied) * code/branches/presentation/src/orxonox/overlays/stats/CreateLines.h (copied) * code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.cc (copied) * code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.h (copied) * code/branches/presentation/src/orxonox/overlays/stats/Stats.cc (copied) * code/branches/presentation/src/orxonox/overlays/stats/Stats.h (copied) * code/branches/presentation/src/orxonox/overlays/stats/StatsTest.cc (copied) * code/branches/presentation/src/orxonox/overlays/stats/StatsTest.h (copied) * code/branches/presentation/src/tolua/tolua-5.1.pkg (modified) * code/branches/presentation/src/util (modified) * code/branches/presentation/src/util/Exception.cc (modified) * code/branches/presentation/src/util/Exception.h (modified) * code/branches/presentation/src/util/MultiType.cc (modified) * code/branches/presentation/src/util/MultiType.h (modified) * code/branches/presentation/src/util/SignalHandler.cc (modified) * code/branches/presentation/src/util/SignalHandler.h (modified) * code/branches/presentation/visual_studio/vc8/audio.vsprops (modified) * code/branches/presentation/visual_studio/vc8/base.vsprops (modified) * code/branches/presentation/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/core.vsprops (modified) * code/branches/presentation/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/presentation/visual_studio/vc8/debug.vsprops (modified) * code/branches/presentation/visual_studio/vc8/lua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/network.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/presentation/visual_studio/vc8/release.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tolua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/util.vsprops (modified) Merged overlay branch into presentation branch. Tue, 16 Dec 2008 23:10:23 GMT rgrieder [2491] * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vcproj (modified) - "gravity" xml parameter got missed in Scene - fixed issue with ... Tue, 16 Dec 2008 21:12:32 GMT scheusso [2490] * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/packet/Welcome.h (modified) some cleanup and fix concerning trafficcontrol (cutting gamestates) Tue, 16 Dec 2008 19:12:45 GMT landauf [2489] * code/branches/presentation/src/orxonox/objects/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) tried to steer the spaceship with the engine. Tue, 16 Dec 2008 18:46:31 GMT landauf [2488] * code/branches/presentation/src/orxonox/objects/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/objects/items/MultiStateEngine.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h (modified) backlights work Tue, 16 Dec 2008 17:16:48 GMT landauf [2487] * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) fixed mouselook in SpaceShip Tue, 16 Dec 2008 17:06:07 GMT rgrieder [2486] * code/branches/presentation/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc (added) * code/branches/presentation/src/orxonox/objects/collisionshapes/BoxCollisionShape.h (added) * code/branches/presentation/src/orxonox/objects/collisionshapes/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc (added) * code/branches/presentation/src/orxonox/objects/collisionshapes/ConeCollisionShape.h (added) * code/branches/presentation/src/orxonox/objects/collisionshapes/SphereCollisionShape.h (modified) Added 2 new collision shapes: cone and box. Tue, 16 Dec 2008 17:01:13 GMT landauf [2485] * code/branches/presentation (modified) * code/branches/presentation/TODO (modified) * code/branches/presentation/bin/Plugins.cfg (modified) * code/branches/presentation/bin/def_keybindings.ini (modified) * code/branches/presentation/bin/telnet_server.tcl (modified) * code/branches/presentation/src/core/BaseObject.cc (modified) * code/branches/presentation/src/core/BaseObject.h (modified) * code/branches/presentation/src/core/CommandExecutor.cc (modified) * code/branches/presentation/src/core/CommandExecutor.h (modified) * code/branches/presentation/src/core/CommandLine.cc (modified) * code/branches/presentation/src/core/CommandLine.h (modified) * code/branches/presentation/src/core/ConsoleCommand.h (modified) * code/branches/presentation/src/core/Core.cc (modified) * code/branches/presentation/src/core/Core.h (modified) * code/branches/presentation/src/core/CorePrereqs.h (modified) * code/branches/presentation/src/core/Functor.h (modified) * code/branches/presentation/src/core/Identifier.cc (modified) * code/branches/presentation/src/core/Identifier.h (modified) * code/branches/presentation/src/core/Language.cc (modified) * code/branches/presentation/src/core/Language.h (modified) * code/branches/presentation/src/core/Loader.cc (modified) * code/branches/presentation/src/core/LuaBind.cc (modified) * code/branches/presentation/src/core/LuaBind.h (modified) * code/branches/presentation/src/core/RootGameState.cc (modified) * code/branches/presentation/src/core/RootGameState.h (modified) * code/branches/presentation/src/core/Shell.cc (modified) * code/branches/presentation/src/core/Super.h (modified) * code/branches/presentation/src/core/Template.cc (modified) * code/branches/presentation/src/core/Template.h (modified) * code/branches/presentation/src/core/XMLFile.h (modified) * code/branches/presentation/src/core/XMLIncludes.h (modified) * code/branches/presentation/src/core/XMLPort.h (modified) * code/branches/presentation/src/core/input/Button.cc (modified) * code/branches/presentation/src/core/input/InputBuffer.cc (modified) * code/branches/presentation/src/core/input/InputBuffer.h (modified) * code/branches/presentation/src/network/GamestateClient.cc (modified) * code/branches/presentation/src/network/GamestateManager.cc (modified) * code/branches/presentation/src/network/TrafficControl.cc (modified) * code/branches/presentation/src/network/packet/Acknowledgement.h (modified) * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/packet/Packet.cc (modified) * code/branches/presentation/src/network/packet/Welcome.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/CameraManager.cc (modified) * code/branches/presentation/src/orxonox/CameraManager.h (modified) * code/branches/presentation/src/orxonox/GraphicsEngine.cc (modified) * code/branches/presentation/src/orxonox/GraphicsEngine.h (modified) * code/branches/presentation/src/orxonox/Main.cc (modified) * code/branches/presentation/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation/src/orxonox/PawnManager.cc (copied) * code/branches/presentation/src/orxonox/PawnManager.h (copied) * code/branches/presentation/src/orxonox/PlayerManager.cc (modified) * code/branches/presentation/src/orxonox/PlayerManager.h (modified) * code/branches/presentation/src/orxonox/Settings.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/presentation/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/presentation/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/presentation/src/orxonox/gui/GUIManager.cc (modified) * code/branches/presentation/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/EventTarget.cc (modified) * code/branches/presentation/src/orxonox/objects/GlobalShader.cc (copied) * code/branches/presentation/src/orxonox/objects/GlobalShader.h (copied) * code/branches/presentation/src/orxonox/objects/Level.cc (modified) * code/branches/presentation/src/orxonox/objects/Level.h (modified) * code/branches/presentation/src/orxonox/objects/Radar.cc (modified) * code/branches/presentation/src/orxonox/objects/RadarViewable.cc (modified) * code/branches/presentation/src/orxonox/objects/RadarViewable.h (modified) * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/Scene.h (modified) * code/branches/presentation/src/orxonox/objects/Script.cc (modified) * code/branches/presentation/src/orxonox/objects/controllers/AIController.cc (copied) * code/branches/presentation/src/orxonox/objects/controllers/AIController.h (copied) * code/branches/presentation/src/orxonox/objects/controllers/ArtificialController.cc (copied) * code/branches/presentation/src/orxonox/objects/controllers/ArtificialController.h (copied) * code/branches/presentation/src/orxonox/objects/controllers/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/controllers/Controller.cc (modified) * code/branches/presentation/src/orxonox/objects/controllers/Controller.h (modified) * code/branches/presentation/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/presentation/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/presentation/src/orxonox/objects/controllers/ScriptController.cc (copied) * code/branches/presentation/src/orxonox/objects/controllers/ScriptController.h (copied) * code/branches/presentation/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/presentation/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/presentation/src/orxonox/objects/infos/Bot.cc (copied) * code/branches/presentation/src/orxonox/objects/infos/Bot.h (copied) * code/branches/presentation/src/orxonox/objects/infos/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/infos/GametypeInfo.cc (copied) * code/branches/presentation/src/orxonox/objects/infos/GametypeInfo.h (copied) * code/branches/presentation/src/orxonox/objects/infos/HumanPlayer.cc (modified) * code/branches/presentation/src/orxonox/objects/infos/HumanPlayer.h (modified) * code/branches/presentation/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/presentation/src/orxonox/objects/infos/PlayerInfo.h (modified) * code/branches/presentation/src/orxonox/objects/items (copied) * code/branches/presentation/src/orxonox/objects/items/CMakeLists.txt (copied) * code/branches/presentation/src/orxonox/objects/items/Engine.cc (copied) * code/branches/presentation/src/orxonox/objects/items/Engine.h (copied) * code/branches/presentation/src/orxonox/objects/items/Item.cc (copied) * code/branches/presentation/src/orxonox/objects/items/Item.h (copied) * code/branches/presentation/src/orxonox/objects/items/MultiStateEngine.cc (copied) * code/branches/presentation/src/orxonox/objects/items/MultiStateEngine.h (copied) * code/branches/presentation/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Billboard.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ExplosionChunk.cc (copied) * code/branches/presentation/src/orxonox/objects/worldentities/ExplosionChunk.h (copied) * code/branches/presentation/src/orxonox/objects/worldentities/FadingBillboard.cc (copied) * code/branches/presentation/src/orxonox/objects/worldentities/FadingBillboard.h (copied) * code/branches/presentation/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Light.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentation/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/presentation/src/orxonox/overlays/OverlayGroup.h (modified) * code/branches/presentation/src/orxonox/overlays/OverlayText.cc (modified) * code/branches/presentation/src/orxonox/overlays/OverlayText.h (modified) * code/branches/presentation/src/orxonox/overlays/debug/DebugFPSText.cc (modified) * code/branches/presentation/src/orxonox/overlays/debug/DebugRTRText.cc (modified) * code/branches/presentation/src/orxonox/overlays/hud/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/overlays/hud/GametypeStatus.cc (copied) * code/branches/presentation/src/orxonox/overlays/hud/GametypeStatus.h (copied) * code/branches/presentation/src/orxonox/overlays/hud/HUDBar.cc (modified) * code/branches/presentation/src/orxonox/overlays/hud/HUDBar.h (modified) * code/branches/presentation/src/orxonox/overlays/hud/HUDHealthBar.cc (copied) * code/branches/presentation/src/orxonox/overlays/hud/HUDHealthBar.h (copied) * code/branches/presentation/src/orxonox/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation/src/orxonox/overlays/hud/HUDRadar.cc (modified) * code/branches/presentation/src/orxonox/overlays/hud/HUDRadar.h (modified) * code/branches/presentation/src/orxonox/overlays/hud/HUDSpeedBar.cc (modified) * code/branches/presentation/src/orxonox/overlays/hud/HUDSpeedBar.h (modified) * code/branches/presentation/src/orxonox/tools/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/presentation/src/orxonox/tools/ParticleInterface.h (modified) * code/branches/presentation/src/orxonox/tools/Shader.cc (copied) * code/branches/presentation/src/orxonox/tools/Shader.h (copied) * code/branches/presentation/src/orxonox/tools/Timer.cc (modified) * code/branches/presentation/src/orxonox/tools/Timer.h (modified) * code/branches/presentation/src/tolua/tolua-5.1.pkg (modified) * code/branches/presentation/src/util (modified) * code/branches/presentation/src/util/Convert.h (modified) * code/branches/presentation/src/util/Exception.cc (modified) * code/branches/presentation/src/util/Exception.h (modified) * code/branches/presentation/src/util/OutputHandler.cc (modified) * code/branches/presentation/src/util/OutputHandler.h (modified) * code/branches/presentation/src/util/SignalHandler.cc (modified) * code/branches/presentation/src/util/SignalHandler.h (modified) * code/branches/presentation/visual_studio/vc8/audio.vsprops (modified) * code/branches/presentation/visual_studio/vc8/base.vsprops (modified) * code/branches/presentation/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/core.vsprops (modified) * code/branches/presentation/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/presentation/visual_studio/vc8/debug.vsprops (modified) * code/branches/presentation/visual_studio/vc8/directories.vsprops (modified) * code/branches/presentation/visual_studio/vc8/lua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/network.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/presentation/visual_studio/vc8/release.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tolua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/util.vsprops (modified) Merged objecthierarchy2 into presentation branch Couln't merge 2 ... Tue, 16 Dec 2008 16:46:50 GMT rgrieder [2484] * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) Bugfix within CompoundCollisionShape. Tue, 16 Dec 2008 14:31:22 GMT scheusso [2483] * code/branches/presentation/src/network/packet/Welcome.cc (modified) removed shipdid from welcome because it's not needed anymore Tue, 16 Dec 2008 12:32:07 GMT scheusso [2482] * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (modified) hackfixed problem with client reconnects (originally triggered by ... Mon, 15 Dec 2008 23:57:25 GMT rgrieder [2481] * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) Amateurs... Mon, 15 Dec 2008 22:45:12 GMT scheusso [2480] * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) another small fix according to dedicated server Mon, 15 Dec 2008 22:39:24 GMT landauf [2479] * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) Cured poor pawns from losing health Mon, 15 Dec 2008 22:26:16 GMT landauf [2478] * code/branches/objecthierarchy2/bin/def_keybindings.ini (modified) * code/branches/objecthierarchy2/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/items/Engine.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/items/Engine.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Spectator.h (modified) - Readded smooth camera movement (configurable through ... Mon, 15 Dec 2008 22:21:10 GMT rgrieder [2477] * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) Bugfix for the server crash when the client leaves. Mon, 15 Dec 2008 22:15:19 GMT scheusso [2476] * code/branches/presentation/src/network/packet/Gamestate.cc (modified) fix of possible bug Mon, 15 Dec 2008 22:14:25 GMT scheusso [2475] * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) small fix (inverted roll) Mon, 15 Dec 2008 22:02:18 GMT rgrieder [2474] * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) A little tweak and physics seems to work over the network ;) Mon, 15 Dec 2008 21:43:22 GMT scheusso [2473] * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) fix for dedicated server Mon, 15 Dec 2008 21:20:59 GMT rgrieder [2472] * code/branches/presentation/src/bullet/LinearMath/btScalar.h (modified) Trying to minimise changes to Bullet v2.73. Mon, 15 Dec 2008 20:56:08 GMT landauf [2471] * code/branches/presentation/src/bullet/LinearMath/btScalar.h (modified) changed lines 230-235 (everything else is just whitespace) this ... Mon, 15 Dec 2008 20:40:09 GMT rgrieder [2470] * code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.cc (modified) Fixed bug that caused MovableEntities to jump around on the client. Mon, 15 Dec 2008 18:57:48 GMT rgrieder [2469] * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) Resolved the issue with the collision shape synchronisation. Mon, 15 Dec 2008 18:40:25 GMT rgrieder [2468] * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/Scene.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) Bugfix for dedicated mode. Should work now except for an exception ... Mon, 15 Dec 2008 15:41:47 GMT landauf [2467] * code/branches/objecthierarchy2/bin/Plugins.cfg (modified) cgprogrammanager for shaders Mon, 15 Dec 2008 15:33:50 GMT rgrieder [2466] * code/branches/presentation/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/Scene.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) Added callback for collisions. Every WorldEntity that collides ... Mon, 15 Dec 2008 14:16:07 GMT rgrieder [2465] * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) Bugfix in WorldEntity: It creates a CompoundCollisionShape in its ... Mon, 15 Dec 2008 14:14:07 GMT rgrieder [2464] * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (modified) Bugfix in network: When checking for other objectIDs, it was possible ... Mon, 15 Dec 2008 00:52:00 GMT rgrieder [2463] * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) Two bugfixes and an optimisation. Mon, 15 Dec 2008 00:38:02 GMT landauf [2462] * code/branches/objecthierarchy2/bin/def_keybindings.ini (modified) * code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/controllers/HumanController.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/objecthierarchy2/src/orxonox/overlays/hud/HUDBar.cc (modified) - fixed a small speedbar-initialization problem - added new ... Mon, 15 Dec 2008 00:02:48 GMT rgrieder [2461] * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/objecthierarchy2/visual_studio/vc8/orxonox.vcproj (modified) - Updated msvc files - temporary solution for a super function ... Sun, 14 Dec 2008 23:54:27 GMT rgrieder [2460] * code/branches/presentation/src/orxonox/gamestates/GSLevel.cc (modified) Switched level file to "presentation.oxw". Sun, 14 Dec 2008 23:53:05 GMT rgrieder [2459] * code/branches/presentation (modified) * code/branches/presentation/cmake/FindODE.cmake (deleted) * code/branches/presentation/src/CMakeLists.txt (modified) * code/branches/presentation/src/bullet (copied) * code/branches/presentation/src/bullet/AUTHORS (copied) * code/branches/presentation/src/bullet/Bullet-C-Api.h (copied) * code/branches/presentation/src/bullet/BulletCollision (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CMakeLists.txt (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btBoxShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCapsuleShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConcaveShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConcaveShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConeShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCylinderShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btCylinderShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btEmptyShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMaterial.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btShapeHull.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btShapeHull.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleCallback.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btTriangleShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btBoxCollision.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btClipPolygon.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btContactProcessing.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btContactProcessing.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactBvh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactShape.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btGeometryOperations.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btQuantization.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_array.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_basic_geometry_operations.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_bitset.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_box_collision.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_box_set.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_clip_polygon.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_contact.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_contact.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_geom_types.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_geometry.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_hash_table.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_linear_math.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_math.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_memory.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_memory.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_radixsort.h (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_tri_collision.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (copied) * code/branches/presentation/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (copied) * code/branches/presentation/src/bullet/BulletDynamics (copied) * code/branches/presentation/src/bullet/BulletDynamics/CMakeLists.txt (copied) * code/branches/presentation/src/bullet/BulletDynamics/Character (copied) * code/branches/presentation/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btWheelInfo.cpp (copied) * code/branches/presentation/src/bullet/BulletDynamics/Vehicle/btWheelInfo.h (copied) * code/branches/presentation/src/bullet/BulletLicense.txt (copied) * code/branches/presentation/src/bullet/CMakeLists.txt (copied) * code/branches/presentation/src/bullet/ChangeLog (copied) * code/branches/presentation/src/bullet/LICENSE (copied) * code/branches/presentation/src/bullet/LinearMath (copied) * code/branches/presentation/src/bullet/LinearMath/CMakeLists.txt (copied) * code/branches/presentation/src/bullet/LinearMath/btAabbUtil2.h (copied) * code/branches/presentation/src/bullet/LinearMath/btAlignedAllocator.cpp (copied) * code/branches/presentation/src/bullet/LinearMath/btAlignedAllocator.h (copied) * code/branches/presentation/src/bullet/LinearMath/btAlignedObjectArray.h (copied) * code/branches/presentation/src/bullet/LinearMath/btConvexHull.cpp (copied) * code/branches/presentation/src/bullet/LinearMath/btConvexHull.h (copied) * code/branches/presentation/src/bullet/LinearMath/btDefaultMotionState.h (copied) * code/branches/presentation/src/bullet/LinearMath/btGeometryUtil.cpp (copied) * code/branches/presentation/src/bullet/LinearMath/btGeometryUtil.h (copied) * code/branches/presentation/src/bullet/LinearMath/btHashMap.h (copied) * code/branches/presentation/src/bullet/LinearMath/btIDebugDraw.h (copied) * code/branches/presentation/src/bullet/LinearMath/btList.h (copied) * code/branches/presentation/src/bullet/LinearMath/btMatrix3x3.h (copied) * code/branches/presentation/src/bullet/LinearMath/btMinMax.h (copied) * code/branches/presentation/src/bullet/LinearMath/btMotionState.h (copied) * code/branches/presentation/src/bullet/LinearMath/btPoolAllocator.h (copied) * code/branches/presentation/src/bullet/LinearMath/btQuadWord.h (copied) * code/branches/presentation/src/bullet/LinearMath/btQuaternion.h (copied) * code/branches/presentation/src/bullet/LinearMath/btQuickprof.cpp (copied) * code/branches/presentation/src/bullet/LinearMath/btQuickprof.h (copied) * code/branches/presentation/src/bullet/LinearMath/btRandom.h (copied) * code/branches/presentation/src/bullet/LinearMath/btScalar.h (copied) * code/branches/presentation/src/bullet/LinearMath/btStackAlloc.h (copied) * code/branches/presentation/src/bullet/LinearMath/btTransform.h (copied) * code/branches/presentation/src/bullet/LinearMath/btTransformUtil.h (copied) * code/branches/presentation/src/bullet/LinearMath/btVector3.h (copied) * code/branches/presentation/src/bullet/NEWS (copied) * code/branches/presentation/src/bullet/README (copied) * code/branches/presentation/src/bullet/VERSION (copied) * code/branches/presentation/src/bullet/btBulletCollisionCommon.h (copied) * code/branches/presentation/src/bullet/btBulletDynamicsCommon.h (copied) * code/branches/presentation/src/core/RootGameState.cc (modified) * code/branches/presentation/src/core/Template.cc (modified) * code/branches/presentation/src/core/Template.h (modified) * code/branches/presentation/src/core/XMLFile.h (modified) * code/branches/presentation/src/core/XMLIncludes.h (modified) * code/branches/presentation/src/core/XMLPort.h (modified) * code/branches/presentation/src/network/packet/Gamestate.cc (modified) * code/branches/presentation/src/network/synchronisable/NetworkCallback.h (modified) * code/branches/presentation/src/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation/src/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation/src/orxonox/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/CameraManager.cc (modified) * code/branches/presentation/src/orxonox/CameraManager.h (modified) * code/branches/presentation/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/presentation/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/Level.cc (modified) * code/branches/presentation/src/orxonox/objects/Level.h (modified) * code/branches/presentation/src/orxonox/objects/Scene.cc (modified) * code/branches/presentation/src/orxonox/objects/Scene.h (modified) * code/branches/presentation/src/orxonox/objects/collisionshapes (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CMakeLists.txt (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.h (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (copied) * code/branches/presentation/src/orxonox/objects/collisionshapes/SphereCollisionShape.h (copied) * code/branches/presentation/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Quest.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/presentation/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/presentation/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Billboard.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Light.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc (copied) * code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.h (copied) * code/branches/presentation/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Model.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleEmitter.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/Planet.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/PositionableEntity.cc (deleted) * code/branches/presentation/src/orxonox/objects/worldentities/PositionableEntity.h (deleted) * code/branches/presentation/src/orxonox/objects/worldentities/SpawnPoint.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/SpawnPoint.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.cc (copied) * code/branches/presentation/src/orxonox/objects/worldentities/StaticEntity.h (copied) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/pawns/Spectator.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/presentation/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/presentation/src/orxonox/tools/BillboardSet.cc (modified) * code/branches/presentation/src/orxonox/tools/BillboardSet.h (modified) * code/branches/presentation/src/orxonox/tools/BulletConversions.h (copied) * code/branches/presentation/src/orxonox/tools/Mesh.cc (modified) * code/branches/presentation/src/orxonox/tools/Mesh.h (modified) * code/branches/presentation/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/presentation/src/orxonox/tools/ParticleInterface.h (modified) * code/branches/presentation/src/tolua/tolua-5.1.pkg (modified) * code/branches/presentation/src/util (modified) * code/branches/presentation/src/util/Exception.cc (modified) * code/branches/presentation/src/util/Exception.h (modified) * code/branches/presentation/src/util/Integers.h (modified) * code/branches/presentation/src/util/Math.h (modified) * code/branches/presentation/src/util/SignalHandler.cc (modified) * code/branches/presentation/src/util/SignalHandler.h (modified) * code/branches/presentation/visual_studio/vc8/audio.vsprops (modified) * code/branches/presentation/visual_studio/vc8/base.vsprops (modified) * code/branches/presentation/visual_studio/vc8/bullet.vsprops (copied) * code/branches/presentation/visual_studio/vc8/bullet_collision.vcproj (copied) * code/branches/presentation/visual_studio/vc8/bullet_dynamics.vcproj (copied) * code/branches/presentation/visual_studio/vc8/bullet_linearmath.vcproj (copied) * code/branches/presentation/visual_studio/vc8/bullet_softbody.vcproj (copied) * code/branches/presentation/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/core.vsprops (modified) * code/branches/presentation/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/presentation/visual_studio/vc8/debug.vsprops (modified) * code/branches/presentation/visual_studio/vc8/directories.vsprops (modified) * code/branches/presentation/visual_studio/vc8/lua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/network.vsprops (modified) * code/branches/presentation/visual_studio/vc8/ogrebullet_collisions.vcproj (copied) * code/branches/presentation/visual_studio/vc8/ogrebullet_collisions.vsprops (copied) * code/branches/presentation/visual_studio/vc8/ogrebullet_dynamics.vcproj (copied) * code/branches/presentation/visual_studio/vc8/ogrebullet_dynamics.vsprops (copied) * code/branches/presentation/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/presentation/visual_studio/vc8/release.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/presentation/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/presentation/visual_studio/vc8/tolua.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/presentation/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/presentation/visual_studio/vc8/util.vsprops (modified) Merged physics_merge back to presentation branch. Sun, 14 Dec 2008 23:37:09 GMT rgrieder [2458] * code/branches/physics_merge/src/orxonox/CMakeLists.txt (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.h (modified) * code/branches/physics_merge/src/util/Integers.h (modified) Several build fixed. Something seems to be wrong with the ... Sun, 14 Dec 2008 22:41:08 GMT rgrieder [2457] * code/branches/physics_merge/src/network/packet/Gamestate.cc (modified) Fix didn't do the trick. Don't even know exactly what it would have ... Sun, 14 Dec 2008 22:25:05 GMT rgrieder [2456] * code/branches/physics_merge/src/network/packet/Gamestate.cc (modified) Applied bugfix r2441 to physics_merge branch as well. Sun, 14 Dec 2008 22:16:36 GMT rgrieder [2455] * code/branches/physics_merge/src/network/synchronisable/NetworkCallbackManager.cc (modified) Bugfix: std:dequeue::front() on an empty list is a very bad idea. Sun, 14 Dec 2008 22:02:58 GMT rgrieder [2454] * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/StaticEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) Replaced bad collision type exceptions with asserts. The developer ... Sun, 14 Dec 2008 21:55:04 GMT rgrieder [2453] * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/SpaceShip.h (modified) SpaceShip is now harmonising with Bullet as well. The attributes of ... Sun, 14 Dec 2008 21:53:44 GMT rgrieder [2452] * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.h (modified) Minor changes and added localInertia_ to worldentity for faster access. Sun, 14 Dec 2008 21:53:00 GMT rgrieder [2451] * code/branches/physics_merge/src/core/XMLPort.h (modified) Bugfix in XMLPort macro. Sun, 14 Dec 2008 21:15:55 GMT landauf [2450] * code/branches/objecthierarchy2/src/network/packet/Gamestate.cc (modified) I'm not 100% sure if this works, but I had no more crashes since this ... Sun, 14 Dec 2008 20:36:26 GMT landauf [2449] * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/objecthierarchy2/src/orxonox/overlays/hud/GametypeStatus.cc (modified) removed temporary workaround in Camera and CameraPosition thanks to ... Sun, 14 Dec 2008 19:13:56 GMT rgrieder [2448] * code/branches/physics_merge/src/orxonox/objects/Scene.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/Spectator.h (modified) Spectator update with new physics stuff. Sun, 14 Dec 2008 19:13:43 GMT landauf [2447] * code/branches/objecthierarchy2/src/orxonox/objects/Scene.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/Scene.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Light.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) - Removed directional-light-hack from Scene - Many changes in ... Sun, 14 Dec 2008 18:08:36 GMT rgrieder [2446] * code/branches/physics_merge/src/orxonox/objects/Scene.cc (modified) * code/branches/physics_merge/src/orxonox/objects/Scene.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.cc (modified) - orxonox::Scene should work properly with XMLPort and network ... Sun, 14 Dec 2008 18:06:12 GMT rgrieder [2445] * code/branches/physics_merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/physics_merge/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (modified) Small adjustments due to the merge. Sun, 14 Dec 2008 15:32:14 GMT rgrieder [2444] * code/branches/physics_merge/cmake/FindODE.cmake (deleted) ODE isn't required anymore. Sun, 14 Dec 2008 15:29:42 GMT rgrieder [2443] * code/branches/physics_merge/visual_studio/vc8/directories.vsprops (modified) reverted accidentally merged stuff. Sun, 14 Dec 2008 15:16:52 GMT rgrieder [2442] * code/branches/physics_merge (modified) * code/branches/physics_merge/cmake/FindODE.cmake (modified) * code/branches/physics_merge/src/CMakeLists.txt (modified) * code/branches/physics_merge/src/bullet (copied) * code/branches/physics_merge/src/bullet/AUTHORS (copied) * code/branches/physics_merge/src/bullet/Bullet-C-Api.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDbvt.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CMakeLists.txt (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btGhostObject.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btManifoldResult.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btBoxShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btBoxShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCapsuleShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCapsuleShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCollisionMargin.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCompoundShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConcaveShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConcaveShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConeShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConeShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexHullShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexInternalShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexPointCloudShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCylinderShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btCylinderShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btEmptyShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMaterial.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMinkowskiSumShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMultiSphereShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btOptimizedBvh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btShapeHull.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btShapeHull.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btSphereShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btSphereShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btStridingMeshInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTetrahedronShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleBuffer.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleCallback.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleCallback.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleMeshShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btTriangleShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/CollisionShapes/btUniformScalingShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btBoxCollision.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btClipPolygon.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btContactProcessing.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btContactProcessing.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactBvh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactBvh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactShape.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGImpactShape.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btGeometryOperations.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btQuantization.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/btTriangleShapeEx.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_array.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_basic_geometry_operations.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_bitset.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_box_collision.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_box_set.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_box_set.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_clip_polygon.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_contact.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_contact.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_geom_types.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_geometry.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_hash_table.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_linear_math.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_math.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_memory.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_memory.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_radixsort.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_tri_collision.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/Gimpact/gim_tri_collision.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexCast.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (copied) * code/branches/physics_merge/src/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/CMakeLists.txt (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Character (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Character/btCharacterControllerInterface.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Character/btKinematicCharacterController.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Character/btKinematicCharacterController.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btContactConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btContactSolverInfo.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btJacobianEntry.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btSolverConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/Bullet-C-API.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btRigidBody.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btWheelInfo.cpp (copied) * code/branches/physics_merge/src/bullet/BulletDynamics/Vehicle/btWheelInfo.h (copied) * code/branches/physics_merge/src/bullet/BulletLicense.txt (copied) * code/branches/physics_merge/src/bullet/CMakeLists.txt (copied) * code/branches/physics_merge/src/bullet/ChangeLog (copied) * code/branches/physics_merge/src/bullet/LICENSE (copied) * code/branches/physics_merge/src/bullet/LinearMath (copied) * code/branches/physics_merge/src/bullet/LinearMath/CMakeLists.txt (copied) * code/branches/physics_merge/src/bullet/LinearMath/btAabbUtil2.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btAlignedAllocator.cpp (copied) * code/branches/physics_merge/src/bullet/LinearMath/btAlignedAllocator.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btAlignedObjectArray.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btConvexHull.cpp (copied) * code/branches/physics_merge/src/bullet/LinearMath/btConvexHull.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btDefaultMotionState.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btGeometryUtil.cpp (copied) * code/branches/physics_merge/src/bullet/LinearMath/btGeometryUtil.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btHashMap.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btIDebugDraw.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btList.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btMatrix3x3.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btMinMax.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btMotionState.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btPoolAllocator.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btQuadWord.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btQuaternion.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btQuickprof.cpp (copied) * code/branches/physics_merge/src/bullet/LinearMath/btQuickprof.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btRandom.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btScalar.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btStackAlloc.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btTransform.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btTransformUtil.h (copied) * code/branches/physics_merge/src/bullet/LinearMath/btVector3.h (copied) * code/branches/physics_merge/src/bullet/NEWS (copied) * code/branches/physics_merge/src/bullet/README (copied) * code/branches/physics_merge/src/bullet/VERSION (copied) * code/branches/physics_merge/src/bullet/btBulletCollisionCommon.h (copied) * code/branches/physics_merge/src/bullet/btBulletDynamicsCommon.h (copied) * code/branches/physics_merge/src/core/RootGameState.cc (modified) * code/branches/physics_merge/src/core/Template.cc (modified) * code/branches/physics_merge/src/core/Template.h (modified) * code/branches/physics_merge/src/core/XMLFile.h (modified) * code/branches/physics_merge/src/core/XMLIncludes.h (modified) * code/branches/physics_merge/src/core/XMLPort.h (modified) * code/branches/physics_merge/src/orxonox/CMakeLists.txt (modified) * code/branches/physics_merge/src/orxonox/CameraManager.cc (modified) * code/branches/physics_merge/src/orxonox/CameraManager.h (modified) * code/branches/physics_merge/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/physics_merge/src/orxonox/OrxonoxStableHeaders.h (modified) * code/branches/physics_merge/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/physics_merge/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/physics_merge/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/physics_merge/src/orxonox/objects/Scene.cc (modified) * code/branches/physics_merge/src/orxonox/objects/Scene.h (modified) * code/branches/physics_merge/src/orxonox/objects/collisionshapes (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CMakeLists.txt (added) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.cc (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (copied) * code/branches/physics_merge/src/orxonox/objects/collisionshapes/SphereCollisionShape.h (copied) * code/branches/physics_merge/src/orxonox/objects/pickup/Usable.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddQuestHint.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddReward.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/AddReward.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/ChangeQuestStatus.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/CompleteQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/FailQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/FailQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/GlobalQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/LocalQuest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/Quest.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/Quest.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestDescription.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestEffect.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestHint.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestHint.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestItem.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestItem.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestManager.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/QuestManager.h (modified) * code/branches/physics_merge/src/orxonox/objects/quest/Rewardable.cc (modified) * code/branches/physics_merge/src/orxonox/objects/quest/Rewardable.h (modified) * code/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) * code/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Backlight.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Billboard.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Billboard.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/CMakeLists.txt (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Camera.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/CameraPosition.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/CameraPosition.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ControllableEntity.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Light.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Light.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.cc (copied) * code/branches/physics_merge/src/orxonox/objects/worldentities/MobileEntity.h (copied) * code/branches/physics_merge/src/orxonox/objects/worldentities/Model.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Model.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MovableEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/MovableEntity.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ParticleEmitter.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/ParticleSpawner.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/Planet.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/PositionableEntity.cc (deleted) * code/branches/physics_merge/src/orxonox/objects/worldentities/PositionableEntity.h (deleted) * code/branches/physics_merge/src/orxonox/objects/worldentities/SpawnPoint.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/SpawnPoint.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/StaticEntity.cc (copied) * code/branches/physics_merge/src/orxonox/objects/worldentities/StaticEntity.h (copied) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/WorldEntity.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) * code/branches/physics_merge/src/orxonox/objects/worldentities/triggers/Trigger.h (modified) * code/branches/physics_merge/src/orxonox/tools/BillboardSet.cc (modified) * code/branches/physics_merge/src/orxonox/tools/BillboardSet.h (modified) * code/branches/physics_merge/src/orxonox/tools/BulletConversions.h (copied) * code/branches/physics_merge/src/orxonox/tools/Mesh.cc (modified) * code/branches/physics_merge/src/orxonox/tools/Mesh.h (modified) * code/branches/physics_merge/src/orxonox/tools/ParticleInterface.cc (modified) * code/branches/physics_merge/src/orxonox/tools/ParticleInterface.h (modified) * code/branches/physics_merge/src/tolua/tolua-5.1.pkg (modified) * code/branches/physics_merge/src/util (modified) * code/branches/physics_merge/src/util/Exception.cc (modified) * code/branches/physics_merge/src/util/Exception.h (modified) * code/branches/physics_merge/src/util/Math.h (modified) * code/branches/physics_merge/src/util/SignalHandler.cc (modified) * code/branches/physics_merge/src/util/SignalHandler.h (modified) * code/branches/physics_merge/visual_studio/vc8/audio.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/base.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/bullet.vsprops (copied) * code/branches/physics_merge/visual_studio/vc8/bullet_collision.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/bullet_dynamics.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/bullet_linearmath.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/bullet_softbody.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/ceguilua.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/core.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/cpptcl.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/debug.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/directories.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/lua.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/network.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/ogrebullet_collisions.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/ogrebullet_collisions.vsprops (copied) * code/branches/physics_merge/visual_studio/vc8/ogrebullet_dynamics.vcproj (copied) * code/branches/physics_merge/visual_studio/vc8/ogrebullet_dynamics.vsprops (copied) * code/branches/physics_merge/visual_studio/vc8/orxonox.vcproj (modified) * code/branches/physics_merge/visual_studio/vc8/orxonox.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/orxonox_vc8.sln (modified) * code/branches/physics_merge/visual_studio/vc8/release.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/tinyxml.vcproj (modified) * code/branches/physics_merge/visual_studio/vc8/tinyxml.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/tolua.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/toluagen.vcproj (modified) * code/branches/physics_merge/visual_studio/vc8/toluagen.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/toluagen_orxonox.vcproj (modified) * code/branches/physics_merge/visual_studio/vc8/toluagen_orxonox.vsprops (modified) * code/branches/physics_merge/visual_studio/vc8/util.vsprops (modified) Finally merged physics stuff. Target is physics_merge because I'll ... Sun, 14 Dec 2008 14:08:25 GMT scheusso [2441] * code/branches/objecthierarchy2/TODO (modified) * code/branches/objecthierarchy2/src/network/packet/Gamestate.cc (modified) i think i fixed that problem with objectMode 0x0 Sun, 14 Dec 2008 11:25:18 GMT rgrieder [2440] * code/branches/physics_merge (copied) new physics_merge branch Sun, 14 Dec 2008 11:24:34 GMT rgrieder [2439] * code/branches/physics_merge (deleted) Removed outdated physics_merge branch Sun, 14 Dec 2008 02:53:05 GMT landauf [2438] * code/branches/objecthierarchy2/src/orxonox/objects/Radar.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/RadarViewable.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/RadarViewable.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/gametypes/Gametype.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.h (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) * code/branches/objecthierarchy2/src/orxonox/overlays/hud/HUDNavigation.cc (modified) - If the player dies, the Spectator spawns at the same position the ... Sun, 14 Dec 2008 02:00:37 GMT landauf [2437] * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc (modified) * code/branches/objecthierarchy2/src/orxonox/objects/worldentities/CameraPosition.cc (modified) There's a problem in the network engine causing a crash. It's somehow ...