# # ChangeLog for code/branches/presentation2/src/modules # # Generated by Trac 1.0.9 # Nov 25, 2024, 10:17:46 PM Tue, 22 Dec 2009 21:38:34 GMT rgrieder [6401] * code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc (modified) Removed useless damage_ config value from Projectile. Rather use the ... Tue, 22 Dec 2009 21:05:38 GMT rgrieder [6400] * code/branches/presentation2/src/libraries/core/ArgumentCompletionFunctions.cc (modified) * code/branches/presentation2/src/libraries/core/BaseObject.cc (modified) * code/branches/presentation2/src/libraries/core/ClassTreeMask.cc (modified) * code/branches/presentation2/src/libraries/core/CommandEvaluation.cc (modified) * code/branches/presentation2/src/libraries/core/CommandExecutor.cc (modified) * code/branches/presentation2/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/presentation2/src/libraries/core/Language.cc (modified) * code/branches/presentation2/src/libraries/core/Loader.cc (modified) * code/branches/presentation2/src/libraries/core/NamespaceNode.cc (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateClient.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified) * code/branches/presentation2/src/libraries/network/TrafficControl.cc (modified) * code/branches/presentation2/src/libraries/network/packet/ClassID.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/presentation2/src/libraries/tools/TextureGenerator.cc (modified) * code/branches/presentation2/src/libraries/util/StringUtils.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation2/src/modules/pong/PongAI.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestManager.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentation2/src/orxonox/pickup/ModifierPickup.cc (modified) * code/branches/presentation2/src/orxonox/pickup/PickupCollection.cc (modified) Replaced (*it). with it-> where I could find it. Should increased ... Tue, 22 Dec 2009 13:07:44 GMT rgrieder [6394] * code/branches/presentation2/src/Orxonox.cc (modified) * code/branches/presentation2/src/libraries/core/ArgumentCompletionFunctions.cc (modified) * code/branches/presentation2/src/libraries/core/BaseObject.cc (modified) * code/branches/presentation2/src/libraries/core/ClassTreeMask.cc (modified) * code/branches/presentation2/src/libraries/core/CommandEvaluation.cc (modified) * code/branches/presentation2/src/libraries/core/CommandEvaluation.h (modified) * code/branches/presentation2/src/libraries/core/CommandExecutor.cc (modified) * code/branches/presentation2/src/libraries/core/CommandExecutor.h (modified) * code/branches/presentation2/src/libraries/core/CommandLineParser.cc (modified) * code/branches/presentation2/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/presentation2/src/libraries/core/ConfigFileManager.h (modified) * code/branches/presentation2/src/libraries/core/ConsoleCommandCompilation.cc (modified) * code/branches/presentation2/src/libraries/core/DynLib.cc (modified) * code/branches/presentation2/src/libraries/core/Event.cc (modified) * code/branches/presentation2/src/libraries/core/EventIncludes.h (modified) * code/branches/presentation2/src/libraries/core/Executor.cc (modified) * code/branches/presentation2/src/libraries/core/Executor.h (modified) * code/branches/presentation2/src/libraries/core/Functor.h (modified) * code/branches/presentation2/src/libraries/core/GraphicsManager.cc (modified) * code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) * code/branches/presentation2/src/libraries/core/IRC.cc (modified) * code/branches/presentation2/src/libraries/core/Identifier.cc (modified) * code/branches/presentation2/src/libraries/core/Identifier.h (modified) * code/branches/presentation2/src/libraries/core/Language.cc (modified) * code/branches/presentation2/src/libraries/core/Loader.cc (modified) * code/branches/presentation2/src/libraries/core/Namespace.cc (modified) * code/branches/presentation2/src/libraries/core/NamespaceNode.cc (modified) * code/branches/presentation2/src/libraries/core/OrxonoxClass.cc (modified) * code/branches/presentation2/src/libraries/core/PathConfig.cc (modified) * code/branches/presentation2/src/libraries/core/Shell.cc (modified) * code/branches/presentation2/src/libraries/core/Shell.h (modified) * code/branches/presentation2/src/libraries/core/SubclassIdentifier.h (modified) * code/branches/presentation2/src/libraries/core/TclBind.cc (modified) * code/branches/presentation2/src/libraries/core/TclBind.h (modified) * code/branches/presentation2/src/libraries/core/TclThreadManager.cc (modified) * code/branches/presentation2/src/libraries/core/TclThreadManager.h (modified) * code/branches/presentation2/src/libraries/core/Template.cc (modified) * code/branches/presentation2/src/libraries/core/Template.h (modified) * code/branches/presentation2/src/libraries/core/XMLPort.h (modified) * code/branches/presentation2/src/libraries/core/input/Button.cc (modified) * code/branches/presentation2/src/libraries/core/input/Button.h (modified) * code/branches/presentation2/src/libraries/core/input/InputBuffer.cc (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified) * code/branches/presentation2/src/libraries/core/input/JoyStick.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/presentation2/src/libraries/network/Client.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateClient.cc (modified) * code/branches/presentation2/src/libraries/network/packet/ClassID.cc (modified) * code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/presentation2/src/libraries/tools/BillboardSet.cc (modified) * code/branches/presentation2/src/libraries/tools/Mesh.cc (modified) * code/branches/presentation2/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/presentation2/src/libraries/tools/ResourceLocation.cc (modified) * code/branches/presentation2/src/libraries/tools/Shader.cc (modified) * code/branches/presentation2/src/libraries/tools/TextureGenerator.cc (modified) * code/branches/presentation2/src/libraries/util/Clipboard.cc (modified) * code/branches/presentation2/src/libraries/util/Convert.h (modified) * code/branches/presentation2/src/libraries/util/Exception.cc (modified) * code/branches/presentation2/src/libraries/util/Math.h (modified) * code/branches/presentation2/src/libraries/util/MathConvert.h (modified) * code/branches/presentation2/src/libraries/util/OutputHandler.cc (modified) * code/branches/presentation2/src/libraries/util/StringUtils.cc (modified) * code/branches/presentation2/src/libraries/util/SubString.cc (modified) * code/branches/presentation2/src/libraries/util/UtilPrereqs.h (modified) * code/branches/presentation2/src/modules/objects/Attacher.cc (modified) * code/branches/presentation2/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/branches/presentation2/src/modules/objects/eventsystem/EventListener.cc (modified) * code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/presentation2/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/presentation2/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/presentation2/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/presentation2/src/modules/overlays/OverlayText.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDRadar.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/branches/presentation2/src/modules/pong/PongScore.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestItem.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestListener.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestNotification.cc (modified) * code/branches/presentation2/src/modules/questsystem/notifications/Notification.cc (modified) * code/branches/presentation2/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/presentation2/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/branches/presentation2/src/orxonox/Level.cc (modified) * code/branches/presentation2/src/orxonox/LevelManager.cc (modified) * code/branches/presentation2/src/orxonox/LevelManager.h (modified) * code/branches/presentation2/src/orxonox/Radar.cc (modified) * code/branches/presentation2/src/orxonox/Radar.h (modified) * code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Asteroids.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Deathmatch.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/presentation2/src/orxonox/graphics/Billboard.cc (modified) * code/branches/presentation2/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/presentation2/src/orxonox/items/Engine.h (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/presentation2/src/orxonox/overlays/Map.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentation2/src/orxonox/pickup/DroppedItem.cc (modified) * code/branches/presentation2/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) std::string tweaks: - Declared BLANKSTRING in UtilPrereqs.h as well ... Mon, 21 Dec 2009 12:45:56 GMT rgrieder [6389] * code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi (modified) * code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi (modified) * code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi (modified) * code/branches/presentation2/data/levels/old/physicstest2.oxw (modified) * code/branches/presentation2/data/levels/old/presentation_physics.oxw (modified) * code/branches/presentation2/data/levels/old/princessaeryn.oxw (modified) * code/branches/presentation2/data/levels/old/questsystem.oxw (modified) * code/branches/presentation2/data/levels/old/sample4.oxw (modified) * code/branches/presentation2/data/levels/presentation.oxw (modified) * code/branches/presentation2/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2/data/levels/presentationHS09b.oxw (modified) * code/branches/presentation2/data/levels/princessaeryn.oxw (modified) * code/branches/presentation2/data/levels/sound.oxw (modified) * code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) Found some inappropriate tabs. Mon, 21 Dec 2009 12:28:10 GMT rgrieder [6388] * code/branches/presentation2/README (modified) * code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/GameplayMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/presentation2/data/levels/empty_level.oxw (modified) * code/branches/presentation2/data/levels/gametype_asteroids.oxw (modified) * code/branches/presentation2/data/levels/old/physicstest.oxw (modified) * code/branches/presentation2/data/levels/old/tutorial_hs08.oxw (modified) * code/branches/presentation2/data/levels/presentation09.oxw (modified) * code/branches/presentation2/data/levels/presentation09b.oxw (modified) * code/branches/presentation2/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2/data/levels/presentation_dm.oxw (modified) * code/branches/presentation2/data/levels/questsystem2.oxw (modified) * code/branches/presentation2/data/levels/teambasematchlevel.oxw (modified) * code/branches/presentation2/data/levels/test_ghost.oxw (modified) * code/branches/presentation2/data/overlays/OrxonoxLoading.overlay (modified) * code/branches/presentation2/doc/CMakeLists.txt (modified) * code/branches/presentation2/doc/api/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h (modified) * code/branches/presentation2/src/libraries/core/EventIncludes.h (modified) * code/branches/presentation2/src/libraries/core/GUIManager.h (modified) * code/branches/presentation2/src/libraries/core/MemoryArchive.cc (modified) * code/branches/presentation2/src/libraries/core/MemoryArchive.h (modified) * code/branches/presentation2/src/libraries/core/Resource.h (modified) * code/branches/presentation2/src/libraries/core/input/InputCommands.h (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified) * code/branches/presentation2/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkFunction.h (modified) * code/branches/presentation2/src/libraries/network/Server.cc (modified) * code/branches/presentation2/src/libraries/network/TrafficControl.h (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Packet.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation2/src/libraries/util/Serialise.h (modified) * code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUINode.h (modified) * code/branches/presentation2/src/modules/questsystem/QuestListener.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestManager.h (modified) * code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation2/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentation2/src/orxonox/pickup/UsableItem.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h (modified) Found some end of line leftover spaces. Mon, 21 Dec 2009 12:18:36 GMT rgrieder [6387] * code/branches/presentation2/cmake/FindLua.cmake (modified) * code/branches/presentation2/cmake/FindPackageHandleAdvancedArgs.cmake (modified) * code/branches/presentation2/cmake/LibraryConfig.cmake (modified) * code/branches/presentation2/cmake/LibraryConfigApple.cmake (modified) * code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake (modified) * code/branches/presentation2/data/gui/layouts/PickupInventory.layout (modified) * code/branches/presentation2/data/gui/scripts/GUITools.lua (modified) * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/PickupInventory.lua (modified) * code/branches/presentation2/data/gui/scripts/QuestGUI.lua (modified) * code/branches/presentation2/data/levels/empty_level.oxw (modified) * code/branches/presentation2/data/levels/events.oxw (modified) * code/branches/presentation2/data/levels/old/spaceshiptemplates_physics.oxw (modified) * code/branches/presentation2/data/levels/presentation09.oxw (modified) * code/branches/presentation2/data/levels/presentation09b.oxw (modified) * code/branches/presentation2/data/levels/presentationHS09.oxw (modified) * code/branches/presentation2/data/levels/presentation_dm.oxw (modified) * code/branches/presentation2/data/levels/questsystem2.oxw (modified) * code/branches/presentation2/data/levels/sound.oxw (modified) * code/branches/presentation2/data/levels/test_ghost.oxw (modified) * code/branches/presentation2/data/overlays/debug.oxo (modified) * code/branches/presentation2/data/overlays/stats.oxo (modified) * code/branches/presentation2/doc/api/CMakeLists.txt (modified) * code/branches/presentation2/src/external/ceguilua/CMakeLists.txt (modified) * code/branches/presentation2/src/external/ceguilua/ceguilua-0.5.0/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/BaseObject.cc (modified) * code/branches/presentation2/src/libraries/core/BaseObject.h (modified) * code/branches/presentation2/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/presentation2/src/libraries/core/Event.cc (modified) * code/branches/presentation2/src/libraries/core/Event.h (modified) * code/branches/presentation2/src/libraries/core/EventIncludes.h (modified) * code/branches/presentation2/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2/src/libraries/core/OrxonoxClass.h (modified) * code/branches/presentation2/src/libraries/core/SmartPtr.h (modified) * code/branches/presentation2/src/libraries/core/Thread.cc (modified) * code/branches/presentation2/src/libraries/core/Thread.h (modified) * code/branches/presentation2/src/libraries/core/ThreadPool.cc (modified) * code/branches/presentation2/src/libraries/core/ThreadPool.h (modified) * code/branches/presentation2/src/libraries/core/WeakPtr.h (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.h (modified) * code/branches/presentation2/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/presentation2/src/libraries/core/input/InputState.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/presentation2/src/libraries/network/Client.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.h (modified) * code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/presentation2/src/libraries/network/ClientInformation.cc (modified) * code/branches/presentation2/src/libraries/network/Connection.cc (modified) * code/branches/presentation2/src/libraries/network/Connection.h (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.h (modified) * code/branches/presentation2/src/libraries/network/GamestateClient.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateHandler.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkFunction.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkFunction.h (modified) * code/branches/presentation2/src/libraries/network/Server.cc (modified) * code/branches/presentation2/src/libraries/network/Server.h (modified) * code/branches/presentation2/src/libraries/network/ServerConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ServerConnection.h (modified) * code/branches/presentation2/src/libraries/network/TrafficControl.cc (modified) * code/branches/presentation2/src/libraries/network/TrafficControl.h (modified) * code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Chat.cc (modified) * code/branches/presentation2/src/libraries/network/packet/ClassID.h (modified) * code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.h (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Packet.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallback.h (modified) * code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.h (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation2/src/libraries/network/synchronisable/SynchronisableVariable.h (modified) * code/branches/presentation2/src/libraries/tools/Timer.cc (modified) * code/branches/presentation2/src/libraries/tools/Timer.h (modified) * code/branches/presentation2/src/libraries/tools/interfaces/TimeFactorListener.h (modified) * code/branches/presentation2/src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) * code/branches/presentation2/src/libraries/util/Clock.cc (modified) * code/branches/presentation2/src/libraries/util/Math.cc (modified) * code/branches/presentation2/src/libraries/util/MultiType.h (modified) * code/branches/presentation2/src/libraries/util/MultiTypeValue.h (modified) * code/branches/presentation2/src/libraries/util/Serialise.h (modified) * code/branches/presentation2/src/libraries/util/mbool.h (modified) * code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/presentation2/src/modules/objects/eventsystem/EventTarget.h (modified) * code/branches/presentation2/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/branches/presentation2/src/modules/overlays/stats/CreateLines.cc (modified) * code/branches/presentation2/src/modules/pong/Pong.cc (modified) * code/branches/presentation2/src/modules/pong/PongAI.cc (modified) * code/branches/presentation2/src/modules/pong/PongBall.cc (modified) * code/branches/presentation2/src/modules/questsystem/AddQuestHint.cc (modified) * code/branches/presentation2/src/modules/questsystem/AddReward.cc (modified) * code/branches/presentation2/src/modules/questsystem/ChangeQuestStatus.cc (modified) * code/branches/presentation2/src/modules/questsystem/CompleteQuest.cc (modified) * code/branches/presentation2/src/modules/questsystem/FailQuest.cc (modified) * code/branches/presentation2/src/modules/questsystem/GlobalQuest.cc (modified) * code/branches/presentation2/src/modules/questsystem/LocalQuest.cc (modified) * code/branches/presentation2/src/modules/questsystem/Quest.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestDescription.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestEffect.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUI.h (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestGUINode.h (modified) * code/branches/presentation2/src/modules/questsystem/QuestHint.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestItem.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestListener.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestNotification.cc (modified) * code/branches/presentation2/src/modules/questsystem/notifications/Notification.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation2/src/orxonox/MoodManager.cc (modified) * code/branches/presentation2/src/orxonox/PlayerManager.cc (modified) * code/branches/presentation2/src/orxonox/Scene.h (modified) * code/branches/presentation2/src/orxonox/Test.h (modified) * code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/presentation2/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Gametype.h (modified) * code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2/src/orxonox/interfaces/Rewardable.h (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/presentation2/src/orxonox/pickup/ModifierPickup.h (modified) * code/branches/presentation2/src/orxonox/pickup/UsableItem.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation2/src/orxonox/worldentities/StaticEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified) Found some non empty new lines. Sat, 19 Dec 2009 21:14:08 GMT rgrieder [6383] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified) Fixed a major sound issue: The state gets reset to 'Stopped' when the ... Fri, 18 Dec 2009 23:07:32 GMT rgrieder [6381] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/orxonox/Scene.cc (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) Copy&paste for dummies in Scene.cc (caused fire sound to be very ... Fri, 18 Dec 2009 11:48:19 GMT rgrieder [6378] * code/branches/presentation2/src/libraries/core/Game.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundBuffer.h (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundStreamer.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundStreamer.h (modified) Added missing includes (revealed only with PCH and compilations). Wed, 16 Dec 2009 10:28:11 GMT rgrieder [6361] * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) Temporary fix for the missing munition type. Thu, 10 Dec 2009 19:56:48 GMT scheusso [6315] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) fixed rocket on client (uninitialised values) Thu, 10 Dec 2009 07:49:33 GMT scheusso [6313] * code/branches/presentation2/src/libraries/core/GraphicsManager.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified) further network fixes changed screenshot format from jpeg to tiff ... Wed, 09 Dec 2009 21:09:27 GMT scheusso [6307] * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/AmbientSound.h (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified) * code/branches/presentation2/src/orxonox/sound/WorldSound.h (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) Approach to make sounds synchronisable (not yet working) Wed, 09 Dec 2009 15:54:20 GMT wirthmi [6295] * code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) * code/branches/presentation2/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified) Changed a function call when hit from damage() to hit(). Pass through ... Wed, 09 Dec 2009 15:32:41 GMT rgrieder [6293] * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.h (modified) * code/branches/presentation2/src/orxonox/interfaces/RadarViewable.cc (modified) Fixed HUDNavigation: Aim position is not available anymore ... Wed, 09 Dec 2009 13:31:54 GMT youngk [6285] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) Launching sound of the Rocket plays normally now. Changed ... Wed, 09 Dec 2009 08:23:28 GMT rgrieder [6277] * code/branches/presentation2/src/libraries/core/Game.cc (modified) * code/branches/presentation2/src/libraries/core/OrxonoxClass.cc (modified) * code/branches/presentation2/src/libraries/util/OutputHandler.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc (modified) Small changes, optimisations and typos. Tue, 08 Dec 2009 23:21:40 GMT youngk [6276] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) Adjusted two calls for differently named sound files. Tue, 08 Dec 2009 10:48:52 GMT scheusso [6273] * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2/src/orxonox/Radar.cc (modified) radar working again (also focus incl. cycleNavigationFocus) Fri, 04 Dec 2009 17:05:39 GMT youngk [6247] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) Implemented exhaust sound for rocket. Explosion sounds of any sort ... Fri, 04 Dec 2009 14:52:28 GMT youngk [6245] * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.h (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.h (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h (modified) Implemented Firing sounds in Weapons HsW01, LightningGun and ... Thu, 03 Dec 2009 16:45:08 GMT cdaniel [6228] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) Camera position is now closer to the Rocket (which is now a bit ... Thu, 03 Dec 2009 16:14:49 GMT youngk [6227] * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.h (modified) Inserted a firing sound into HsW01. BUG: Sound plays only once on ... Thu, 03 Dec 2009 10:23:06 GMT scheusso [6223] * code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) fixed some uninitialised variables Wed, 02 Dec 2009 21:20:37 GMT rgrieder [6218] * code/branches/presentation2/src/libraries/core/ConfigValueContainer.h (modified) * code/branches/presentation2/src/libraries/tools/ParticleInterface.cc (modified) * code/branches/presentation2/src/libraries/tools/Shader.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation2/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/presentation2/src/orxonox/overlays/Map.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc (modified) Fixed at least 8 unitialised value problems though not all of them ... Mon, 30 Nov 2009 09:44:06 GMT rgrieder [6182] * code/branches/presentation2/src/libraries/core/ScopedSingletonManager.h (modified) * code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/presentation2/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/presentation2/src/modules/questsystem/QuestManager.cc (modified) * code/branches/presentation2/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/presentation2/src/orxonox/CameraManager.cc (modified) * code/branches/presentation2/src/orxonox/LevelManager.cc (modified) * code/branches/presentation2/src/orxonox/MoodManager.cc (modified) * code/branches/presentation2/src/orxonox/PlayerManager.cc (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) Singleton pointer initialisation should be part of the ... Thu, 26 Nov 2009 18:41:49 GMT landauf [6167] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) - you don't have to set the syncMode of the CameraPosition to 0x0, ... Wed, 25 Nov 2009 18:51:42 GMT dafrick [6154] * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) Didn't compile because Pawn.h wasn't included in LightningGun.cc, ... Wed, 25 Nov 2009 17:04:10 GMT scheusso [6153] * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) some fixes in weapon system / weapons fabian: projectiles also spawn ... Wed, 25 Nov 2009 15:52:37 GMT scheusso [6150] * code/branches/presentation2 (modified) * code/branches/presentation2/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (copied) * code/branches/presentation2/data/gui/layouts/InGameMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/MainMenu.layout (modified) * code/branches/presentation2/data/gui/layouts/MainMenuBackground.layout (copied) * code/branches/presentation2/data/gui/layouts/NewAudioMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewControlsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewCreditsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewGameplayMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewGraphicsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewMainMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewMouseControlsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewMultiplayerMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewSettingsMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/NewSingleplayerMenu.layout (copied) * code/branches/presentation2/data/gui/layouts/QuestGUI.layout (modified) * code/branches/presentation2/data/gui/scripts/DecisionPopup.lua (copied) * code/branches/presentation2/data/gui/scripts/GUITools.lua (copied) * code/branches/presentation2/data/gui/scripts/InGameMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) * code/branches/presentation2/data/gui/scripts/MainMenu.lua (modified) * code/branches/presentation2/data/gui/scripts/NewAudioMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewControlsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewCreditsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewGameplayMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewGraphicsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewMainMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewMouseControlsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewMultiplayerMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewSettingsMenu.lua (copied) * code/branches/presentation2/data/gui/scripts/NewSingleplayerMenu.lua (copied) * code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation2/src/libraries/core/GUIManager.h (modified) * code/branches/presentation2/src/libraries/core/Game.cc (modified) * code/branches/presentation2/src/libraries/core/Game.h (modified) * code/branches/presentation2/src/libraries/core/GameState.cc (modified) * code/branches/presentation2/src/libraries/core/LuaState.cc (modified) * code/branches/presentation2/src/libraries/core/LuaState.h (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.h (modified) * code/branches/presentation2/src/modules/overlays/GUIOverlay.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/presentation2/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/presentation2/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/presentation2/src/orxonox/pickup/PickupSpawner.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h (modified) merged menu branch to presentation2 branch with some additional fixes ... Tue, 24 Nov 2009 01:17:38 GMT landauf [6135] * code/branches/presentation2/src/libraries/util/DisplayStringConversions.h (moved) * code/branches/presentation2/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/ChatOverlay.h (modified) * code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc (modified) replaced UTFStringConversions.h by DisplayStringConversions.h which ... Sun, 22 Nov 2009 15:25:02 GMT rgrieder [6120] * code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake (modified) * code/branches/presentation2/cmake/SourceFileUtilities.cmake (modified) * code/branches/presentation2/data/overlays/stats.oxo (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) Found some tabs Sun, 22 Nov 2009 15:10:06 GMT rgrieder [6119] * code/branches/presentation2/bin/dedicatedClient.bat.in (modified) * code/branches/presentation2/bin/dedicatedClient.in (modified) * code/branches/presentation2/data/levels/events.oxw (modified) * code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi (modified) * code/branches/presentation2/data/levels/questsystem2.oxw (modified) * code/branches/presentation2/data/levels/sound.oxw (modified) * code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt (modified) * code/branches/presentation2/data/levels/test_ghost.oxw (modified) * code/branches/presentation2/data/particle/bigexplosion.particle (modified) * code/branches/presentation2/data/particle/explosion4.particle (modified) * code/branches/presentation2/data/particle/laser.particle (modified) * code/branches/presentation2/data/particle/load.particle (modified) * code/branches/presentation2/data/particle/particlecanon.particle (modified) * code/branches/presentation2/data/particle/rocketfire.particle (modified) * code/branches/presentation2/data/particle/smoke.particle (modified) * code/branches/presentation2/data/particle/tes3.particle (modified) * code/branches/presentation2/doc/api/main.dox (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified) * code/branches/presentation2/src/orxonox/MoodManager.cc (modified) * code/branches/presentation2/src/orxonox/MoodManager.h (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) svn:eol-style "native" should be set for all text files. Sat, 21 Nov 2009 11:11:25 GMT scheusso [6115] * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified) mouselook now also working when steering a rocket Fri, 20 Nov 2009 19:15:25 GMT scheusso [6108] * code/branches/presentation2 (modified) * code/branches/presentation2/data/defaultConfig/keybindings.ini (modified) * code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/presentation2/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/presentation2/src/orxonox/controllers/Controller.cc (modified) * code/branches/presentation2/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation2/src/orxonox/controllers/HumanController.cc (modified) * code/branches/presentation2/src/orxonox/controllers/HumanController.h (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (copied) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (copied) * code/branches/presentation2/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation2/src/orxonox/graphics/Camera.h (modified) * code/branches/presentation2/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation2/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/WorldEntity.h (modified) merged steering branch to presentation2 branch Fri, 20 Nov 2009 16:20:11 GMT rgrieder [6107] * code/branches/presentation2 (modified) * code/branches/presentation2/data/levels/empty_level.oxw (modified) * code/branches/presentation2/data/levels/includes/weaponsettings3.oxi (modified) * code/branches/presentation2/data/particle/explosion4.particle (copied) * code/branches/presentation2/data/particle/laser.particle (copied) * code/branches/presentation2/data/particle/load.particle (copied) * code/branches/presentation2/data/particle/particlecanon.particle (copied) * code/branches/presentation2/data/particle/rocketfire.particle (copied) * code/branches/presentation2/data/particle/smoke.particle (copied) * code/branches/presentation2/data/particle/tes3.particle (copied) * code/branches/presentation2/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (copied) * code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (copied) * code/branches/presentation2/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (copied) * code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.h (copied) * code/branches/presentation2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/presentation2/src/orxonox/Scene.cc (modified) * code/branches/presentation2/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation2/src/orxonox/infos/PlayerInfo.h (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponPack.h (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/presentation2/src/orxonox/weaponsystem/WeaponSystem.h (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/branches/presentation2/src/orxonox/worldentities/pawns/Spectator.h (modified) Merged particles2 branch to presentation2. Fri, 20 Nov 2009 16:13:48 GMT rgrieder [6106] * code/branches/presentation2 (copied) Created merger branch for the HS09 presentation. Fri, 13 Nov 2009 10:12:31 GMT scheusso [6054] * code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.h (modified) trying to solve a double free bug (replaced OrxonoxOverlay pointers ...