# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 11, 2024, 3:18:08 PM Wed, 14 Oct 2009 14:36:56 GMT dafrick [5953] * code/branches/pickup2 (modified) * code/branches/pickup2/src/orxonox/pickup/DroppedItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/DroppedItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/PickupSpawner.cc (modified) * code/branches/pickup2/src/orxonox/pickup/PickupSpawner.h (modified) Made DroppedItem inherit from PickupSpawner. Also minor changes in ... Wed, 14 Oct 2009 12:50:04 GMT cmueri [5952] * code/branches/menu (modified) * code/branches/menu/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/branches/menu/data/gui/schemes/TaharezLookWidgetAliases.scheme (modified) reapplying changes made to trunk (5951) Wed, 14 Oct 2009 12:41:28 GMT cmueri [5951] * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (modified) some adjustments in order to be able to use the CELayoutEditor Wed, 14 Oct 2009 12:31:53 GMT cmueri [5950] * data/trunk/gui/imagesets/main_menu_1.jpg (moved) moved main_menu_1.jpg into gui/imagesets because it belongs to the gui Wed, 14 Oct 2009 12:12:06 GMT rgrieder [5949] * data/branches/png/materials/scripts/OrxonoxSky.material (modified) Removed warning (unsupported parameter). Wed, 14 Oct 2009 11:53:59 GMT rgrieder [5948] * code/branches/steering (copied) Creating branch to work on pawn steering. Wed, 14 Oct 2009 11:44:19 GMT rgrieder [5947] * code/branches/pickup2/src/orxonox/pickup/BaseItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/BaseItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/DroppedItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/DroppedItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/EquipmentItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/EquipmentItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/ModifierPickup.cc (modified) * code/branches/pickup2/src/orxonox/pickup/ModifierPickup.h (modified) * code/branches/pickup2/src/orxonox/pickup/ModifierType.h (modified) * code/branches/pickup2/src/orxonox/pickup/PassiveItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/PassiveItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/PickupCollection.h (modified) * code/branches/pickup2/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/pickup2/src/orxonox/pickup/PickupInventory.h (modified) * code/branches/pickup2/src/orxonox/pickup/PickupSpawner.cc (modified) * code/branches/pickup2/src/orxonox/pickup/PickupSpawner.h (modified) * code/branches/pickup2/src/orxonox/pickup/UsableItem.cc (modified) * code/branches/pickup2/src/orxonox/pickup/UsableItem.h (modified) * code/branches/pickup2/src/orxonox/pickup/items/HealthImmediate.cc (modified) * code/branches/pickup2/src/orxonox/pickup/items/HealthImmediate.h (modified) * code/branches/pickup2/src/orxonox/pickup/items/HealthUsable.cc (modified) * code/branches/pickup2/src/orxonox/pickup/items/Jump.h (modified) Merged pickup branch revisions to pickup2. Wed, 14 Oct 2009 11:17:34 GMT rgrieder [5946] * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) Reapplying erwin's changes from r5939. Wed, 14 Oct 2009 11:14:32 GMT rgrieder [5945] * code/branches/console (copied) Recreating console branch. Wed, 14 Oct 2009 11:14:15 GMT rgrieder [5944] * code/branches/menu (copied) Recreating menu branch. Wed, 14 Oct 2009 11:13:41 GMT rgrieder [5943] * code/branches/sound3 (copied) Recreating sound3 branch. Wed, 14 Oct 2009 10:58:56 GMT dafrick [5942] * code/branches/pickup2 (copied) New pickup branch. Wed, 14 Oct 2009 10:51:55 GMT rgrieder [5941] * code/branches/console (deleted) * code/branches/menu (deleted) * code/branches/sound3 (deleted) Deleted recently created branches again (no compile on tardis) Wed, 14 Oct 2009 09:33:13 GMT rgrieder [5940] * code/trunk/src/libraries/core/MemoryArchive.cc (modified) Fixed boost v1.36 build. Tue, 13 Oct 2009 22:40:13 GMT erwin [5939] * code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) * code/branches/sound3/src/orxonox/sound/SoundManager.cc (modified) Prefixed all debug output of the soundsubsytem with 'Sound:', makes ... Tue, 13 Oct 2009 20:17:01 GMT dafrick [5938] * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) Some more updated documentation, this time in QuestEffectBeacon. Tue, 13 Oct 2009 19:52:52 GMT dafrick [5937] * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) Also a very minor update for DistanceTriggger. Tue, 13 Oct 2009 19:49:54 GMT dafrick [5936] * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) Updated documentation in PlayerTrigger. Tue, 13 Oct 2009 15:05:17 GMT dafrick [5935] * code/branches/pickup (modified) * code/branches/pickup/bin/CMakeLists.txt (modified) * code/branches/pickup/bin/dedicatedClient.bat.in (copied) * code/branches/pickup/bin/dedicatedClient.in (copied) * code/branches/pickup/bin/vld.ini.in (modified) * code/branches/pickup/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/pickup/cmake/PackageConfig.cmake (modified) * code/branches/pickup/cmake/ParseMacroArguments.cmake (modified) * code/branches/pickup/cmake/PrecompiledHeaderFiles.cmake (modified) * code/branches/pickup/cmake/SourceFileUtilities.cmake (modified) * code/branches/pickup/cmake/TargetUtilities.cmake (modified) * code/branches/pickup/data/defaultConfig/keybindings.ini (modified) * code/branches/pickup/data/defaultConfig/masterKeybindings.ini (deleted) * code/branches/pickup/data/levels/events.oxw (copied) * code/branches/pickup/data/levels/old/physicstest2.oxw (modified) * code/branches/pickup/data/levels/old/princessaeryn.oxw (modified) * code/branches/pickup/data/levels/old/sample4.oxw (modified) * code/branches/pickup/data/levels/presentation.oxw (modified) * code/branches/pickup/data/levels/presentation09b.oxw (modified) * code/branches/pickup/data/levels/presentation_pong.oxw (modified) * code/branches/pickup/data/levels/princessaeryn.oxw (modified) * code/branches/pickup/data/particle/ExplosionComp1.particle (modified) * code/branches/pickup/data/particle/sparks2.particle (copied) * code/branches/pickup/src/Orxonox.cc (modified) * code/branches/pickup/src/OrxonoxConfig.cmake (modified) * code/branches/pickup/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/branches/pickup/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/branches/pickup/src/external/bullet/BulletPrecompiledHeaders.h (deleted) * code/branches/pickup/src/external/bullet/CMakeLists.txt (modified) * code/branches/pickup/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/branches/pickup/src/external/ceguilua/CMakeLists.txt (modified) * code/branches/pickup/src/external/cpptcl/CMakeLists.txt (modified) * code/branches/pickup/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/changes_orxonox.diff (modified) * code/branches/pickup/src/external/ois/linux/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/mac/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/win32/CMakeLists.txt (modified) * code/branches/pickup/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/branches/pickup/src/external/tinyxml/CMakeLists.txt (modified) * code/branches/pickup/src/external/tolua/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/core/ArgumentCompletionFunctions.cc (modified) * code/branches/pickup/src/libraries/core/BaseObject.cc (modified) * code/branches/pickup/src/libraries/core/BaseObject.h (modified) * code/branches/pickup/src/libraries/core/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/core/ClassFactory.h (modified) * code/branches/pickup/src/libraries/core/ClassTreeMask.cc (modified) * code/branches/pickup/src/libraries/core/ClassTreeMask.h (modified) * code/branches/pickup/src/libraries/core/Clock.cc (deleted) * code/branches/pickup/src/libraries/core/Clock.h (deleted) * code/branches/pickup/src/libraries/core/CommandExecutor.cc (modified) * code/branches/pickup/src/libraries/core/CommandLine.cc (modified) * code/branches/pickup/src/libraries/core/ConfigFileManager.cc (modified) * code/branches/pickup/src/libraries/core/Core.cc (modified) * code/branches/pickup/src/libraries/core/Core.h (modified) * code/branches/pickup/src/libraries/core/CoreIncludes.h (modified) * code/branches/pickup/src/libraries/core/CorePrereqs.h (modified) * code/branches/pickup/src/libraries/core/Event.cc (modified) * code/branches/pickup/src/libraries/core/Event.h (modified) * code/branches/pickup/src/libraries/core/EventIncludes.h (modified) * code/branches/pickup/src/libraries/core/Factory.cc (deleted) * code/branches/pickup/src/libraries/core/Factory.h (deleted) * code/branches/pickup/src/libraries/core/Functor.h (modified) * code/branches/pickup/src/libraries/core/GUIManager.cc (modified) * code/branches/pickup/src/libraries/core/GUIManager.h (modified) * code/branches/pickup/src/libraries/core/Game.cc (modified) * code/branches/pickup/src/libraries/core/Game.h (modified) * code/branches/pickup/src/libraries/core/GameMode.cc (modified) * code/branches/pickup/src/libraries/core/GameMode.h (modified) * code/branches/pickup/src/libraries/core/GameState.h (modified) * code/branches/pickup/src/libraries/core/GraphicsManager.cc (modified) * code/branches/pickup/src/libraries/core/GraphicsManager.h (modified) * code/branches/pickup/src/libraries/core/Identifier.cc (modified) * code/branches/pickup/src/libraries/core/Identifier.h (modified) * code/branches/pickup/src/libraries/core/Iterator.h (modified) * code/branches/pickup/src/libraries/core/Language.cc (modified) * code/branches/pickup/src/libraries/core/Loader.cc (modified) * code/branches/pickup/src/libraries/core/LuaState.cc (modified) * code/branches/pickup/src/libraries/core/MemoryArchive.cc (modified) * code/branches/pickup/src/libraries/core/ObjectListIterator.h (modified) * code/branches/pickup/src/libraries/core/OrxonoxClass.cc (modified) * code/branches/pickup/src/libraries/core/OrxonoxClass.h (modified) * code/branches/pickup/src/libraries/core/PathConfig.cc (copied) * code/branches/pickup/src/libraries/core/PathConfig.h (copied) * code/branches/pickup/src/libraries/core/Resource.h (modified) * code/branches/pickup/src/libraries/core/ScopedSingletonManager.cc (copied) * code/branches/pickup/src/libraries/core/ScopedSingletonManager.h (copied) * code/branches/pickup/src/libraries/core/Shell.cc (modified) * code/branches/pickup/src/libraries/core/SmartPtr.h (copied) * code/branches/pickup/src/libraries/core/SubclassIdentifier.h (copied) * code/branches/pickup/src/libraries/core/Super.h (modified) * code/branches/pickup/src/libraries/core/TclBind.cc (modified) * code/branches/pickup/src/libraries/core/TclThreadManager.cc (modified) * code/branches/pickup/src/libraries/core/WeakPtr.h (copied) * code/branches/pickup/src/libraries/core/XMLPort.h (modified) * code/branches/pickup/src/libraries/core/input/Button.cc (modified) * code/branches/pickup/src/libraries/core/input/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/core/input/InputDevice.h (modified) * code/branches/pickup/src/libraries/core/input/InputManager.cc (modified) * code/branches/pickup/src/libraries/core/input/InputManager.h (modified) * code/branches/pickup/src/libraries/core/input/InputState.cc (modified) * code/branches/pickup/src/libraries/core/input/InputState.h (modified) * code/branches/pickup/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/pickup/src/libraries/core/input/KeyBinder.h (modified) * code/branches/pickup/src/libraries/core/input/KeyBinderManager.cc (copied) * code/branches/pickup/src/libraries/core/input/KeyBinderManager.h (copied) * code/branches/pickup/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/pickup/src/libraries/core/input/KeyDetector.h (modified) * code/branches/pickup/src/libraries/core/input/Mouse.cc (modified) * code/branches/pickup/src/libraries/network/Client.cc (modified) * code/branches/pickup/src/libraries/network/Client.h (modified) * code/branches/pickup/src/libraries/network/ClientConnection.cc (modified) * code/branches/pickup/src/libraries/network/ClientConnection.h (modified) * code/branches/pickup/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/pickup/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/pickup/src/libraries/network/Connection.cc (modified) * code/branches/pickup/src/libraries/network/Connection.h (modified) * code/branches/pickup/src/libraries/network/GamestateClient.cc (modified) * code/branches/pickup/src/libraries/network/GamestateManager.cc (modified) * code/branches/pickup/src/libraries/network/NetworkFunction.cc (modified) * code/branches/pickup/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/pickup/src/libraries/network/Server.cc (modified) * code/branches/pickup/src/libraries/network/Server.h (modified) * code/branches/pickup/src/libraries/network/ServerConnection.cc (modified) * code/branches/pickup/src/libraries/network/ServerConnection.h (modified) * code/branches/pickup/src/libraries/network/packet/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/network/packet/ClassID.cc (modified) * code/branches/pickup/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/pickup/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/pickup/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/pickup/src/libraries/tools/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/tools/ResourceLocation.cc (modified) * code/branches/pickup/src/libraries/tools/Timer.cc (modified) * code/branches/pickup/src/libraries/tools/Timer.h (modified) * code/branches/pickup/src/libraries/tools/ToolsPrecompiledHeaders.h (deleted) * code/branches/pickup/src/libraries/tools/ToolsPrereqs.h (modified) * code/branches/pickup/src/libraries/util/CMakeLists.txt (modified) * code/branches/pickup/src/libraries/util/Clock.cc (copied) * code/branches/pickup/src/libraries/util/Clock.h (copied) * code/branches/pickup/src/libraries/util/Scope.h (modified) * code/branches/pickup/src/libraries/util/ScopedSingleton.h (deleted) * code/branches/pickup/src/libraries/util/Singleton.h (modified) * code/branches/pickup/src/libraries/util/UtilPrereqs.h (modified) * code/branches/pickup/src/modules/CMakeLists.txt (modified) * code/branches/pickup/src/modules/gamestates (deleted) * code/branches/pickup/src/modules/objects/Attacher.cc (modified) * code/branches/pickup/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/pickup/src/modules/objects/Planet.cc (modified) * code/branches/pickup/src/modules/objects/eventsystem/CMakeLists.txt (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventDispatcher.h (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventFilter.cc (copied) * code/branches/pickup/src/modules/objects/eventsystem/EventFilter.h (copied) * code/branches/pickup/src/modules/objects/eventsystem/EventListener.cc (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventListener.h (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventName.cc (copied) * code/branches/pickup/src/modules/objects/eventsystem/EventName.h (copied) * code/branches/pickup/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/pickup/src/modules/objects/eventsystem/EventTarget.h (modified) * code/branches/pickup/src/modules/objects/triggers/CheckPoint.cc (modified) * code/branches/pickup/src/modules/objects/triggers/EventTrigger.cc (modified) * code/branches/pickup/src/modules/objects/triggers/EventTrigger.h (modified) * code/branches/pickup/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/pickup/src/modules/overlays/FadeoutText.cc (modified) * code/branches/pickup/src/modules/overlays/FadeoutText.h (modified) * code/branches/pickup/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/pickup/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/pickup/src/modules/overlays/hud/ChatOverlay.h (modified) * code/branches/pickup/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/pickup/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/branches/pickup/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/branches/pickup/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/pickup/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/branches/pickup/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/branches/pickup/src/modules/overlays/hud/UnderAttackHealthBar.h (modified) * code/branches/pickup/src/modules/overlays/stats/CreateLines.cc (modified) * code/branches/pickup/src/modules/overlays/stats/Scoreboard.cc (modified) * code/branches/pickup/src/modules/overlays/stats/Scoreboard.h (modified) * code/branches/pickup/src/modules/pong/CMakeLists.txt (modified) * code/branches/pickup/src/modules/pong/Pong.cc (modified) * code/branches/pickup/src/modules/pong/Pong.h (modified) * code/branches/pickup/src/modules/pong/PongAI.cc (modified) * code/branches/pickup/src/modules/pong/PongAI.h (modified) * code/branches/pickup/src/modules/pong/PongBall.cc (modified) * code/branches/pickup/src/modules/pong/PongBall.h (modified) * code/branches/pickup/src/modules/pong/PongCenterpoint.cc (modified) * code/branches/pickup/src/modules/pong/PongCenterpoint.h (modified) * code/branches/pickup/src/modules/pong/PongPrecompiledHeaders.h (deleted) * code/branches/pickup/src/modules/pong/PongPrereqs.h (modified) * code/branches/pickup/src/modules/pong/PongScore.cc (modified) * code/branches/pickup/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/pickup/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/branches/pickup/src/modules/questsystem/QuestGUI.cc (modified) * code/branches/pickup/src/modules/questsystem/QuestManager.cc (modified) * code/branches/pickup/src/modules/questsystem/QuestManager.h (modified) * code/branches/pickup/src/modules/questsystem/QuestsystemPrecompiledHeaders.h (modified) * code/branches/pickup/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/branches/pickup/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/pickup/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/branches/pickup/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/branches/pickup/src/modules/weapons/MuzzleFlash.cc (modified) * code/branches/pickup/src/modules/weapons/MuzzleFlash.h (modified) * code/branches/pickup/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/pickup/src/modules/weapons/munitions/ReplenishingMunition.cc (modified) * code/branches/pickup/src/modules/weapons/munitions/ReplenishingMunition.h (modified) * code/branches/pickup/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/branches/pickup/src/modules/weapons/projectiles/LightningGunProjectile.h (modified) * code/branches/pickup/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/branches/pickup/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/pickup/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/pickup/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/pickup/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/branches/pickup/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/pickup/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/branches/pickup/src/orxonox/CMakeLists.txt (modified) * code/branches/pickup/src/orxonox/CameraManager.cc (modified) * code/branches/pickup/src/orxonox/CameraManager.h (modified) * code/branches/pickup/src/orxonox/Level.cc (modified) * code/branches/pickup/src/orxonox/Level.h (modified) * code/branches/pickup/src/orxonox/LevelManager.cc (modified) * code/branches/pickup/src/orxonox/Main.cc (modified) * code/branches/pickup/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/pickup/src/orxonox/PawnManager.cc (modified) * code/branches/pickup/src/orxonox/PlayerManager.cc (modified) * code/branches/pickup/src/orxonox/PlayerManager.h (modified) * code/branches/pickup/src/orxonox/Radar.cc (modified) * code/branches/pickup/src/orxonox/Radar.h (modified) * code/branches/pickup/src/orxonox/Scene.cc (modified) * code/branches/pickup/src/orxonox/Scene.h (modified) * code/branches/pickup/src/orxonox/Test.cc (modified) * code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/branches/pickup/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/branches/pickup/src/orxonox/controllers/AIController.cc (modified) * code/branches/pickup/src/orxonox/controllers/AIController.h (modified) * code/branches/pickup/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/pickup/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/pickup/src/orxonox/controllers/HumanController.cc (modified) * code/branches/pickup/src/orxonox/controllers/HumanController.h (modified) * code/branches/pickup/src/orxonox/controllers/WaypointController.cc (modified) * code/branches/pickup/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/branches/pickup/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/branches/pickup/src/orxonox/gamestates (copied) * code/branches/pickup/src/orxonox/gamestates/CMakeLists.txt (copied) * code/branches/pickup/src/orxonox/gamestates/GSClient.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSClient.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSDedicated.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSDedicated.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSDedicatedClient.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSDedicatedClient.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSGraphics.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSGraphics.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSIOConsole.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSIOConsole.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSLevel.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSLevel.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSMainMenu.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSMainMenu.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSRoot.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSRoot.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSServer.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSServer.h (copied) * code/branches/pickup/src/orxonox/gamestates/GSStandalone.cc (copied) * code/branches/pickup/src/orxonox/gamestates/GSStandalone.h (copied) * code/branches/pickup/src/orxonox/gametypes/Asteroids.cc (modified) * code/branches/pickup/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/pickup/src/orxonox/gametypes/Gametype.h (modified) * code/branches/pickup/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/pickup/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/branches/pickup/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/branches/pickup/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/pickup/src/orxonox/gametypes/UnderAttack.h (modified) * code/branches/pickup/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/pickup/src/orxonox/graphics/Camera.cc (modified) * code/branches/pickup/src/orxonox/graphics/FadingBillboard.cc (modified) * code/branches/pickup/src/orxonox/graphics/FadingBillboard.h (modified) * code/branches/pickup/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/branches/pickup/src/orxonox/graphics/ParticleSpawner.cc (modified) * code/branches/pickup/src/orxonox/graphics/ParticleSpawner.h (modified) * code/branches/pickup/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/pickup/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/pickup/src/orxonox/infos/PlayerInfo.h (modified) * code/branches/pickup/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/pickup/src/orxonox/interfaces/NotificationListener.h (modified) * code/branches/pickup/src/orxonox/interfaces/PawnListener.h (deleted) * code/branches/pickup/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/pickup/src/orxonox/items/Engine.cc (modified) * code/branches/pickup/src/orxonox/items/Engine.h (modified) * code/branches/pickup/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/pickup/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/pickup/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/pickup/src/orxonox/overlays/InGameConsole.h (modified) * code/branches/pickup/src/orxonox/overlays/Map.cc (modified) * code/branches/pickup/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/pickup/src/orxonox/overlays/OverlayGroup.cc (modified) * code/branches/pickup/src/orxonox/pickup/DroppedItem.cc (modified) * code/branches/pickup/src/orxonox/pickup/DroppedItem.h (modified) * code/branches/pickup/src/orxonox/pickup/ModifierPickup.cc (modified) * code/branches/pickup/src/orxonox/pickup/ModifierPickup.h (modified) * code/branches/pickup/src/orxonox/pickup/PickupSpawner.cc (modified) * code/branches/pickup/src/orxonox/pickup/PickupSpawner.h (modified) * code/branches/pickup/src/orxonox/pickup/items/HealthImmediate.cc (modified) * code/branches/pickup/src/orxonox/pickup/items/HealthUsable.cc (modified) * code/branches/pickup/src/orxonox/pickup/items/Jump.cc (modified) * code/branches/pickup/src/orxonox/sound/AmbientSound.cc (copied) * code/branches/pickup/src/orxonox/sound/AmbientSound.h (copied) * code/branches/pickup/src/orxonox/sound/BaseSound.cc (copied) * code/branches/pickup/src/orxonox/sound/BaseSound.h (copied) * code/branches/pickup/src/orxonox/sound/CMakeLists.txt (modified) * code/branches/pickup/src/orxonox/sound/SoundBase.cc (deleted) * code/branches/pickup/src/orxonox/sound/SoundBase.h (deleted) * code/branches/pickup/src/orxonox/sound/SoundMainMenu.cc (deleted) * code/branches/pickup/src/orxonox/sound/SoundMainMenu.h (deleted) * code/branches/pickup/src/orxonox/sound/SoundManager.cc (modified) * code/branches/pickup/src/orxonox/sound/SoundManager.h (modified) * code/branches/pickup/src/orxonox/sound/WorldSound.cc (copied) * code/branches/pickup/src/orxonox/sound/WorldSound.h (copied) * code/branches/pickup/src/orxonox/weaponsystem/Munition.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/Munition.h (modified) * code/branches/pickup/src/orxonox/weaponsystem/Weapon.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/Weapon.h (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/branches/pickup/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/branches/pickup/src/orxonox/worldentities/BigExplosion.cc (modified) * code/branches/pickup/src/orxonox/worldentities/BigExplosion.h (modified) * code/branches/pickup/src/orxonox/worldentities/CameraPosition.cc (modified) * code/branches/pickup/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/pickup/src/orxonox/worldentities/ControllableEntity.h (modified) * code/branches/pickup/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/branches/pickup/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/branches/pickup/src/orxonox/worldentities/MovableEntity.cc (modified) * code/branches/pickup/src/orxonox/worldentities/MovableEntity.h (modified) * code/branches/pickup/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/branches/pickup/src/orxonox/worldentities/SpawnPoint.h (modified) * code/branches/pickup/src/orxonox/worldentities/WorldEntity.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/Destroyer.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/branches/pickup/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) Hopefully merged trunk successfully into pickup branch. Tue, 13 Oct 2009 07:57:20 GMT rgrieder [5934] * code/branches/console (copied) Creating branch to work on a always active IO-based console. Tue, 13 Oct 2009 07:56:27 GMT rgrieder [5933] * code/branches/menu (copied) Creating branch for an game-paused menu. Tue, 13 Oct 2009 07:55:38 GMT rgrieder [5932] * code/branches/sound2 (deleted) Deleting branch again (emails just arrived...) Tue, 13 Oct 2009 07:54:51 GMT rgrieder [5931] * code/branches/sound2 (copied) Creating branch for working on sounds. Mon, 12 Oct 2009 22:09:37 GMT landauf [5930] * code/branches/sound3 (copied) created new sound branch Mon, 12 Oct 2009 18:20:07 GMT rgrieder [5929] * code/trunk (modified) * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/dedicatedClient.bat.in (copied) * code/trunk/bin/dedicatedClient.in (copied) * code/trunk/bin/vld.ini.in (modified) * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/ParseMacroArguments.cmake (modified) * code/trunk/cmake/PrecompiledHeaderFiles.cmake (modified) * code/trunk/cmake/SourceFileUtilities.cmake (modified) * code/trunk/cmake/TargetUtilities.cmake (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/defaultConfig/masterKeybindings.ini (deleted) * code/trunk/data/levels/events.oxw (copied) * code/trunk/data/levels/old/physicstest2.oxw (modified) * code/trunk/data/levels/old/princessaeryn.oxw (modified) * code/trunk/data/levels/old/sample4.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentation_pong.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/particle/ExplosionComp1.particle (modified) * code/trunk/data/particle/sparks2.particle (copied) * code/trunk/src/Orxonox.cc (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletPrecompiledHeaders.h (deleted) * code/trunk/src/external/bullet/CMakeLists.txt (modified) * code/trunk/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/trunk/src/external/ceguilua/CMakeLists.txt (modified) * code/trunk/src/external/cpptcl/CMakeLists.txt (modified) * code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/trunk/src/external/ois/CMakeLists.txt (modified) * code/trunk/src/external/ois/changes_orxonox.diff (modified) * code/trunk/src/external/ois/linux/CMakeLists.txt (modified) * code/trunk/src/external/ois/mac/CMakeLists.txt (modified) * code/trunk/src/external/ois/win32/CMakeLists.txt (modified) * code/trunk/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/trunk/src/external/tinyxml/CMakeLists.txt (modified) * code/trunk/src/external/tolua/CMakeLists.txt (modified) * code/trunk/src/libraries/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ArgumentCompletionFunctions.cc (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/BaseObject.h (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/ClassFactory.h (modified) * code/trunk/src/libraries/core/ClassTreeMask.cc (modified) * code/trunk/src/libraries/core/ClassTreeMask.h (modified) * code/trunk/src/libraries/core/Clock.cc (deleted) * code/trunk/src/libraries/core/Clock.h (deleted) * code/trunk/src/libraries/core/CommandExecutor.cc (modified) * code/trunk/src/libraries/core/CommandLine.cc (modified) * code/trunk/src/libraries/core/ConfigFileManager.cc (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/Event.cc (modified) * code/trunk/src/libraries/core/Event.h (modified) * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/libraries/core/Factory.cc (deleted) * code/trunk/src/libraries/core/Factory.h (deleted) * code/trunk/src/libraries/core/Functor.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/Game.h (modified) * code/trunk/src/libraries/core/GameMode.cc (modified) * code/trunk/src/libraries/core/GameMode.h (modified) * code/trunk/src/libraries/core/GameState.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.cc (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Iterator.h (modified) * code/trunk/src/libraries/core/Language.cc (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/MemoryArchive.cc (modified) * code/trunk/src/libraries/core/ObjectListIterator.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (copied) * code/trunk/src/libraries/core/PathConfig.h (copied) * code/trunk/src/libraries/core/Resource.h (modified) * code/trunk/src/libraries/core/ScopedSingletonManager.cc (copied) * code/trunk/src/libraries/core/ScopedSingletonManager.h (copied) * code/trunk/src/libraries/core/Shell.cc (modified) * code/trunk/src/libraries/core/SmartPtr.h (copied) * code/trunk/src/libraries/core/SubclassIdentifier.h (copied) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/TclBind.cc (modified) * code/trunk/src/libraries/core/TclThreadManager.cc (modified) * code/trunk/src/libraries/core/WeakPtr.h (copied) * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/CMakeLists.txt (modified) * code/trunk/src/libraries/core/input/InputDevice.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/InputState.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.cc (copied) * code/trunk/src/libraries/core/input/KeyBinderManager.h (copied) * code/trunk/src/libraries/core/input/KeyDetector.cc (modified) * code/trunk/src/libraries/core/input/KeyDetector.h (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientConnectionListener.cc (modified) * code/trunk/src/libraries/network/ClientConnectionListener.h (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/NetworkFunction.cc (modified) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/ServerConnection.h (modified) * code/trunk/src/libraries/network/packet/CMakeLists.txt (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/tools/ToolsPrecompiledHeaders.h (deleted) * code/trunk/src/libraries/tools/ToolsPrereqs.h (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Clock.cc (copied) * code/trunk/src/libraries/util/Clock.h (copied) * code/trunk/src/libraries/util/Scope.h (modified) * code/trunk/src/libraries/util/ScopedSingleton.h (deleted) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/gamestates (deleted) * code/trunk/src/modules/objects/Attacher.cc (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Planet.cc (modified) * code/trunk/src/modules/objects/eventsystem/CMakeLists.txt (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.h (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (copied) * code/trunk/src/modules/objects/eventsystem/EventFilter.h (copied) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.h (modified) * code/trunk/src/modules/objects/eventsystem/EventName.cc (copied) * code/trunk/src/modules/objects/eventsystem/EventName.h (copied) * code/trunk/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/overlays/FadeoutText.cc (modified) * code/trunk/src/modules/overlays/FadeoutText.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/trunk/src/modules/overlays/hud/ChatOverlay.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDHealthBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (modified) * code/trunk/src/modules/overlays/stats/CreateLines.cc (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.cc (modified) * code/trunk/src/modules/overlays/stats/Scoreboard.h (modified) * code/trunk/src/modules/pong/CMakeLists.txt (modified) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/pong/PongAI.h (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) * code/trunk/src/modules/pong/PongCenterpoint.cc (modified) * code/trunk/src/modules/pong/PongCenterpoint.h (modified) * code/trunk/src/modules/pong/PongPrecompiledHeaders.h (deleted) * code/trunk/src/modules/pong/PongPrereqs.h (modified) * code/trunk/src/modules/pong/PongScore.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/trunk/src/modules/questsystem/QuestGUI.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/QuestsystemPrecompiledHeaders.h (modified) * code/trunk/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/weapons/MuzzleFlash.cc (modified) * code/trunk/src/modules/weapons/MuzzleFlash.h (modified) * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.h (modified) * code/trunk/src/modules/weapons/projectiles/ParticleProjectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/Level.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/PawnManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.cc (modified) * code/trunk/src/orxonox/PlayerManager.h (modified) * code/trunk/src/orxonox/Radar.cc (modified) * code/trunk/src/orxonox/Radar.h (modified) * code/trunk/src/orxonox/Scene.cc (modified) * code/trunk/src/orxonox/Scene.h (modified) * code/trunk/src/orxonox/Test.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/controllers/WaypointController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.cc (modified) * code/trunk/src/orxonox/controllers/WaypointPatrolController.h (modified) * code/trunk/src/orxonox/gamestates (copied) * code/trunk/src/orxonox/gamestates/CMakeLists.txt (copied) * code/trunk/src/orxonox/gamestates/GSClient.cc (copied) * code/trunk/src/orxonox/gamestates/GSClient.h (copied) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (copied) * code/trunk/src/orxonox/gamestates/GSDedicated.h (copied) * code/trunk/src/orxonox/gamestates/GSDedicatedClient.cc (copied) * code/trunk/src/orxonox/gamestates/GSDedicatedClient.h (copied) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (copied) * code/trunk/src/orxonox/gamestates/GSGraphics.h (copied) * code/trunk/src/orxonox/gamestates/GSIOConsole.cc (copied) * code/trunk/src/orxonox/gamestates/GSIOConsole.h (copied) * code/trunk/src/orxonox/gamestates/GSLevel.cc (copied) * code/trunk/src/orxonox/gamestates/GSLevel.h (copied) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (copied) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (copied) * code/trunk/src/orxonox/gamestates/GSRoot.cc (copied) * code/trunk/src/orxonox/gamestates/GSRoot.h (copied) * code/trunk/src/orxonox/gamestates/GSServer.cc (copied) * code/trunk/src/orxonox/gamestates/GSServer.h (copied) * code/trunk/src/orxonox/gamestates/GSStandalone.cc (copied) * code/trunk/src/orxonox/gamestates/GSStandalone.h (copied) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/trunk/src/orxonox/gametypes/TeamBaseMatch.h (modified) * code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.cc (modified) * code/trunk/src/orxonox/gametypes/UnderAttack.h (modified) * code/trunk/src/orxonox/graphics/CMakeLists.txt (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.cc (modified) * code/trunk/src/orxonox/graphics/FadingBillboard.h (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.cc (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.cc (modified) * code/trunk/src/orxonox/graphics/ParticleSpawner.h (modified) * code/trunk/src/orxonox/infos/HumanPlayer.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PawnListener.h (deleted) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/overlays/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.h (modified) * code/trunk/src/orxonox/overlays/Map.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/overlays/OverlayGroup.cc (modified) * code/trunk/src/orxonox/pickup/DroppedItem.cc (modified) * code/trunk/src/orxonox/pickup/DroppedItem.h (modified) * code/trunk/src/orxonox/pickup/ModifierPickup.cc (modified) * code/trunk/src/orxonox/pickup/ModifierPickup.h (modified) * code/trunk/src/orxonox/pickup/PickupSpawner.cc (modified) * code/trunk/src/orxonox/pickup/PickupSpawner.h (modified) * code/trunk/src/orxonox/pickup/items/HealthImmediate.cc (modified) * code/trunk/src/orxonox/pickup/items/HealthUsable.cc (modified) * code/trunk/src/orxonox/pickup/items/Jump.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (copied) * code/trunk/src/orxonox/sound/AmbientSound.h (copied) * code/trunk/src/orxonox/sound/BaseSound.cc (copied) * code/trunk/src/orxonox/sound/BaseSound.h (copied) * code/trunk/src/orxonox/sound/CMakeLists.txt (modified) * code/trunk/src/orxonox/sound/SoundBase.cc (deleted) * code/trunk/src/orxonox/sound/SoundBase.h (deleted) * code/trunk/src/orxonox/sound/SoundMainMenu.cc (deleted) * code/trunk/src/orxonox/sound/SoundMainMenu.h (deleted) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) * code/trunk/src/orxonox/sound/WorldSound.cc (copied) * code/trunk/src/orxonox/sound/WorldSound.h (copied) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.h (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.cc (modified) * code/trunk/src/orxonox/weaponsystem/Weapon.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponPack.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.cc (modified) * code/trunk/src/orxonox/worldentities/BigExplosion.h (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.cc (modified) * code/trunk/src/orxonox/worldentities/ExplosionChunk.h (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MovableEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/SpawnPoint.h (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Destroyer.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) Merged core5 branch back to the trunk. Key features include clean ... Mon, 12 Oct 2009 15:38:40 GMT rgrieder [5928] * code/branches/core5/data/particle/ExplosionComp1.particle (modified) Fixed typo in a particle script. Sun, 11 Oct 2009 19:50:53 GMT rgrieder [5927] * code/branches/core5/src/libraries/core/PathConfig.cc (modified) Windows fix: Paths containing "fancy" stuff like '.' were not ... Fri, 09 Oct 2009 22:56:55 GMT scheusso [5926] * code/branches/core5/src/libraries/network/ServerConnection.cc (modified) more consistent client disconnection handling Fri, 09 Oct 2009 16:46:54 GMT rgrieder [5925] * code/branches/core5/src/libraries/core/GUIManager.h (modified) * code/branches/core5/src/libraries/core/GraphicsManager.cc (modified) * code/branches/core5/src/modules/objects/Planet.cc (modified) * code/branches/core5/src/orxonox/CameraManager.cc (modified) * code/branches/core5/src/orxonox/graphics/Camera.cc (modified) Reapplied some of the changes that got reverted in the last commit ... Fri, 09 Oct 2009 16:04:16 GMT scheusso [5924] * code/branches/core5/src/libraries/core/GUIManager.h (modified) * code/branches/core5/src/libraries/core/GraphicsManager.cc (modified) * code/branches/core5/src/modules/objects/Planet.cc (modified) * code/branches/core5/src/orxonox/CameraManager.cc (modified) * code/branches/core5/src/orxonox/CameraManager.h (modified) * code/branches/core5/src/orxonox/Scene.cc (modified) * code/branches/core5/src/orxonox/Scene.h (modified) * code/branches/core5/src/orxonox/graphics/Camera.cc (modified) reverted r5911 partially and removed fallbackcamera level scene now ... Fri, 09 Oct 2009 15:47:46 GMT rgrieder [5923] * code/trunk/cmake/PackageConfig.cmake (modified) Allowing multiple major dependency versions. Currently this is 3.1 ... Fri, 09 Oct 2009 15:15:14 GMT landauf [5922] * code/branches/core5/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSLevel.h (modified) list of remaining objects after a level unloading Fri, 09 Oct 2009 15:09:26 GMT scheusso [5921] * code/branches/core5/src/libraries/core/input/InputManager.cc (modified) build fix for linux Fri, 09 Oct 2009 15:04:23 GMT scheusso [5920] * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) something went wrong with one of my commits Fri, 09 Oct 2009 15:00:22 GMT scheusso [5919] * code/branches/core5/src/libraries/network/Client.cc (modified) forgot to remove a debug line Fri, 09 Oct 2009 14:54:31 GMT scheusso [5918] * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.h (modified) * code/branches/core5/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSRoot.h (modified) 2 new console commands (startIOConsole, printObjects) Fri, 09 Oct 2009 14:44:50 GMT scheusso [5917] * code/branches/core5/src/orxonox/Test.cc (modified) * code/branches/core5/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/branches/core5/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/core5/src/orxonox/gametypes/Gametype.h (modified) * code/branches/core5/src/orxonox/items/MultiStateEngine.cc (modified) * code/branches/core5/src/orxonox/weaponsystem/WeaponSlot.cc (modified) missing parts of last commit Fri, 09 Oct 2009 14:41:30 GMT scheusso [5916] * code/branches/core5/src/libraries/network/Client.cc (modified) * code/branches/core5/src/libraries/network/Client.h (modified) * code/branches/core5/src/libraries/network/ClientConnection.cc (modified) * code/branches/core5/src/libraries/network/ClientConnection.h (modified) * code/branches/core5/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/core5/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/core5/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/core5/src/orxonox/graphics/Camera.cc (modified) * code/branches/core5/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/core5/src/orxonox/worldentities/CameraPosition.cc (modified) * code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/core5/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/branches/core5/src/orxonox/worldentities/pawns/Spectator.cc (modified) some cleaning up in the network more to come Fri, 09 Oct 2009 11:12:47 GMT rgrieder [5915] * code/branches/core5/cmake/SourceFileUtilities.cmake (modified) * code/branches/core5/src/OrxonoxConfig.cmake (modified) Added CMake switch to disable multi-file compilations: ... Fri, 09 Oct 2009 11:12:16 GMT rgrieder [5914] * code/branches/core5/src/libraries/core/EventIncludes.h (modified) * code/branches/core5/src/orxonox/Level.cc (modified) * code/branches/core5/src/orxonox/Scene.cc (modified) * code/branches/core5/src/orxonox/controllers/HumanController.cc (modified) * code/branches/core5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/core5/src/orxonox/sound/WorldSound.cc (modified) - Fixed missing includes - Fixed non-world coordinate camera ... Thu, 08 Oct 2009 21:23:13 GMT rgrieder [5913] * code/branches/core5/src/orxonox/controllers/HumanController.cc (modified) Using the Camera position instead of the ControllableEntity position ... Thu, 08 Oct 2009 21:11:49 GMT rgrieder [5912] * code/branches/core5/src/libraries/core/input/Button.cc (modified) * code/branches/core5/src/libraries/core/input/KeyBinderManager.cc (modified) New feature: "keybind" without arguments de-binds a key. We couldn't ... Thu, 08 Oct 2009 20:56:29 GMT rgrieder [5911] * code/branches/core5/src/libraries/core/GUIManager.cc (modified) * code/branches/core5/src/libraries/core/GUIManager.h (modified) * code/branches/core5/src/modules/objects/Planet.cc (modified) * code/branches/core5/src/orxonox/CameraManager.cc (modified) * code/branches/core5/src/orxonox/CameraManager.h (modified) * code/branches/core5/src/orxonox/Scene.cc (modified) * code/branches/core5/src/orxonox/Scene.h (modified) * code/branches/core5/src/orxonox/graphics/Camera.cc (modified) Fixed CameraManager issue with the fallback scene by assigning each ... Thu, 08 Oct 2009 19:47:28 GMT rgrieder [5910] * code/branches/core5/src/external/ois/changes_orxonox.diff (modified) * code/branches/core5/src/external/ois/win32/Win32ForceFeedback.cpp (modified) * code/branches/core5/src/libraries/core/input/InputManager.cc (modified) * code/branches/core5/src/libraries/core/input/InputManager.h (modified) * code/branches/core5/src/libraries/core/input/InputState.cc (modified) * code/branches/core5/src/libraries/core/input/InputState.h (modified) * code/branches/core5/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) - Fixed force feedback output pollution problem in OIS. - Fixed ... Thu, 08 Oct 2009 19:13:24 GMT rgrieder [5909] * code/branches/core5/data/defaultConfig/keybindings.ini (modified) * code/branches/core5/src/libraries/core/input/Button.cc (modified) Fixed faulty key binding. If you want the message to go away, delete ... Thu, 08 Oct 2009 17:36:28 GMT rgrieder [5908] * code/branches/core5/src/libraries/core/MemoryArchive.cc (modified) More boost < 1.36 fixes. Thu, 08 Oct 2009 17:26:06 GMT rgrieder [5907] * code/branches/core5/src/libraries/core/MemoryArchive.cc (modified) Fixed boost < 1.36 build. Thu, 08 Oct 2009 15:29:27 GMT rgrieder [5906] * code/branches/core5/src/libraries/core/ScopedSingletonManager.h (modified) Removed an assert because the SignalHandler seems to have the affect ... Thu, 08 Oct 2009 09:49:01 GMT rgrieder [5905] * code/branches/core5/src/orxonox/sound/SoundManager.cc (modified) Improved error message for the case OpenAL was not actually installed. Wed, 07 Oct 2009 22:00:21 GMT rgrieder [5904] * code/branches/core5/src/orxonox/sound/BaseSound.cc (modified) * code/branches/core5/src/orxonox/sound/BaseSound.h (modified) Ogg file loading should work again now using the Ogre resource system. Wed, 07 Oct 2009 13:44:26 GMT ambuehlm [5903] * code/branches/tutorial/src/orxonox/controllers/DroneController.cc_ambuehlm (copied) First Try to insert a Drone(Tutorial) Wed, 07 Oct 2009 12:20:43 GMT dafrick [5902] * code/branches/pickup/src/orxonox/pickup/BaseItem.cc (modified) * code/branches/pickup/src/orxonox/pickup/BaseItem.h (modified) * code/branches/pickup/src/orxonox/pickup/DroppedItem.cc (modified) * code/branches/pickup/src/orxonox/pickup/DroppedItem.h (modified) * code/branches/pickup/src/orxonox/pickup/EquipmentItem.cc (modified) * code/branches/pickup/src/orxonox/pickup/EquipmentItem.h (modified) * code/branches/pickup/src/orxonox/pickup/ModifierPickup.cc (modified) * code/branches/pickup/src/orxonox/pickup/ModifierPickup.h (modified) * code/branches/pickup/src/orxonox/pickup/ModifierType.h (modified) * code/branches/pickup/src/orxonox/pickup/PassiveItem.cc (modified) * code/branches/pickup/src/orxonox/pickup/PassiveItem.h (modified) * code/branches/pickup/src/orxonox/pickup/PickupCollection.h (modified) * code/branches/pickup/src/orxonox/pickup/PickupInventory.cc (modified) * code/branches/pickup/src/orxonox/pickup/PickupInventory.h (modified) * code/branches/pickup/src/orxonox/pickup/PickupSpawner.cc (modified) * code/branches/pickup/src/orxonox/pickup/PickupSpawner.h (modified) * code/branches/pickup/src/orxonox/pickup/UsableItem.cc (modified) * code/branches/pickup/src/orxonox/pickup/UsableItem.h (modified) * code/branches/pickup/src/orxonox/pickup/items/HealthImmediate.cc (modified) * code/branches/pickup/src/orxonox/pickup/items/HealthImmediate.h (modified) * code/branches/pickup/src/orxonox/pickup/items/HealthUsable.cc (modified) * code/branches/pickup/src/orxonox/pickup/items/Jump.h (modified) Added comments and a lot of TODO's, many of which probably are ... Wed, 07 Oct 2009 11:11:01 GMT rgrieder [5901] * code/trunk/cmake/TargetUtilities.cmake (modified) Fix did not entirely work before. Visual Studio should now work again. Wed, 07 Oct 2009 10:54:08 GMT rgrieder [5900] * code/trunk/cmake/TargetUtilities.cmake (modified) Hopefully fixed CMake visual studio bug in the trunk. Wed, 07 Oct 2009 09:19:19 GMT rgrieder [5899] * code/branches/core5/data/levels/presentation_pong.oxw (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core5/src/orxonox/sound/AmbientSound.cc (modified) * code/branches/core5/src/orxonox/sound/BaseSound.cc (modified) * code/branches/core5/src/orxonox/sound/BaseSound.h (modified) * code/branches/core5/src/orxonox/sound/WorldSound.cc (modified) Renaming BaseSound::setSoundFile (and all its associates) to ... Wed, 07 Oct 2009 00:02:15 GMT landauf [5898] * code/branches/core5/data/levels/presentation_pong.oxw (modified) * code/branches/core5/src/modules/pong/Pong.cc (modified) * code/branches/core5/src/modules/pong/PongAI.cc (modified) * code/branches/core5/src/modules/pong/PongAI.h (modified) * code/branches/core5/src/modules/pong/PongBall.cc (modified) * code/branches/core5/src/modules/pong/PongBall.h (modified) * code/branches/core5/src/modules/pong/PongCenterpoint.cc (modified) * code/branches/core5/src/modules/pong/PongCenterpoint.h (modified) Enhanced Pong gametype: It's now possible to accelerate the ball in ... Tue, 06 Oct 2009 23:42:47 GMT landauf [5897] * code/branches/core5/src/orxonox/sound/WorldSound.cc (modified) * code/branches/core5/src/orxonox/sound/WorldSound.h (modified) build fix Tue, 06 Oct 2009 21:12:01 GMT rgrieder [5896] * code/branches/core5/data/levels/presentation_pong.oxw (modified) * code/branches/core5/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/core5/src/orxonox/controllers/HumanController.cc (modified) * code/branches/core5/src/orxonox/controllers/HumanController.h (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.h (modified) * code/branches/core5/src/orxonox/sound/AmbientSound.cc (copied) * code/branches/core5/src/orxonox/sound/AmbientSound.h (copied) * code/branches/core5/src/orxonox/sound/BaseSound.cc (moved) * code/branches/core5/src/orxonox/sound/BaseSound.h (moved) * code/branches/core5/src/orxonox/sound/CMakeLists.txt (modified) * code/branches/core5/src/orxonox/sound/SoundManager.cc (modified) * code/branches/core5/src/orxonox/sound/SoundManager.h (modified) * code/branches/core5/src/orxonox/sound/WorldSound.cc (copied) * code/branches/core5/src/orxonox/sound/WorldSound.h (copied) Added some basic sound classes: WorldSound (to be used for 3D sound, ... Tue, 06 Oct 2009 19:42:58 GMT landauf [5895] * code/branches/core5/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/core5/src/modules/overlays/hud/ChatOverlay.h (modified) * code/branches/core5/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/core5/src/orxonox/graphics/ParticleEmitter.h (modified) * code/branches/core5/src/orxonox/interfaces/RadarViewable.h (modified) Attempt to fix a crash when switching from a level back to the mainmenu Tue, 06 Oct 2009 16:58:10 GMT landauf [5894] * code/branches/core5/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/core5/src/orxonox/worldentities/ControllableEntity.h (modified) Using SmartPtr for CameraPositions in ControllableEntity. This fixes ... Tue, 06 Oct 2009 11:55:05 GMT landauf [5893] * code/branches/core5/src/libraries/core/EventIncludes.h (modified) * code/branches/core5/src/modules/pong/Pong.cc (modified) Removed ambiguity between the EventName macro and the EventName ... Tue, 06 Oct 2009 07:18:40 GMT rgrieder [5892] * code/branches/core5/src/modules/pong/PongBall.cc (modified) * code/branches/core5/src/modules/pong/PongBall.h (modified) * code/branches/core5/src/orxonox/Level.cc (modified) * code/branches/core5/src/orxonox/Level.h (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.h (modified) * code/branches/core5/src/orxonox/items/Engine.cc (modified) * code/branches/core5/src/orxonox/items/Engine.h (modified) * code/branches/core5/src/orxonox/sound/CMakeLists.txt (modified) * code/branches/core5/src/orxonox/sound/SoundMainMenu.cc (deleted) * code/branches/core5/src/orxonox/sound/SoundMainMenu.h (deleted) Removed hard coded sound in Level, Engine and PongBall and replaced ... Tue, 06 Oct 2009 03:38:45 GMT landauf [5891] * code/branches/core5/data/levels/presentation_pong.oxw (modified) * code/branches/core5/data/particle/sparks2.particle (added) Added fancy particle effects in the pong level, based on the named ... Tue, 06 Oct 2009 03:29:39 GMT landauf [5890] * code/branches/core5/data/levels/events.oxw (modified) * code/branches/core5/data/levels/old/physicstest2.oxw (modified) * code/branches/core5/data/levels/old/princessaeryn.oxw (modified) * code/branches/core5/data/levels/old/sample4.oxw (modified) * code/branches/core5/data/levels/presentation.oxw (modified) * code/branches/core5/data/levels/presentation09b.oxw (modified) * code/branches/core5/data/levels/princessaeryn.oxw (modified) * code/branches/core5/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/core5/src/modules/objects/eventsystem/EventTarget.h (modified) Using target= instead of name= to define the target-object in ... Tue, 06 Oct 2009 02:57:53 GMT landauf [5889] * code/branches/core5/src/modules/pong/Pong.cc (modified) * code/branches/core5/src/modules/pong/PongBall.cc (modified) Using named events in Pong. Also firing events in PongBall now. Tue, 06 Oct 2009 02:56:42 GMT landauf [5888] * code/branches/core5/src/libraries/core/BaseObject.cc (modified) * code/branches/core5/src/libraries/core/BaseObject.h (modified) * code/branches/core5/src/libraries/core/Event.h (modified) * code/branches/core5/src/libraries/core/EventIncludes.h (modified) * code/branches/core5/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/core5/src/modules/objects/eventsystem/CMakeLists.txt (modified) * code/branches/core5/src/modules/objects/eventsystem/EventFilter.cc (added) * code/branches/core5/src/modules/objects/eventsystem/EventFilter.h (added) * code/branches/core5/src/modules/objects/eventsystem/EventListener.cc (modified) * code/branches/core5/src/modules/objects/eventsystem/EventName.cc (added) * code/branches/core5/src/modules/objects/eventsystem/EventName.h (added) Added support for named events (so one object can fire multiple ... Tue, 06 Oct 2009 02:51:08 GMT landauf [5887] * code/branches/core5/src/libraries/core/BaseObject.cc (modified) * code/branches/core5/src/libraries/core/BaseObject.h (modified) * code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/branches/core5/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/core5/src/modules/objects/eventsystem/EventTarget.h (modified) Fixed an issue with the new event-system: even states which weren't ... Tue, 06 Oct 2009 00:14:46 GMT landauf [5886] * code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.h (modified) forgot some changes in r5882. EventDispatcher now really supports all ... Mon, 05 Oct 2009 23:51:56 GMT landauf [5885] * code/branches/core5/src/modules/pong/PongBall.cc (modified) Somehow the code in PongBall was double... simplified this and ... Mon, 05 Oct 2009 21:20:42 GMT landauf [5884] * code/branches/core5/src/orxonox/graphics/ParticleSpawner.cc (modified) fixed a bug in ParticleSpawner which caused it to spawn particles in ... Mon, 05 Oct 2009 20:50:19 GMT landauf [5883] * code/branches/core5/data/levels/events.oxw (modified) * code/branches/core5/src/libraries/core/BaseObject.cc (modified) main-state now supports also memoryless states (like "spawn" in ... Mon, 05 Oct 2009 19:57:05 GMT landauf [5882] * code/branches/core5/data/levels/events.oxw (added) * code/branches/core5/src/libraries/core/BaseObject.cc (modified) * code/branches/core5/src/libraries/core/BaseObject.h (modified) * code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc (modified) * code/branches/core5/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/core5/src/modules/objects/eventsystem/EventTarget.h (modified) Again some changes in the event-system: - Added "mainstate" ... Mon, 05 Oct 2009 16:28:21 GMT rgrieder [5881] * code/branches/core5/src/modules/pong/PongBall.cc (modified) * code/branches/core5/src/modules/pong/PongBall.h (modified) * code/branches/core5/src/orxonox/sound/SoundManager.cc (modified) Fixed sound problem in Pong by correcting the assumptions that you ... Mon, 05 Oct 2009 16:10:54 GMT rgrieder [5880] * code/branches/core5/cmake/CompilerConfigMSVC.cmake (modified) Removing "minimal rebuild" option for msvc: It doesn't work too well ... Mon, 05 Oct 2009 15:02:25 GMT landauf [5879] * code/branches/core5/src/libraries/core/BaseObject.cc (modified) * code/branches/core5/src/libraries/core/BaseObject.h (modified) * code/branches/core5/src/libraries/core/CorePrereqs.h (modified) * code/branches/core5/src/libraries/core/Event.cc (modified) * code/branches/core5/src/libraries/core/Event.h (modified) * code/branches/core5/src/libraries/core/EventIncludes.h (modified) * code/branches/core5/src/libraries/core/Identifier.cc (modified) * code/branches/core5/src/libraries/core/Identifier.h (modified) * code/branches/core5/src/libraries/core/OrxonoxClass.h (modified) * code/branches/core5/src/libraries/core/Super.h (modified) * code/branches/core5/src/libraries/core/XMLPort.h (modified) * code/branches/core5/src/modules/objects/Attacher.cc (modified) * code/branches/core5/src/modules/objects/triggers/EventTrigger.cc (modified) * code/branches/core5/src/modules/objects/triggers/EventTrigger.h (modified) * code/branches/core5/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/core5/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/branches/core5/src/orxonox/graphics/ParticleSpawner.cc (modified) * code/branches/core5/src/orxonox/graphics/ParticleSpawner.h (modified) * code/branches/core5/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/core5/src/orxonox/worldentities/WorldEntity.cc (modified) More changes in the event-system: processEvent() is now locally ... Sun, 04 Oct 2009 23:36:33 GMT rgrieder [5878] * code/branches/core5/src/libraries/core/GameMode.cc (modified) * code/branches/core5/src/libraries/core/GameMode.h (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core5/src/orxonox/sound/SoundManager.cc (modified) Added GameMode::playsSound(). This function checks whether sound is ... Sun, 04 Oct 2009 23:34:10 GMT rgrieder [5877] * code/branches/core5/src/libraries/core/Core.cc (modified) * code/branches/core5/src/libraries/core/ScopedSingletonManager.h (modified) * code/branches/core5/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/core5/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/core5/src/libraries/util/Scope.h (modified) * code/branches/core5/src/modules/questsystem/QuestManager.cc (modified) * code/branches/core5/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/core5/src/orxonox/CameraManager.cc (modified) * code/branches/core5/src/orxonox/LevelManager.cc (modified) * code/branches/core5/src/orxonox/PlayerManager.cc (modified) * code/branches/core5/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/core5/src/orxonox/sound/SoundManager.cc (modified) Added new an option for the ScopedSingletonManager that can allow the ... Sun, 04 Oct 2009 21:08:14 GMT rgrieder [5876] * code/branches/core5/src/libraries/core/Core.cc (modified) * code/branches/core5/src/libraries/core/GraphicsManager.cc (modified) * code/branches/core5/src/libraries/core/GraphicsManager.h (modified) * code/branches/core5/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/core5/src/orxonox/gamestates/GSIOConsole.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSIOConsole.h (modified) * code/branches/core5/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.h (modified) * code/branches/core5/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSRoot.h (modified) Cleanup in the GameStates (also moved debug overlay to the ... Sun, 04 Oct 2009 21:05:17 GMT rgrieder [5875] * code/branches/core5/src/libraries/core/Core.cc (modified) * code/branches/core5/src/libraries/core/Game.cc (modified) * code/branches/core5/src/libraries/core/GameMode.h (modified) Fixed an issue that could occur when singletons associated with ... Sun, 04 Oct 2009 19:51:14 GMT rgrieder [5874] * code/branches/core5/src/external/bullet/BulletPrecompiledHeaders.h (deleted) * code/branches/core5/src/libraries/tools/ToolsPrecompiledHeaders.h (deleted) * code/branches/core5/src/modules/pong/CMakeLists.txt (modified) * code/branches/core5/src/modules/pong/PongPrecompiledHeaders.h (deleted) Removed obsolete PCH files and created a compilation for pong. Sun, 04 Oct 2009 18:03:26 GMT rgrieder [5873] * code/branches/core5/src/libraries/CMakeLists.txt (modified) * code/branches/core5/src/libraries/core/CMakeLists.txt (modified) * code/branches/core5/src/libraries/network/packet/CMakeLists.txt (modified) * code/branches/core5/src/libraries/tools/CMakeLists.txt (modified) * code/branches/core5/src/libraries/util/CMakeLists.txt (modified) * code/branches/core5/src/modules/pong/CMakeLists.txt (modified) * code/branches/core5/src/orxonox/CMakeLists.txt (modified) * code/branches/core5/src/orxonox/graphics/CMakeLists.txt (modified) * code/branches/core5/src/orxonox/overlays/CMakeLists.txt (modified) Added a few more compilations in our own libraries. Also fixed a bug ... Sun, 04 Oct 2009 17:27:35 GMT rgrieder [5872] * code/branches/core5/cmake/ParseMacroArguments.cmake (modified) * code/branches/core5/cmake/TargetUtilities.cmake (modified) * code/branches/core5/src/external/bullet/CMakeLists.txt (modified) * code/branches/core5/src/external/ceguilua/CMakeLists.txt (modified) * code/branches/core5/src/external/cpptcl/CMakeLists.txt (modified) * code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/branches/core5/src/external/ois/CMakeLists.txt (modified) * code/branches/core5/src/external/tinyxml/CMakeLists.txt (modified) * code/branches/core5/src/external/tolua/CMakeLists.txt (modified) Removing redundancy: Specifying ORXONOX_EXTERAL for a target should ... Sun, 04 Oct 2009 16:06:33 GMT rgrieder [5871] * code/branches/core5/cmake/SourceFileUtilities.cmake (modified) * code/branches/core5/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/branches/core5/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/branches/core5/src/external/bullet/CMakeLists.txt (modified) * code/branches/core5/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/branches/core5/src/external/ois/CMakeLists.txt (modified) * code/branches/core5/src/external/ois/linux/CMakeLists.txt (modified) * code/branches/core5/src/external/ois/mac/CMakeLists.txt (modified) * code/branches/core5/src/external/ois/win32/CMakeLists.txt (modified) * code/branches/core5/src/external/tinyxml/CMakeLists.txt (modified) * code/branches/core5/src/external/tolua/CMakeLists.txt (modified) Compiling our third party libraries with as few files as possible. ... Sun, 04 Oct 2009 12:07:17 GMT rgrieder [5870] * code/branches/core5/cmake/SourceFileUtilities.cmake (modified) * code/branches/core5/cmake/TargetUtilities.cmake (modified) Added new build system feature: Combining multiple source files into ... Sat, 03 Oct 2009 22:26:05 GMT rgrieder [5869] * code/branches/core5/src/libraries/core/Core.cc (modified) * code/branches/core5/src/libraries/core/Core.h (modified) * code/branches/core5/src/libraries/core/input/InputManager.cc (modified) * code/branches/core5/src/libraries/core/input/InputManager.h (modified) * code/branches/core5/src/libraries/core/input/KeyBinderManager.cc (modified) * code/branches/core5/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/core5/src/libraries/core/input/KeyDetector.h (modified) Applied ScopedSingletonManager to KeyBinderManager and KeyDetector. Sat, 03 Oct 2009 22:03:14 GMT rgrieder [5868] * code/branches/core5/cmake/PrecompiledHeaderFiles.cmake (modified) * code/branches/core5/src/libraries/core/Game.cc (modified) * code/branches/core5/src/libraries/core/Game.h (modified) Fixed a possible issue in Game and a build system bug with PCH. Sat, 03 Oct 2009 22:02:28 GMT rgrieder [5867] * code/branches/core5/src/libraries/core/CMakeLists.txt (modified) * code/branches/core5/src/libraries/core/Core.cc (modified) * code/branches/core5/src/libraries/core/ScopedSingletonManager.cc (added) * code/branches/core5/src/libraries/core/ScopedSingletonManager.h (added) * code/branches/core5/src/libraries/util/Scope.h (modified) * code/branches/core5/src/libraries/util/ScopedSingleton.h (deleted) * code/branches/core5/src/libraries/util/Singleton.h (modified) * code/branches/core5/src/modules/questsystem/QuestManager.cc (modified) * code/branches/core5/src/modules/questsystem/QuestManager.h (modified) * code/branches/core5/src/modules/questsystem/QuestsystemPrecompiledHeaders.h (modified) * code/branches/core5/src/modules/questsystem/notifications/NotificationManager.cc (modified) * code/branches/core5/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/branches/core5/src/orxonox/CameraManager.cc (modified) * code/branches/core5/src/orxonox/CameraManager.h (modified) * code/branches/core5/src/orxonox/LevelManager.cc (modified) * code/branches/core5/src/orxonox/LevelManager.h (modified) * code/branches/core5/src/orxonox/PlayerManager.cc (modified) * code/branches/core5/src/orxonox/PlayerManager.h (modified) * code/branches/core5/src/orxonox/overlays/InGameConsole.cc (modified) * code/branches/core5/src/orxonox/overlays/InGameConsole.h (modified) * code/branches/core5/src/orxonox/sound/SoundManager.cc (modified) * code/branches/core5/src/orxonox/sound/SoundManager.h (modified) Modified Scoped Singleton concept: Derive from Singleton normally, ... Sat, 03 Oct 2009 16:32:05 GMT landauf [5866] * code/branches/core5/src/libraries/core/BaseObject.cc (modified) * code/branches/core5/src/libraries/core/BaseObject.h (modified) * code/branches/core5/src/libraries/core/Event.cc (modified) * code/branches/core5/src/libraries/core/Event.h (modified) * code/branches/core5/src/libraries/core/EventIncludes.h (modified) * code/branches/core5/src/libraries/core/Identifier.h (modified) * code/branches/core5/src/modules/objects/eventsystem/EventListener.cc (modified) * code/branches/core5/src/modules/objects/eventsystem/EventListener.h (modified) * code/branches/core5/src/modules/objects/eventsystem/EventTarget.cc (modified) * code/branches/core5/src/modules/objects/eventsystem/EventTarget.h (modified) some cleanup in the eventsystem. not sure if everything still works, ... Sat, 03 Oct 2009 15:36:35 GMT rgrieder [5865] * code/branches/core5/src/libraries/core/GameState.h (modified) * code/branches/core5/src/libraries/core/PathConfig.h (modified) * code/branches/core5/src/libraries/network/Client.h (modified) * code/branches/core5/src/libraries/network/Server.h (modified) Missing includes (for non PCH builds). Sat, 03 Oct 2009 15:36:10 GMT rgrieder [5864] * code/branches/core5/src/libraries/core/input/KeyDetector.cc (modified) * code/branches/core5/src/libraries/core/input/KeyDetector.h (modified) Missing changes for previous commit (whatever happened...) Sat, 03 Oct 2009 15:33:31 GMT rgrieder [5863] * code/branches/core5/data/defaultConfig/keybindings.ini (modified) * code/branches/core5/data/defaultConfig/masterKeybindings.ini (deleted) * code/branches/core5/src/libraries/core/Core.cc (modified) * code/branches/core5/src/libraries/core/Core.h (modified) * code/branches/core5/src/libraries/core/CorePrereqs.h (modified) * code/branches/core5/src/libraries/core/input/CMakeLists.txt (modified) * code/branches/core5/src/libraries/core/input/InputManager.cc (modified) * code/branches/core5/src/libraries/core/input/InputManager.h (modified) * code/branches/core5/src/libraries/core/input/KeyBinder.cc (modified) * code/branches/core5/src/libraries/core/input/KeyBinder.h (modified) * code/branches/core5/src/libraries/core/input/KeyBinderManager.cc (added) * code/branches/core5/src/libraries/core/input/KeyBinderManager.h (added) * code/branches/core5/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSGraphics.h (modified) * code/branches/core5/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSLevel.h (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) New class: KeyBinderManager (yes, it really was necessary, I'm not ... Fri, 02 Oct 2009 19:11:35 GMT landauf [5862] * code/branches/core5/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/core5/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/core5/src/orxonox/interfaces/PawnListener.h (deleted) * code/branches/core5/src/orxonox/worldentities/pawns/Pawn.cc (modified) removed PawnListener Fri, 02 Oct 2009 18:58:27 GMT landauf [5861] * code/branches/core5/src/libraries/core/WeakPtr.h (modified) * code/branches/core5/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/core5/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/core5/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/core5/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) un-PawnListener-ized ArtificialController Fri, 02 Oct 2009 18:41:33 GMT landauf [5860] * code/branches/core5/src/modules/weapons/projectiles/Projectile.cc (modified) * code/branches/core5/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/core5/src/orxonox/gametypes/TeamDeathmatch.cc (modified) using a WeakPtr in Projectile instead of inheriting from PawnListener ... Fri, 02 Oct 2009 17:35:52 GMT landauf [5859] * code/branches/core5/src/orxonox/gametypes/TeamDeathmatch.cc (modified) fixed a small bug in TeamDeathmatch Fri, 02 Oct 2009 09:41:00 GMT rgrieder [5858] * code/branches/core5/src/libraries/core/BaseObject.cc (modified) * code/branches/core5/src/libraries/core/CorePrereqs.h (modified) * code/branches/core5/src/libraries/core/XMLPort.h (modified) * code/branches/core5/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/core5/src/libraries/tools/ToolsPrereqs.h (modified) * code/branches/core5/src/libraries/util/Scope.h (modified) * code/branches/core5/src/libraries/util/UtilPrereqs.h (modified) * code/branches/core5/src/modules/objects/ObjectsPrereqs.h (modified) * code/branches/core5/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/core5/src/modules/pong/PongPrereqs.h (modified) * code/branches/core5/src/modules/questsystem/QuestsystemPrereqs.h (modified) * code/branches/core5/src/modules/weapons/WeaponsPrereqs.h (modified) * code/branches/core5/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/core5/src/orxonox/graphics/ParticleEmitter.h (modified) * code/branches/core5/src/orxonox/interfaces/NotificationListener.h (modified) * code/branches/core5/src/orxonox/interfaces/RadarViewable.h (modified) Cleanup in *Prereqs.h files - Removed forward declarations to ... Fri, 02 Oct 2009 08:47:44 GMT scheusso [5857] * code/branches/core5/src/orxonox/graphics/ParticleSpawner.cc (modified) fixed a bug which caused particle mess (no deletion of ... Fri, 02 Oct 2009 08:30:56 GMT rgrieder [5856] * code/branches/core5/src/modules/overlays/hud/HUDBar.cc (modified) Convinced HUDBar to destroy its BarColours (as they grow with each ... Fri, 02 Oct 2009 06:36:25 GMT rgrieder [5855] * code/branches/core5/src/libraries/core/CMakeLists.txt (modified) * code/branches/core5/src/libraries/core/Core.cc (modified) * code/branches/core5/src/libraries/core/CorePrereqs.h (modified) * code/branches/core5/src/libraries/core/GUIManager.cc (modified) * code/branches/core5/src/libraries/core/Game.cc (modified) * code/branches/core5/src/libraries/core/GraphicsManager.cc (modified) * code/branches/core5/src/libraries/core/TclThreadManager.cc (modified) * code/branches/core5/src/libraries/core/input/InputDevice.h (modified) * code/branches/core5/src/libraries/core/input/InputManager.cc (modified) * code/branches/core5/src/libraries/network/Client.cc (modified) * code/branches/core5/src/libraries/network/Server.cc (modified) * code/branches/core5/src/libraries/tools/Timer.cc (modified) * code/branches/core5/src/libraries/util/CMakeLists.txt (modified) * code/branches/core5/src/libraries/util/Clock.cc (moved) * code/branches/core5/src/libraries/util/Clock.h (moved) * code/branches/core5/src/libraries/util/UtilPrereqs.h (modified) * code/branches/core5/src/orxonox/gamestates/GSClient.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSDedicated.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSDedicatedClient.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSGraphics.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSLevel.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/branches/core5/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/core5/src/orxonox/overlays/InGameConsole.cc (modified) Moved Clock from core to util (used in Scope anyway). Thu, 01 Oct 2009 15:19:27 GMT rgrieder [5854] * code/branches/core4 (deleted) * code/branches/netp6 (deleted) * code/branches/resource (deleted) * code/branches/resource2 (deleted) * code/branches/resource3 (deleted) Deleting old branches