# # ChangeLog for code/branches/libraries2/src # # Generated by Trac 1.0.9 # Nov 26, 2024, 7:53:55 PM Mon, 31 Aug 2009 22:14:43 GMT landauf [5734] * code/branches/libraries2/src/orxonox/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/GlobalShader.cc (copied) * code/branches/libraries2/src/orxonox/GlobalShader.h (copied) * code/branches/libraries2/src/orxonox/Level.cc (copied) * code/branches/libraries2/src/orxonox/Level.h (copied) * code/branches/libraries2/src/orxonox/Radar.cc (copied) * code/branches/libraries2/src/orxonox/Radar.h (copied) * code/branches/libraries2/src/orxonox/Scene.cc (copied) * code/branches/libraries2/src/orxonox/Scene.h (copied) * code/branches/libraries2/src/orxonox/Test.cc (copied) * code/branches/libraries2/src/orxonox/Test.h (copied) * code/branches/libraries2/src/orxonox/collisionshapes (copied) * code/branches/libraries2/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc (deleted) * code/branches/libraries2/src/orxonox/objects/collisionshapes/BoxCollisionShape.h (deleted) * code/branches/libraries2/src/orxonox/collisionshapes/CMakeLists.txt (copied) * code/branches/libraries2/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc (deleted) * code/branches/libraries2/src/orxonox/objects/collisionshapes/ConeCollisionShape.h (deleted) * code/branches/libraries2/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc (deleted) * code/branches/libraries2/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h (deleted) * code/branches/libraries2/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc (deleted) * code/branches/libraries2/src/orxonox/objects/collisionshapes/SphereCollisionShape.h (deleted) * code/branches/libraries2/src/orxonox/controllers (copied) * code/branches/libraries2/src/orxonox/controllers/HumanController.cc (copied) * code/branches/libraries2/src/orxonox/gametypes (copied) * code/branches/libraries2/src/orxonox/infos (copied) * code/branches/libraries2/src/orxonox/items (copied) * code/branches/libraries2/src/orxonox/objects (deleted) * code/branches/libraries2/src/orxonox/pickup (copied) * code/branches/libraries2/src/orxonox/weaponsystem (copied) * code/branches/libraries2/src/orxonox/worldentities (copied) * code/branches/libraries2/src/orxonox/objects/worldentities/Attacher.cc (deleted) * code/branches/libraries2/src/orxonox/objects/worldentities/Attacher.h (deleted) * code/branches/libraries2/src/orxonox/worldentities/CMakeLists.txt (copied) * code/branches/libraries2/src/orxonox/objects/worldentities/ForceField.cc (deleted) * code/branches/libraries2/src/orxonox/objects/worldentities/ForceField.h (deleted) * code/branches/libraries2/src/orxonox/objects/worldentities/Planet.cc (deleted) * code/branches/libraries2/src/orxonox/objects/worldentities/Planet.h (deleted) * code/branches/libraries2/src/orxonox/objects/worldentities/triggers (deleted) Moved all files and subdirectories from orxonox/objects to orxonox ... Mon, 31 Aug 2009 22:04:50 GMT landauf [5733] * code/branches/libraries2/src/CMakeLists.txt (modified) * code/branches/libraries2/src/Orxonox.cc (moved) * code/branches/libraries2/src/orxonox/CMakeLists.txt (modified) Moved the Orxonox executable to the root of the src directory Mon, 31 Aug 2009 20:51:36 GMT landauf [5732] * code/branches/libraries2/src/modules/gamestates/GSGraphics.cc (modified) * code/branches/libraries2/src/orxonox/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/interfaces/RadarViewable.cc (modified) * code/branches/libraries2/src/orxonox/objects/controllers/HumanController.cc (modified) * code/branches/libraries2/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/overlays/InGameConsole.cc (moved) * code/branches/libraries2/src/orxonox/overlays/InGameConsole.h (moved) * code/branches/libraries2/src/orxonox/overlays/Map.cc (moved) * code/branches/libraries2/src/orxonox/overlays/Map.h (moved) moved InGameConsole and Map into the overlays folder Mon, 31 Aug 2009 20:45:15 GMT landauf [5731] * code/branches/libraries2/src/modules/questsystem (modified) removed mergeinfo property Mon, 31 Aug 2009 20:38:48 GMT landauf [5730] * code/branches/libraries2/src/modules/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/objects/Attacher.h (modified) * code/branches/libraries2/src/modules/objects/CMakeLists.txt (added) * code/branches/libraries2/src/modules/objects/ForceField.h (modified) * code/branches/libraries2/src/modules/objects/ObjectsPrereqs.h (added) * code/branches/libraries2/src/modules/objects/Planet.cc (modified) * code/branches/libraries2/src/modules/objects/Planet.h (modified) * code/branches/libraries2/src/modules/objects/Script.h (modified) * code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/branches/libraries2/src/modules/objects/collisionshapes/CMakeLists.txt (added) * code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/branches/libraries2/src/modules/objects/eventsystem/CMakeLists.txt (added) * code/branches/libraries2/src/modules/objects/eventsystem/EventDispatcher.h (modified) * code/branches/libraries2/src/modules/objects/eventsystem/EventListener.h (modified) * code/branches/libraries2/src/modules/objects/eventsystem/EventTarget.h (modified) * code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/objects/triggers/CheckPoint.h (modified) * code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/branches/libraries2/src/modules/objects/triggers/EventTrigger.h (modified) * code/branches/libraries2/src/modules/objects/triggers/Trigger.h (modified) * code/branches/libraries2/src/modules/weapons/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h (modified) Added CMakeLists, ObjectsPrereqs.h and _ObjectsExport Changed Paths ... Mon, 31 Aug 2009 19:30:55 GMT landauf [5728] * code/branches/libraries2/src/modules/objects (added) * code/branches/libraries2/src/modules/objects/Attacher.cc (moved) * code/branches/libraries2/src/modules/objects/Attacher.h (moved) * code/branches/libraries2/src/modules/objects/ForceField.cc (moved) * code/branches/libraries2/src/modules/objects/ForceField.h (moved) * code/branches/libraries2/src/modules/objects/Planet.cc (moved) * code/branches/libraries2/src/modules/objects/Planet.h (moved) * code/branches/libraries2/src/modules/objects/Script.cc (moved) * code/branches/libraries2/src/modules/objects/Script.h (moved) * code/branches/libraries2/src/modules/objects/collisionshapes (added) * code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.cc (moved) * code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h (moved) * code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.cc (moved) * code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h (moved) * code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (moved) * code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h (moved) * code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.cc (moved) * code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h (moved) * code/branches/libraries2/src/modules/objects/eventsystem (added) * code/branches/libraries2/src/modules/objects/eventsystem/EventDispatcher.cc (moved) * code/branches/libraries2/src/modules/objects/eventsystem/EventDispatcher.h (moved) * code/branches/libraries2/src/modules/objects/eventsystem/EventListener.cc (moved) * code/branches/libraries2/src/modules/objects/eventsystem/EventListener.h (moved) * code/branches/libraries2/src/modules/objects/eventsystem/EventTarget.cc (moved) * code/branches/libraries2/src/modules/objects/eventsystem/EventTarget.h (moved) * code/branches/libraries2/src/modules/objects/triggers (moved) * code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt (copied) * code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc (copied) * code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h (copied) * code/branches/libraries2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc (deleted) * code/branches/libraries2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (deleted) * code/branches/libraries2/src/orxonox/objects/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/objects/collisionshapes/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/objects/worldentities/CMakeLists.txt (modified) Added a new module for unconnected object classes and/or ... Mon, 31 Aug 2009 19:18:17 GMT landauf [5727] * code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/libraries2/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/libraries2/src/orxonox/interfaces/PlayerTrigger.h (moved) * code/branches/libraries2/src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) * code/branches/libraries2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc (deleted) PlayerTrigger is now an interface instead of a child of Trigger. ... Mon, 31 Aug 2009 18:23:07 GMT landauf [5725] * code/branches/libraries2/src/modules/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/pong (added) * code/branches/libraries2/src/modules/pong/CMakeLists.txt (added) * code/branches/libraries2/src/modules/pong/Pong.cc (moved) * code/branches/libraries2/src/modules/pong/Pong.h (moved) * code/branches/libraries2/src/modules/pong/PongAI.cc (moved) * code/branches/libraries2/src/modules/pong/PongAI.h (moved) * code/branches/libraries2/src/modules/pong/PongBall.cc (moved) * code/branches/libraries2/src/modules/pong/PongBall.h (moved) * code/branches/libraries2/src/modules/pong/PongBat.cc (moved) * code/branches/libraries2/src/modules/pong/PongBat.h (moved) * code/branches/libraries2/src/modules/pong/PongBot.cc (moved) * code/branches/libraries2/src/modules/pong/PongBot.h (moved) * code/branches/libraries2/src/modules/pong/PongCenterpoint.cc (moved) * code/branches/libraries2/src/modules/pong/PongCenterpoint.h (moved) * code/branches/libraries2/src/modules/pong/PongPrereqs.h (added) * code/branches/libraries2/src/modules/pong/PongScore.cc (moved) * code/branches/libraries2/src/modules/pong/PongScore.h (moved) * code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h (modified) * code/branches/libraries2/src/orxonox/objects/controllers/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/objects/gametypes/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/objects/infos/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/objects/worldentities/CMakeLists.txt (modified) added a new module for the pong gametype and all related classes Mon, 31 Aug 2009 16:08:26 GMT landauf [5724] * code/branches/libraries2/src/modules/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/weapons/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/weapons/MuzzleFlash.h (modified) * code/branches/libraries2/src/modules/weapons/WeaponsPrereqs.h (moved) * code/branches/libraries2/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/weapons/munitions/FusionMunition.h (modified) * code/branches/libraries2/src/modules/weapons/munitions/LaserMunition.h (modified) * code/branches/libraries2/src/modules/weapons/munitions/ReplenishingMunition.h (modified) * code/branches/libraries2/src/modules/weapons/projectiles/BillboardProjectile.h (modified) * code/branches/libraries2/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/weapons/projectiles/LightningGunProjectile.h (modified) * code/branches/libraries2/src/modules/weapons/projectiles/ParticleProjectile.h (modified) * code/branches/libraries2/src/modules/weapons/projectiles/Projectile.h (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/EnergyDrink.h (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/FusionFire.h (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/HsW01.h (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/LaserFire.h (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/libraries2/src/modules/weapons/weaponmodes/LightningGun.h (modified) * code/branches/libraries2/src/orxonox/objects/weaponsystem/CMakeLists.txt (modified) moved WeaponsystemPrereqs.h to the weapons module too, renamed as ... Mon, 31 Aug 2009 15:50:17 GMT landauf [5723] * code/branches/libraries2/src/modules/weapons (added) * code/branches/libraries2/src/modules/weapons/CMakeLists.txt (copied) * code/branches/libraries2/src/modules/weapons/MuzzleFlash.cc (moved) * code/branches/libraries2/src/modules/weapons/MuzzleFlash.h (moved) * code/branches/libraries2/src/modules/weapons/munitions (moved) * code/branches/libraries2/src/modules/weapons/projectiles (moved) * code/branches/libraries2/src/modules/weapons/weaponmodes (moved) added weapons directory in modules, moved weapon classes ... Mon, 31 Aug 2009 15:37:33 GMT landauf [5722] * code/branches/libraries2/src/modules/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/questsystem/AddQuest.h (modified) * code/branches/libraries2/src/modules/questsystem/AddQuestHint.h (modified) * code/branches/libraries2/src/modules/questsystem/AddReward.h (modified) * code/branches/libraries2/src/modules/questsystem/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/questsystem/ChangeQuestStatus.h (modified) * code/branches/libraries2/src/modules/questsystem/CompleteQuest.h (modified) * code/branches/libraries2/src/modules/questsystem/FailQuest.h (modified) * code/branches/libraries2/src/modules/questsystem/GlobalQuest.h (modified) * code/branches/libraries2/src/modules/questsystem/LocalQuest.h (modified) * code/branches/libraries2/src/modules/questsystem/Quest.h (modified) * code/branches/libraries2/src/modules/questsystem/QuestDescription.h (modified) * code/branches/libraries2/src/modules/questsystem/QuestEffect.h (modified) * code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/branches/libraries2/src/modules/questsystem/QuestHint.h (modified) * code/branches/libraries2/src/modules/questsystem/QuestItem.h (modified) * code/branches/libraries2/src/modules/questsystem/QuestListener.h (modified) * code/branches/libraries2/src/modules/questsystem/QuestManager.h (modified) * code/branches/libraries2/src/modules/questsystem/QuestNotification.h (modified) * code/branches/libraries2/src/modules/questsystem/QuestsystemPrereqs.h (moved) * code/branches/libraries2/src/modules/questsystem/notifications/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/questsystem/notifications/Notification.h (modified) * code/branches/libraries2/src/modules/questsystem/notifications/NotificationManager.h (modified) * code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc (modified) * code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.h (modified) * code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.cc (modified) * code/branches/libraries2/src/modules/questsystem/notifications/NotificationQueue.h (modified) * code/branches/libraries2/src/orxonox/objects/CMakeLists.txt (modified) renamed QuestPrereqs.h as QuestsystemPrereqs.h and _QuestExport as ... Mon, 31 Aug 2009 15:18:51 GMT landauf [5721] * code/branches/libraries2/src/modules/questsystem (moved) moved questsystem to modules (doesn't compile atm) Mon, 31 Aug 2009 15:03:29 GMT landauf [5720] * code/branches/libraries2/src/modules/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/overlays (added) * code/branches/libraries2/src/modules/overlays/CMakeLists.txt (copied) * code/branches/libraries2/src/modules/overlays/FadeoutText.cc (moved) * code/branches/libraries2/src/modules/overlays/FadeoutText.h (moved) * code/branches/libraries2/src/modules/overlays/GUIOverlay.cc (moved) * code/branches/libraries2/src/modules/overlays/GUIOverlay.h (moved) * code/branches/libraries2/src/modules/overlays/OverlayText.cc (moved) * code/branches/libraries2/src/modules/overlays/OverlayText.h (moved) * code/branches/libraries2/src/modules/overlays/OverlaysPrereqs.h (moved) * code/branches/libraries2/src/modules/overlays/debug (moved) * code/branches/libraries2/src/modules/overlays/hud (moved) * code/branches/libraries2/src/modules/overlays/stats (moved) * code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) * code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.h (modified) * code/branches/libraries2/src/orxonox/objects/quest/notifications/NotificationOverlay.h (modified) * code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) * code/branches/libraries2/src/orxonox/overlays/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/sound/SoundBase.cc (modified) * code/branches/libraries2/src/orxonox/sound/SoundManager.cc (modified) moved overlays to modules Mon, 31 Aug 2009 14:45:12 GMT landauf [5719] * code/branches/libraries2/src/modules/CMakeLists.txt (modified) * code/branches/libraries2/src/modules/gamestates (moved) * code/branches/libraries2/src/orxonox/CMakeLists.txt (modified) moved gamestates to modules Mon, 31 Aug 2009 14:36:48 GMT landauf [5717] * code/branches/libraries2/src/libraries/CMakeLists.txt (modified) * code/branches/libraries2/src/libraries/tools (moved) * code/branches/libraries2/src/orxonox/CMakeLists.txt (modified) * code/branches/libraries2/src/orxonox/objects/pickup/ModifierPickup.h (modified) moved tools to libraries Mon, 31 Aug 2009 14:25:09 GMT landauf [5716] * code/branches/libraries2/src/CMakeLists.txt (modified) * code/branches/libraries2/src/external/CMakeLists.txt (added) * code/branches/libraries2/src/libraries/CMakeLists.txt (added) * code/branches/libraries2/src/modules/CMakeLists.txt (added) added CMakeLists, compiles now Mon, 31 Aug 2009 13:46:43 GMT landauf [5715] * code/branches/libraries2/src/external/bullet (modified) * code/branches/libraries2/src/external/ceguilua (modified) * code/branches/libraries2/src/external/cpptcl (modified) * code/branches/libraries2/src/external/ogreceguirenderer (modified) * code/branches/libraries2/src/external/ois (modified) * code/branches/libraries2/src/external/tinyxml (modified) * code/branches/libraries2/src/external/tolua (modified) * code/branches/libraries2/src/libraries/core (modified) * code/branches/libraries2/src/libraries/network (modified) * code/branches/libraries2/src/libraries/util (modified) removed mergeinfo properties Mon, 31 Aug 2009 13:35:32 GMT landauf [5714] * code/branches/libraries2/src/libraries/util (moved) moved util to libraries Mon, 31 Aug 2009 13:34:36 GMT landauf [5713] * code/branches/libraries2/src/libraries/network (moved) moved network to libraries Mon, 31 Aug 2009 13:33:31 GMT landauf [5712] * code/branches/libraries2/src/libraries/core (moved) moved core to libraries Mon, 31 Aug 2009 13:31:22 GMT landauf [5711] * code/branches/libraries2/src/external/tolua (moved) moved tolua to external Mon, 31 Aug 2009 13:28:52 GMT landauf [5710] * code/branches/libraries2/src/external/tinyxml (moved) moved tinyxml to external Mon, 31 Aug 2009 13:27:07 GMT landauf [5709] * code/branches/libraries2/src/external/ois (moved) moved ois to external Mon, 31 Aug 2009 13:25:51 GMT landauf [5708] * code/branches/libraries2/src/external/ogreceguirenderer (moved) moved ogreceguirenderer to external Mon, 31 Aug 2009 13:24:51 GMT landauf [5707] * code/branches/libraries2/src/external/ceguilua (moved) moved ceguilua to external Mon, 31 Aug 2009 13:23:05 GMT landauf [5706] * code/branches/libraries2/src/external/bullet (moved) moved bullet to external Mon, 31 Aug 2009 13:01:44 GMT landauf [5705] * code/branches/libraries2/src/external/cpptcl (moved) moved cpptcl to external Mon, 31 Aug 2009 12:53:59 GMT landauf [5704] * code/branches/libraries2/src/external (added) * code/branches/libraries2/src/libraries (added) * code/branches/libraries2/src/modules (added) added new source directories Mon, 31 Aug 2009 12:42:03 GMT landauf [5703] * code/branches/libraries2 (copied) created new branch to move libraries 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 ...