Changeset 9558 for code/branches/core6/src
- Timestamp:
- Mar 23, 2013, 8:42:47 PM (12 years ago)
- Location:
- code/branches/core6/src
- Files:
-
- 2 added
- 48 edited
- 5 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core6/src/libraries/core/CMakeLists.txt
r9557 r9558 23 23 ClassTreeMask.cc 24 24 CommandLineParser.cc 25 ConfigValueContainer.cc26 25 DynLib.cc 27 26 DynLibManager.cc … … 55 54 BUILD_UNIT FilesystemBuildUnit.cc 56 55 command/ArgumentCompletionFunctions.cc 57 ConfigFileManager.cc56 config/ConfigFileManager.cc 58 57 PathConfig.cc 59 58 END_BUILD_UNIT … … 67 66 68 67 ADD_SUBDIRECTORY(command) 68 ADD_SUBDIRECTORY(config) 69 69 ADD_SUBDIRECTORY(input) 70 70 ADD_SUBDIRECTORY(object) … … 74 74 TOLUA_FILES 75 75 command/CommandExecutor.h 76 ConfigFileManager.h76 config/ConfigFileManager.h 77 77 Game.h 78 78 GameMode.h -
code/branches/core6/src/libraries/core/Core.cc
r9557 r9558 61 61 #include "PathConfig.h" 62 62 #include "CommandLineParser.h" 63 #include " ConfigFileManager.h"64 #include " ConfigValueIncludes.h"63 #include "config/ConfigFileManager.h" 64 #include "config/ConfigValueIncludes.h" 65 65 #include "CoreIncludes.h" 66 66 #include "DynLibManager.h" -
code/branches/core6/src/libraries/core/GUIManager.cc
r9050 r9558 78 78 #include "util/OrxAssert.h" 79 79 #include "util/output/BaseWriter.h" 80 #include " ConfigValueIncludes.h"80 #include "config/ConfigValueIncludes.h" 81 81 #include "Core.h" 82 82 #include "CoreIncludes.h" -
code/branches/core6/src/libraries/core/Game.cc
r8861 r9558 47 47 #include "Core.h" 48 48 #include "CoreIncludes.h" 49 #include " ConfigValueIncludes.h"49 #include "config/ConfigValueIncludes.h" 50 50 #include "GameMode.h" 51 51 #include "GameState.h" -
code/branches/core6/src/libraries/core/GraphicsManager.cc
r8861 r9558 52 52 #include "util/StringUtils.h" 53 53 #include "util/SubString.h" 54 #include " ConfigValueIncludes.h"54 #include "config/ConfigValueIncludes.h" 55 55 #include "CoreIncludes.h" 56 56 #include "Core.h" -
code/branches/core6/src/libraries/core/Identifier.cc
r9557 r9558 37 37 38 38 #include "util/StringUtils.h" 39 #include " ConfigValueContainer.h"39 #include "config/ConfigValueContainer.h" 40 40 #include "XMLPort.h" 41 41 #include "object/ClassFactory.h" -
code/branches/core6/src/libraries/core/command/ArgumentCompletionFunctions.cc
r8858 r9558 40 40 #include "util/StringUtils.h" 41 41 #include "core/Identifier.h" 42 #include "core/ ConfigFileManager.h"43 #include "core/ ConfigValueContainer.h"42 #include "core/config/ConfigFileManager.h" 43 #include "core/config/ConfigValueContainer.h" 44 44 #include "CommandExecutor.h" 45 45 #include "ConsoleCommand.h" -
code/branches/core6/src/libraries/core/command/Shell.cc
r9550 r9558 40 40 #include "util/output/MemoryWriter.h" 41 41 #include "core/CoreIncludes.h" 42 #include "core/ ConfigFileManager.h"43 #include "core/ ConfigValueIncludes.h"42 #include "core/config/ConfigFileManager.h" 43 #include "core/config/ConfigValueIncludes.h" 44 44 #include "core/PathConfig.h" 45 45 #include "core/input/InputBuffer.h" -
code/branches/core6/src/libraries/core/config/ConfigFileManager.cc
r9552 r9558 39 39 #include "util/Math.h" 40 40 #include "util/StringUtils.h" 41 #include "core/PathConfig.h" 42 #include "core/command/ConsoleCommand.h" 41 43 #include "ConfigValueContainer.h" 42 #include "PathConfig.h"43 #include "command/ConsoleCommand.h"44 44 45 45 namespace orxonox -
code/branches/core6/src/libraries/core/config/ConfigFileManager.h
r9552 r9558 36 36 #define _ConfigFileManager_H__ 37 37 38 #include " CorePrereqs.h"38 #include "core/CorePrereqs.h" 39 39 40 40 #include <list> -
code/branches/core6/src/libraries/core/config/ConfigValueContainer.cc
r9552 r9558 36 36 #include "util/Convert.h" 37 37 #include "util/SubString.h" 38 #include "core/Language.h" 38 39 #include "ConfigFileManager.h" 39 #include "Language.h"40 40 41 41 namespace orxonox -
code/branches/core6/src/libraries/core/config/ConfigValueContainer.h
r9552 r9558 45 45 #define _ConfigValueContainer_H__ 46 46 47 #include " CorePrereqs.h"47 #include "core/CorePrereqs.h" 48 48 49 49 #include <string> … … 51 51 52 52 #include "util/MultiType.h" 53 #include " Identifier.h"53 #include "core/Identifier.h" 54 54 55 55 namespace orxonox -
code/branches/core6/src/libraries/core/config/ConfigValueIncludes.h
r9552 r9558 101 101 #define _ConfigValueIncludes_H__ 102 102 103 #include " CorePrereqs.h"104 105 #include " Identifier.h"103 #include "core/CorePrereqs.h" 104 105 #include "core/Identifier.h" 106 106 #include "ConfigValueContainer.h" 107 107 -
code/branches/core6/src/libraries/core/input/Button.cc
r8858 r9558 42 42 #include "core/command/CommandEvaluation.h" 43 43 #include "core/command/CommandExecutor.h" 44 #include "core/ ConfigFileManager.h"44 #include "core/config/ConfigFileManager.h" 45 45 46 46 namespace orxonox -
code/branches/core6/src/libraries/core/input/InputBuffer.cc
r6417 r9558 31 31 #include "util/Clipboard.h" 32 32 #include "core/CoreIncludes.h" 33 #include "core/ ConfigValueIncludes.h"33 #include "core/config/ConfigValueIncludes.h" 34 34 35 35 namespace orxonox -
code/branches/core6/src/libraries/core/input/InputManager.cc
r9550 r9558 46 46 #include "util/Exception.h" 47 47 #include "core/CoreIncludes.h" 48 #include "core/ ConfigValueIncludes.h"48 #include "core/config/ConfigValueIncludes.h" 49 49 #include "core/CommandLineParser.h" 50 50 #include "core/GraphicsManager.h" -
code/branches/core6/src/libraries/core/input/JoyStick.cc
r8858 r9558 34 34 35 35 #include "util/StringUtils.h" 36 #include "core/ ConfigFileManager.h"37 #include "core/ ConfigValueIncludes.h"36 #include "core/config/ConfigFileManager.h" 37 #include "core/config/ConfigValueIncludes.h" 38 38 #include "core/CoreIncludes.h" 39 39 #include "util/Convert.h" -
code/branches/core6/src/libraries/core/input/KeyBinder.cc
r8858 r9558 34 34 #include "util/Output.h" 35 35 #include "util/Exception.h" 36 #include "core/ConfigValueIncludes.h"37 36 #include "core/CoreIncludes.h" 38 #include "core/ConfigFileManager.h" 37 #include "core/config/ConfigValueIncludes.h" 38 #include "core/config/ConfigFileManager.h" 39 39 #include "core/PathConfig.h" 40 40 #include "InputCommands.h" -
code/branches/core6/src/libraries/core/input/KeyBinderManager.cc
r8858 r9558 32 32 #include "util/Exception.h" 33 33 #include "util/ScopedSingletonManager.h" 34 #include "core/ ConfigValueIncludes.h"34 #include "core/config/ConfigValueIncludes.h" 35 35 #include "core/CoreIncludes.h" 36 36 #include "core/LuaState.h" -
code/branches/core6/src/libraries/network/TrafficControl.cc
r8858 r9558 33 33 34 34 #include "core/CoreIncludes.h" 35 #include "core/ ConfigValueIncludes.h"35 #include "core/config/ConfigValueIncludes.h" 36 36 #include "synchronisable/Synchronisable.h" 37 37 -
code/branches/core6/src/libraries/network/WANDiscoverable.cc
r8858 r9558 33 33 34 34 #include "MasterServerProtocol.h" 35 #include "core/ ConfigValueIncludes.h"35 #include "core/config/ConfigValueIncludes.h" 36 36 #include "core/CoreIncludes.h" 37 37 -
code/branches/core6/src/libraries/network/WANDiscovery.h
r8858 r9558 31 31 #include "NetworkPrereqs.h" 32 32 #include "packet/ServerInformation.h" 33 #include "core/Co nfigFileManager.h"33 #include "core/CoreIncludes.h" 34 34 #include "core/OrxonoxClass.h" 35 #include "core/ ConfigValueIncludes.h"36 #include "core/ CoreIncludes.h"35 #include "core/config/ConfigFileManager.h" 36 #include "core/config/ConfigValueIncludes.h" 37 37 #include "MasterServerComm.h" 38 38 #include "MasterServerProtocol.h" -
code/branches/core6/src/libraries/tools/ParticleInterface.cc
r8858 r9558 43 43 #include "util/Math.h" 44 44 #include "core/CoreIncludes.h" 45 #include "core/ ConfigValueIncludes.h"45 #include "core/config/ConfigValueIncludes.h" 46 46 #include "core/GameMode.h" 47 47 -
code/branches/core6/src/modules/designtools/ScreenshotManager.cc
r8858 r9558 42 42 #include <OgreViewport.h> 43 43 44 #include "core/ ConfigValueIncludes.h"44 #include "core/config/ConfigValueIncludes.h" 45 45 #include "core/GraphicsManager.h" 46 46 #include "core/PathConfig.h" -
code/branches/core6/src/modules/designtools/SkyboxGenerator.cc
r8858 r9558 40 40 #include "util/ScopedSingletonManager.h" 41 41 #include "core/CoreIncludes.h" 42 #include "core/ ConfigValueIncludes.h"42 #include "core/config/ConfigValueIncludes.h" 43 43 #include "core/GraphicsManager.h" 44 44 #include "core/PathConfig.h" -
code/branches/core6/src/modules/overlays/hud/ChatOverlay.cc
r8858 r9558 35 35 #include "util/DisplayStringConversions.h" 36 36 #include "core/CoreIncludes.h" 37 #include "core/ ConfigValueIncludes.h"37 #include "core/config/ConfigValueIncludes.h" 38 38 #include "core/command/Executor.h" 39 39 -
code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.cc
r9348 r9558 29 29 #include "HUDEnemyHealthBar.h" 30 30 31 #include "core/ ConfigValueIncludes.h"31 #include "core/config/ConfigValueIncludes.h" 32 32 #include "worldentities/pawns/Pawn.h" 33 33 -
code/branches/core6/src/modules/overlays/hud/HUDNavigation.cc
r9526 r9558 51 51 #include "worldentities/pawns/Pawn.h" 52 52 #include "worldentities/WorldEntity.h" 53 #include "core/ ConfigValueIncludes.h"53 #include "core/config/ConfigValueIncludes.h" 54 54 #include "tools/TextureGenerator.h" 55 55 // #include <boost/bind/bind_template.hpp> -
code/branches/core6/src/modules/overlays/stats/Stats.cc
r7401 r9558 35 35 #include "util/StringUtils.h" 36 36 #include "core/CoreIncludes.h" 37 #include "core/ ConfigValueIncludes.h"37 #include "core/config/ConfigValueIncludes.h" 38 38 39 39 namespace orxonox -
code/branches/core6/src/modules/pong/Pong.cc
r9348 r9558 37 37 #include "core/EventIncludes.h" 38 38 #include "core/command/Executor.h" 39 #include "core/ ConfigValueIncludes.h"39 #include "core/config/ConfigValueIncludes.h" 40 40 41 41 #include "gamestates/GSLevel.h" -
code/branches/core6/src/modules/pong/PongAI.cc
r8952 r9558 35 35 36 36 #include "core/CoreIncludes.h" 37 #include "core/ ConfigValueIncludes.h"37 #include "core/config/ConfigValueIncludes.h" 38 38 #include "core/command/Executor.h" 39 39 #include "tools/Timer.h" -
code/branches/core6/src/modules/weapons/projectiles/Projectile.cc
r8855 r9558 34 34 #include "Projectile.h" 35 35 36 #include "core/ ConfigValueIncludes.h"36 #include "core/config/ConfigValueIncludes.h" 37 37 #include "core/CoreIncludes.h" 38 38 #include "core/GameMode.h" -
code/branches/core6/src/orxonox/LevelManager.cc
r9550 r9558 39 39 #include "core/ClassTreeMask.h" 40 40 #include "core/CommandLineParser.h" 41 #include "core/ ConfigValueIncludes.h"41 #include "core/config/ConfigValueIncludes.h" 42 42 #include "core/CoreIncludes.h" 43 43 #include "core/Loader.h" -
code/branches/core6/src/orxonox/MoodManager.cc
r8858 r9558 30 30 31 31 #include "util/ScopedSingletonManager.h" 32 #include "core/ ConfigValueIncludes.h"32 #include "core/config/ConfigValueIncludes.h" 33 33 #include "core/CoreIncludes.h" 34 34 #include "core/Resource.h" -
code/branches/core6/src/orxonox/Test.cc
r8858 r9558 28 28 29 29 #include "core/CoreIncludes.h" 30 #include "core/ ConfigValueIncludes.h"30 #include "core/config/ConfigValueIncludes.h" 31 31 #include "core/command/ConsoleCommand.h" 32 32 #include "network/NetworkFunction.h" -
code/branches/core6/src/orxonox/gamestates/GSMainMenu.cc
r8858 r9558 31 31 #include <OgreSceneManager.h> 32 32 33 #include "core/ ConfigValueIncludes.h"33 #include "core/config/ConfigValueIncludes.h" 34 34 #include "core/CoreIncludes.h" 35 35 #include "core/Game.h" -
code/branches/core6/src/orxonox/gametypes/Dynamicmatch.cc
r9348 r9558 54 54 #include "worldentities/pawns/Pawn.h" 55 55 #include "worldentities/pawns/SpaceShip.h" 56 #include "core/ ConfigValueIncludes.h"56 #include "core/config/ConfigValueIncludes.h" 57 57 #include "interfaces/TeamColourable.h" 58 58 #include "items/Engine.h" -
code/branches/core6/src/orxonox/gametypes/Gametype.cc
r9348 r9558 32 32 #include "core/Core.h" 33 33 #include "core/CoreIncludes.h" 34 #include "core/ ConfigValueIncludes.h"34 #include "core/config/ConfigValueIncludes.h" 35 35 #include "core/GameMode.h" 36 36 #include "core/command/ConsoleCommand.h" -
code/branches/core6/src/orxonox/gametypes/LastManStanding.cc
r9348 r9558 33 33 #include "infos/PlayerInfo.h" 34 34 #include "worldentities/pawns/Pawn.h" 35 #include "core/ ConfigValueIncludes.h"35 #include "core/config/ConfigValueIncludes.h" 36 36 #include "util/Convert.h" 37 37 -
code/branches/core6/src/orxonox/gametypes/LastTeamStanding.cc
r9348 r9558 33 33 #include "infos/PlayerInfo.h" 34 34 #include "worldentities/pawns/Pawn.h" 35 #include "core/ ConfigValueIncludes.h"35 #include "core/config/ConfigValueIncludes.h" 36 36 #include "util/Convert.h" 37 37 -
code/branches/core6/src/orxonox/gametypes/TeamGametype.cc
r9348 r9558 30 30 31 31 #include "core/CoreIncludes.h" 32 #include "core/ ConfigValueIncludes.h"32 #include "core/config/ConfigValueIncludes.h" 33 33 #include "infos/PlayerInfo.h" 34 34 #include "interfaces/TeamColourable.h" -
code/branches/core6/src/orxonox/gametypes/UnderAttack.cc
r9348 r9558 31 31 #include "util/Convert.h" 32 32 #include "core/CoreIncludes.h" 33 #include "core/ ConfigValueIncludes.h"33 #include "core/config/ConfigValueIncludes.h" 34 34 #include "chat/ChatManager.h" 35 35 #include "worldentities/pawns/Destroyer.h" -
code/branches/core6/src/orxonox/graphics/Camera.cc
r8706 r9558 37 37 #include "util/StringUtils.h" 38 38 #include "core/CoreIncludes.h" 39 #include "core/ ConfigValueIncludes.h"39 #include "core/config/ConfigValueIncludes.h" 40 40 #include "core/GameMode.h" 41 41 #include "core/GUIManager.h" -
code/branches/core6/src/orxonox/graphics/Model.cc
r8858 r9558 32 32 33 33 #include "core/CoreIncludes.h" 34 #include "core/ ConfigValueIncludes.h"34 #include "core/config/ConfigValueIncludes.h" 35 35 #include "core/GameMode.h" 36 36 #include "core/XMLPort.h" -
code/branches/core6/src/orxonox/infos/Bot.cc
r7801 r9558 32 32 #include "core/GameMode.h" 33 33 #include "core/CoreIncludes.h" 34 #include "core/ ConfigValueIncludes.h"34 #include "core/config/ConfigValueIncludes.h" 35 35 #include "gametypes/Gametype.h" 36 36 #include "controllers/AIController.h" -
code/branches/core6/src/orxonox/infos/HumanPlayer.cc
r8327 r9558 30 30 31 31 #include "core/CoreIncludes.h" 32 #include "core/ ConfigValueIncludes.h"32 #include "core/config/ConfigValueIncludes.h" 33 33 #include "core/GameMode.h" 34 34 // #include "network/ClientInformation.h" -
code/branches/core6/src/orxonox/items/Engine.cc
r8858 r9558 30 30 31 31 #include "core/CoreIncludes.h" 32 #include "core/ ConfigValueIncludes.h"32 #include "core/config/ConfigValueIncludes.h" 33 33 #include "core/Template.h" 34 34 #include "core/XMLPort.h" -
code/branches/core6/src/orxonox/overlays/InGameConsole.cc
r9550 r9558 49 49 #include "util/output/OutputManager.h" 50 50 #include "core/CoreIncludes.h" 51 #include "core/ ConfigValueIncludes.h"51 #include "core/config/ConfigValueIncludes.h" 52 52 #include "core/command/ConsoleCommand.h" 53 53 #include "core/GUIManager.h" -
code/branches/core6/src/orxonox/sound/SoundManager.cc
r8903 r9558 39 39 #include "util/Clock.h" 40 40 #include "util/ScopedSingletonManager.h" 41 #include "core/ ConfigValueIncludes.h"41 #include "core/config/ConfigValueIncludes.h" 42 42 #include "core/CoreIncludes.h" 43 43 #include "core/GameMode.h" -
code/branches/core6/src/orxonox/worldentities/ControllableEntity.cc
r9348 r9558 33 33 34 34 #include "core/CoreIncludes.h" 35 #include "core/ ConfigValueIncludes.h"35 #include "core/config/ConfigValueIncludes.h" 36 36 #include "core/GameMode.h" 37 37 #include "core/XMLPort.h" -
code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.cc
r9016 r9558 38 38 39 39 #include "core/CoreIncludes.h" 40 #include "core/ ConfigValueIncludes.h"40 #include "core/config/ConfigValueIncludes.h" 41 41 #include "core/Template.h" 42 42 #include "core/XMLPort.h" -
code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc
r9348 r9558 32 32 33 33 #include "core/CoreIncludes.h" 34 #include "core/ ConfigValueIncludes.h"34 #include "core/config/ConfigValueIncludes.h" 35 35 #include "core/Template.h" 36 36 #include "core/XMLPort.h" -
code/branches/core6/src/orxonox/worldentities/pawns/Spectator.cc
r7863 r9558 31 31 #include "util/Convert.h" 32 32 #include "core/CoreIncludes.h" 33 #include "core/ ConfigValueIncludes.h"33 #include "core/config/ConfigValueIncludes.h" 34 34 #include "core/GameMode.h" 35 35 #include "core/command/CommandExecutor.h"
Note: See TracChangeset
for help on using the changeset viewer.