# # ChangeLog for code/branches/pickup/cmake/CompilerConfigMSVC.cmake # # Generated by Trac 1.0.9 # Nov 19, 2024, 2:28:34 AM 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. Sun, 27 Sep 2009 19:43:47 GMT dafrick [5815] * code/branches/pickup (copied) Creating new pickup branch. Sun, 30 Aug 2009 00:22:00 GMT rgrieder [5695] * code/trunk (modified) * code/trunk/CMakeLists.txt (modified) * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/client1.bat.in (modified) * code/trunk/bin/client2.bat.in (modified) * code/trunk/bin/dedicated.bat.in (modified) * code/trunk/bin/run.bat.in (modified) * code/trunk/bin/server.bat.in (modified) * code/trunk/bin/standalone.bat.in (modified) * code/trunk/cmake/BuildConfig.cmake (deleted) * code/trunk/cmake/BuildConfigGCC.cmake (deleted) * code/trunk/cmake/BuildConfigMSVC.cmake (deleted) * code/trunk/cmake/CheckOGREPlugins.cmake (modified) * code/trunk/cmake/CompilerConfig.cmake (copied) * code/trunk/cmake/CompilerConfigGCC.cmake (copied) * code/trunk/cmake/CompilerConfigMSVC.cmake (copied) * code/trunk/cmake/GenerateToluaBindings.cmake (modified) * code/trunk/cmake/InstallConfig.cmake (copied) * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/cmake/Media.cmake (deleted) * code/trunk/cmake/PackageConfig.cmake (modified) * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/cmake/PackageConfigMinGW.cmake (modified) * code/trunk/cmake/ParseMacroArguments.cmake (modified) * code/trunk/cmake/TargetUtilities.cmake (modified) * code/trunk/data (copied) * code/trunk/data/CMakeLists.txt (copied) * code/trunk/data/DataInstallScript.cmake (copied) * code/trunk/data/defaultConfig (copied) * code/trunk/data/defaultConfig/keybindings.ini (copied) * code/trunk/data/defaultConfig/masterKeybindings.ini (copied) * code/trunk/data/gui (copied) * code/trunk/data/gui/configs (copied) * code/trunk/data/gui/configs/CEGUIConfig.xsd (copied) * code/trunk/data/gui/configs/Falagard.xsd (copied) * code/trunk/data/gui/configs/Font.xsd (copied) * code/trunk/data/gui/configs/GUILayout.xsd (copied) * code/trunk/data/gui/configs/GUIScheme.xsd (copied) * code/trunk/data/gui/configs/Imageset.xsd (copied) * code/trunk/data/gui/layouts (copied) * code/trunk/data/gui/layouts/CompositorDemo.layout (copied) * code/trunk/data/gui/layouts/Console.wnd (copied) * code/trunk/data/gui/layouts/CrowdDemo.layout (copied) * code/trunk/data/gui/layouts/Demo7Windows.layout (copied) * code/trunk/data/gui/layouts/Demo8.layout (copied) * code/trunk/data/gui/layouts/DragDropDemo.layout (copied) * code/trunk/data/gui/layouts/FontDemo.layout (copied) * code/trunk/data/gui/layouts/GUILayout.xsd (copied) * code/trunk/data/gui/layouts/InGameTest.layout (copied) * code/trunk/data/gui/layouts/InstancingDemo.layout (copied) * code/trunk/data/gui/layouts/MainMenu.layout (copied) * code/trunk/data/gui/layouts/PickupInventory.layout (copied) * code/trunk/data/gui/layouts/TabControlDemo.layout (copied) * code/trunk/data/gui/layouts/TabPage.layout (copied) * code/trunk/data/gui/layouts/TabPage1.layout (copied) * code/trunk/data/gui/layouts/TabPage2.layout (copied) * code/trunk/data/gui/layouts/TextDemo.layout (copied) * code/trunk/data/gui/layouts/TreeDemoTaharez.layout (copied) * code/trunk/data/gui/layouts/VanillaConsole.layout (copied) * code/trunk/data/gui/layouts/VanillaWindows.layout (copied) * code/trunk/data/gui/layouts/cegui8.layout (copied) * code/trunk/data/gui/layouts/facial.layout (copied) * code/trunk/data/gui/layouts/ogregui.layout (copied) * code/trunk/data/gui/layouts/shadows.layout (copied) * code/trunk/data/gui/schemes (copied) * code/trunk/data/gui/schemes/Demo8.scheme (copied) * code/trunk/data/gui/schemes/GUIScheme.xsd (copied) * code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (copied) * code/trunk/data/gui/schemes/TaharezLook.scheme (copied) * code/trunk/data/gui/schemes/TaharezLookSkin.scheme (copied) * code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (copied) * code/trunk/data/gui/schemes/TaharezLookWidgets.scheme (copied) * code/trunk/data/gui/schemes/VanillaSkin.scheme (copied) * code/trunk/data/gui/schemes/WindowsLook.scheme (copied) * code/trunk/data/gui/schemes/WindowsLookWidgets.scheme (copied) * code/trunk/data/gui/scripts (copied) * code/trunk/data/gui/scripts/BasicGUI.lua (copied) * code/trunk/data/gui/scripts/InitialiseGUI.lua (copied) * code/trunk/data/gui/scripts/MainMenu.lua (copied) * code/trunk/data/gui/scripts/PickupInventory.lua (copied) * code/trunk/data/levels (copied) * code/trunk/data/levels/empty_level.oxw (copied) * code/trunk/data/levels/gametype_asteroids.oxw (copied) * code/trunk/data/levels/gametype_underattack.oxw (copied) * code/trunk/data/levels/includes (copied) * code/trunk/data/levels/includes/CuboidSpaceStation.lua (copied) * code/trunk/data/levels/includes/weaponsettings1.oxi (copied) * code/trunk/data/levels/includes/weaponsettings2.oxi (copied) * code/trunk/data/levels/includes/weaponsettings3.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_H2.oxi (copied) * code/trunk/data/levels/includes/weaponsettings_pirate.oxi (copied) * code/trunk/data/levels/old (copied) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (copied) * code/trunk/data/levels/old/physicstest.oxw (copied) * code/trunk/data/levels/old/physicstest2.oxw (copied) * code/trunk/data/levels/old/planettest.oxw (copied) * code/trunk/data/levels/old/presentation_physics.oxw (copied) * code/trunk/data/levels/old/princessaeryn.oxw (copied) * code/trunk/data/levels/old/questsystem.oxw (copied) * code/trunk/data/levels/old/sample4.oxw (copied) * code/trunk/data/levels/old/spaceshiptemplates_physics.oxw (copied) * code/trunk/data/levels/old/tutorial_hs08.oxw (copied) * code/trunk/data/levels/pickuptest.oxw (copied) * code/trunk/data/levels/presentation.oxw (copied) * code/trunk/data/levels/presentation09.oxw (copied) * code/trunk/data/levels/presentation09b.oxw (copied) * code/trunk/data/levels/presentation_dm.oxw (copied) * code/trunk/data/levels/presentation_pong.oxw (copied) * code/trunk/data/levels/teambasematchlevel.oxw (copied) * code/trunk/data/levels/teamdeathmatch.oxw (copied) * code/trunk/data/levels/templates (copied) * code/trunk/data/levels/templates/spaceship_H2.oxt (copied) * code/trunk/data/levels/templates/spaceship_assff.oxt (copied) * code/trunk/data/levels/templates/spaceship_pirate.oxt (copied) * code/trunk/data/levels/tutorial.oxw (copied) * code/trunk/data/levels/waypoints.oxw (copied) * code/trunk/data/lua (copied) * code/trunk/data/lua/LuaStateInit.lua (copied) * code/trunk/data/overlays (copied) * code/trunk/data/overlays/OrxonoxLoading.overlay (copied) * code/trunk/data/overlays/debug.oxo (copied) * code/trunk/data/overlays/hud.oxo (copied) * code/trunk/data/overlays/hudtemplates3.oxo (copied) * code/trunk/data/overlays/ponghud.oxo (copied) * code/trunk/data/overlays/stats.oxo (copied) * code/trunk/data/overlays/teambasematchhud.oxo (copied) * code/trunk/data/overlays/underattackhud.oxo (copied) * code/trunk/data/particle (copied) * code/trunk/data/particle/Example-Water.particle (copied) * code/trunk/data/particle/Example.particle (copied) * code/trunk/data/particle/ExplosionComp1.particle (copied) * code/trunk/data/particle/ExplosionComp2.particle (copied) * code/trunk/data/particle/ExplosionComp4.particle (copied) * code/trunk/data/particle/FireComp2.particle (copied) * code/trunk/data/particle/LaserGun.particle (copied) * code/trunk/data/particle/ThrusterFire.particle (copied) * code/trunk/data/particle/bigexplosion1part1.particle (copied) * code/trunk/data/particle/bigexplosion1part2.particle (copied) * code/trunk/data/particle/bigexplosion1part3.particle (copied) * code/trunk/data/particle/emitted_emitter.particle (copied) * code/trunk/data/particle/engineglow.particle (copied) * code/trunk/data/particle/explosion1.particle (copied) * code/trunk/data/particle/explosion2.particle (copied) * code/trunk/data/particle/explosion2b.particle (copied) * code/trunk/data/particle/explosion3.particle (copied) * code/trunk/data/particle/fairytwirl.particle (copied) * code/trunk/data/particle/fire3.particle (copied) * code/trunk/data/particle/fire4.particle (copied) * code/trunk/data/particle/forcefield.particle (copied) * code/trunk/data/particle/ray1.particle (copied) * code/trunk/data/particle/ray2.particle (copied) * code/trunk/data/particle/repairGold.particle (copied) * code/trunk/data/particle/repairSilver.particle (copied) * code/trunk/data/particle/shot1.particle (copied) * code/trunk/data/particle/shot2.particle (copied) * code/trunk/data/particle/shot2_small.particle (copied) * code/trunk/data/particle/shot3_small.particle (copied) * code/trunk/data/particle/shotTest.particle (copied) * code/trunk/data/particle/smoke1.particle (copied) * code/trunk/data/particle/smoke2.particle (copied) * code/trunk/data/particle/smoke3.particle (copied) * code/trunk/data/particle/smoke4.particle (copied) * code/trunk/data/particle/smoke5.particle (copied) * code/trunk/data/particle/smoke6.particle (copied) * code/trunk/data/particle/smoke7.particle (copied) * code/trunk/data/particle/sparks.particle (copied) * code/trunk/data/particle/thruster1.particle (copied) * code/trunk/data/particle/thruster2.particle (copied) * code/trunk/data/particle/thruster3.particle (copied) * code/trunk/data/resources.oxr (copied) * code/trunk/data/tcl (copied) * code/trunk/data/tcl/init.tcl (copied) * code/trunk/data/tcl/irc.tcl (copied) * code/trunk/data/tcl/irk (copied) * code/trunk/data/tcl/irk/README (copied) * code/trunk/data/tcl/irk/docs (copied) * code/trunk/data/tcl/irk/docs/changes.txt (copied) * code/trunk/data/tcl/irk/docs/todo.txt (copied) * code/trunk/data/tcl/irk/docs/usage.txt (copied) * code/trunk/data/tcl/irk/examples (copied) * code/trunk/data/tcl/irk/examples/fortunebot.tcl (copied) * code/trunk/data/tcl/irk/examples/mysaint.tcl (copied) * code/trunk/data/tcl/irk/irk.tcl (copied) * code/trunk/data/tcl/irk/lib (copied) * code/trunk/data/tcl/irk/lib/irkauth.tcl (copied) * code/trunk/data/tcl/irk/lib/irkcommand.tcl (copied) * code/trunk/data/tcl/irk/lib/irkconnect.tcl (copied) * code/trunk/data/tcl/irk/lib/irkctcptcl.tcl (copied) * code/trunk/data/tcl/irk/lib/irkdispatch.tcl (copied) * code/trunk/data/tcl/irk/lib/irkflow.tcl (copied) * code/trunk/data/tcl/irk/lib/irkqueue.tcl (copied) * code/trunk/data/tcl/irk/lib/irkreceive.tcl (copied) * code/trunk/data/tcl/irk/lib/irkservers.tcl (copied) * code/trunk/data/tcl/irk/lib/irkstate.tcl (copied) * code/trunk/data/tcl/irk/lib/irkutil.tcl (copied) * code/trunk/data/tcl/irk/pkgIndex.tcl (copied) * code/trunk/data/tcl/irk/socks (copied) * code/trunk/data/tcl/irk/socks/socks.tcl (copied) * code/trunk/data/tcl/remote.tcl (copied) * code/trunk/data/tcl/telnet_server.tcl (copied) * code/trunk/doc/api/CMakeLists.txt (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/OrxonoxConfig.cmake (copied) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/SpecialConfig.h.in (modified) * code/trunk/src/ceguilua/CMakeLists.txt (modified) * code/trunk/src/core/CMakeLists.txt (modified) * code/trunk/src/core/Clock.h (modified) * code/trunk/src/core/ConfigFileManager.cc (modified) * code/trunk/src/core/ConfigFileManager.h (modified) * code/trunk/src/core/ConfigValueContainer.h (modified) * code/trunk/src/core/Core.cc (modified) * code/trunk/src/core/Core.h (modified) * code/trunk/src/core/CorePrereqs.h (modified) * code/trunk/src/core/DynLibManager.h (modified) * code/trunk/src/core/GUIManager.cc (modified) * code/trunk/src/core/GUIManager.h (modified) * code/trunk/src/core/Game.cc (modified) * code/trunk/src/core/Game.h (modified) * code/trunk/src/core/GraphicsManager.cc (modified) * code/trunk/src/core/GraphicsManager.h (modified) * code/trunk/src/core/Identifier.cc (modified) * code/trunk/src/core/Identifier.h (modified) * code/trunk/src/core/Loader.cc (modified) * code/trunk/src/core/Loader.h (modified) * code/trunk/src/core/LuaBind.cc (deleted) * code/trunk/src/core/LuaBind.h (deleted) * code/trunk/src/core/LuaState.cc (copied) * code/trunk/src/core/LuaState.h (copied) * code/trunk/src/core/MemoryArchive.cc (copied) * code/trunk/src/core/MemoryArchive.h (copied) * code/trunk/src/core/Resource.cc (copied) * code/trunk/src/core/Resource.h (copied) * code/trunk/src/core/TclBind.cc (modified) * code/trunk/src/core/TclThreadManager.cc (modified) * code/trunk/src/core/ToluaInterface.h (copied) * code/trunk/src/core/XMLFile.h (modified) * code/trunk/src/core/input/Button.cc (modified) * code/trunk/src/core/input/InputManager.cc (modified) * code/trunk/src/core/input/InputManager.h (modified) * code/trunk/src/core/input/InputState.cc (modified) * code/trunk/src/core/input/InputState.h (modified) * code/trunk/src/core/input/KeyBinder.cc (modified) * code/trunk/src/core/input/KeyBinder.h (modified) * code/trunk/src/core/input/KeyDetector.cc (modified) * code/trunk/src/network/CMakeLists.txt (modified) * code/trunk/src/network/ClientInformation.h (modified) * code/trunk/src/network/TODO (modified) * code/trunk/src/network/packet/CMakeLists.txt (modified) * code/trunk/src/network/synchronisable/CMakeLists.txt (modified) * code/trunk/src/ois/OISEffect.cpp (modified) * code/trunk/src/ois/OISEffect.h (modified) * code/trunk/src/ois/OISForceFeedback.cpp (modified) * code/trunk/src/ois/OISForceFeedback.h (modified) * code/trunk/src/ois/OISJoyStick.h (modified) * code/trunk/src/ois/OISPrereqs.h (modified) * code/trunk/src/ois/changes_orxonox.diff (modified) * code/trunk/src/ois/linux/EventHelpers.cpp (modified) * code/trunk/src/ois/linux/EventHelpers.h (modified) * code/trunk/src/ois/linux/LinuxForceFeedback.cpp (modified) * code/trunk/src/ois/linux/LinuxForceFeedback.h (modified) * code/trunk/src/ois/linux/LinuxJoyStickEvents.cpp (modified) * code/trunk/src/ois/win32/Win32ForceFeedback.cpp (modified) * code/trunk/src/ois/win32/Win32ForceFeedback.h (modified) * code/trunk/src/ois/win32/Win32InputManager.cpp (modified) * code/trunk/src/ois/win32/Win32InputManager.h (modified) * code/trunk/src/ois/win32/Win32JoyStick.cpp (modified) * code/trunk/src/ois/win32/Win32JoyStick.h (modified) * code/trunk/src/ois/win32/Win32KeyBoard.cpp (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) * code/trunk/src/orxonox/gamestates/GSGraphics.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/objects/Level.cc (modified) * code/trunk/src/orxonox/objects/Script.cc (modified) * code/trunk/src/orxonox/objects/Script.h (modified) * code/trunk/src/orxonox/orxonox-main.vcproj.user.in (modified) * code/trunk/src/orxonox/sound/SoundBase.cc (modified) * code/trunk/src/orxonox/sound/SoundBase.h (modified) * code/trunk/src/orxonox/tools/CMakeLists.txt (modified) * code/trunk/src/orxonox/tools/Mesh.cc (modified) * code/trunk/src/orxonox/tools/ResourceCollection.cc (copied) * code/trunk/src/orxonox/tools/ResourceCollection.h (copied) * code/trunk/src/orxonox/tools/ResourceLocation.cc (copied) * code/trunk/src/orxonox/tools/ResourceLocation.h (copied) * code/trunk/src/util/CMakeLists.txt (modified) * code/trunk/src/util/Debug.h (modified) Merged resource2 branch back to trunk. IMPORTANT NOTE: Upon this ...