# # ChangeLog for code # # Generated by Trac 1.0.9 # Nov 18, 2024, 6:34:07 PM Mon, 25 Jul 2011 18:03:05 GMT landauf [8780] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/output/ConsoleWriter.cc (added) * code/branches/output/src/libraries/util/output/ConsoleWriter.h (added) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) added ConsoleWriter Mon, 25 Jul 2011 16:28:57 GMT landauf [8779] * code/branches/output/src/libraries/util/Output.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) small changes regarding context functions and orxout() Mon, 25 Jul 2011 13:00:29 GMT landauf [8778] * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) guess we can afford a small macro in this case Mon, 25 Jul 2011 12:47:49 GMT landauf [8777] * code/branches/output/src/libraries/util/Output.h (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) output contexts are now defined as functions instead of global ... Mon, 25 Jul 2011 11:05:04 GMT landauf [8776] * code/branches/output/src/libraries/util/output/LogWriter.cc (modified) * code/branches/output/src/libraries/util/output/MemoryWriter.cc (modified) * code/branches/output/src/libraries/util/output/OutputListener.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.cc (modified) in OutputManager: getInstance now only creates an instance of ... Sun, 24 Jul 2011 22:01:30 GMT landauf [8775] * code/branches/output/src/libraries/util/OutputHandler.cc (modified) fixed problem with static initialization in old implementation of the ... Sun, 24 Jul 2011 21:50:20 GMT landauf [8774] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/output/LogWriter.cc (added) * code/branches/output/src/libraries/util/output/LogWriter.h (added) * code/branches/output/src/libraries/util/output/MemoryWriter.cc (added) * code/branches/output/src/libraries/util/output/MemoryWriter.h (added) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputListener.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) added LogWriter and MemoryWriter Sun, 24 Jul 2011 20:40:19 GMT jo [8773] * code/branches/ai2/data/levels/missionOne.oxw (added) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) Just to show a bug in the level. Sun, 24 Jul 2011 14:09:41 GMT landauf [8772] * code/branches/output/src/libraries/util/output/OutputListener.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) send the lines of a message as a vector to the output listeners Sat, 23 Jul 2011 23:22:11 GMT landauf [8771] * code/branches/output/src/libraries/util/output/OutputDefinitions.h (modified) * code/branches/output/src/libraries/util/output/OutputManager.cc (modified) * code/branches/output/src/libraries/util/output/OutputManager.h (modified) * code/branches/output/src/libraries/util/output/OutputStream.h (modified) added function to register new output contexts. OutputManager owns ... Thu, 21 Jul 2011 16:07:00 GMT jo [8770] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) That was no English :-). Now worldentities can be identified and ... Thu, 21 Jul 2011 15:36:37 GMT jo [8769] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/controllers/WaypointController.cc (modified) * code/branches/ai2/src/orxonox/controllers/WaypointController.h (modified) Moved intern waypoint functionallity from the waypointController to ... Wed, 20 Jul 2011 21:27:53 GMT dafrick [8768] * code/branches/portals (deleted) * code/branches/portals2 (deleted) * code/branches/spaceboundaries (deleted) * code/branches/spaceboundaries2 (deleted) * code/branches/spacerace (deleted) * code/branches/steering (deleted) * code/branches/tetris (deleted) * code/branches/tutoriallevel (deleted) * code/branches/tutoriallevel2 (deleted) * code/branches/tutoriallevel3 (deleted) * code/branches/weapons (deleted) Removing obsolete branches. Wed, 20 Jul 2011 21:27:45 GMT dafrick [8767] * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (modified) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (modified) * code/trunk/src/modules/gametypes/SpaceRace.cc (modified) * code/trunk/src/modules/gametypes/SpaceRace.h (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.h (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/portals/PortalLink.cc (modified) * code/trunk/src/modules/portals/PortalLink.h (modified) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (modified) Some cleanup... Tue, 19 Jul 2011 20:27:15 GMT jo [8766] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/weaponsystem/WeaponSlot.h (modified) Backup before taking the next step. Tue, 19 Jul 2011 19:26:32 GMT landauf [8765] * code/branches/output/src/libraries/util/CMakeLists.txt (modified) * code/branches/output/src/libraries/util/Output.h (added) * code/branches/output/src/libraries/util/output (added) * code/branches/output/src/libraries/util/output/OutputDefinitions.h (added) * code/branches/output/src/libraries/util/output/OutputListener.cc (added) * code/branches/output/src/libraries/util/output/OutputListener.h (added) * code/branches/output/src/libraries/util/output/OutputManager.cc (added) * code/branches/output/src/libraries/util/output/OutputManager.h (added) * code/branches/output/src/libraries/util/output/OutputStream.cc (added) * code/branches/output/src/libraries/util/output/OutputStream.h (added) added draft for the the new output system Mon, 18 Jul 2011 21:07:05 GMT jo [8764] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) Got the bug. Mon, 18 Jul 2011 20:59:35 GMT jo [8763] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) New implementation. New bug. Bots use only yellow energy munition ... Sun, 17 Jul 2011 21:43:20 GMT jo [8762] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) Weaponsetup now generic. Munition management has not jet been ... Fri, 15 Jul 2011 08:49:17 GMT jo [8761] * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) Error due to block scope (variables didn't reset in the inner while ... Thu, 14 Jul 2011 21:06:37 GMT jo [8760] * code/branches/ai2/data/levels/includes/weaponSettingsAssff.oxi (modified) Reverted weaponsetting. Thu, 14 Jul 2011 20:46:23 GMT jo [8759] * code/branches/ai2/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) Could this be a probable weaponsetting? Thu, 14 Jul 2011 20:29:18 GMT jo [8758] * code/branches/ai2/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/Controller.cc (modified) * code/branches/ai2/src/orxonox/controllers/Controller.h (modified) * code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.cc (modified) Code clean up. Wed, 13 Jul 2011 19:42:03 GMT jo [8757] * code/branches/ai2/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/branches/ai2/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) ai && weapons. Trying to identify each weapon installed on a spaceship. Wed, 13 Jul 2011 17:53:31 GMT jo [8756] * code/trunk/data/levels/fightInOurBack.oxw (modified) Updating 'Fight in our back'. Spaceship is steerable now. New ... Wed, 13 Jul 2011 17:31:00 GMT jo [8755] * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsHXY.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (modified) Updating the weaponsettings. Swallow and further spaceships deal ... Sun, 10 Jul 2011 19:53:17 GMT jo [8741] * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) Correction of camera bug. Sun, 10 Jul 2011 15:46:32 GMT landauf [8740] * code/branches/output (modified) * code/branches/output/src/modules/gametypes/SpaceRace.cc (modified) * code/branches/output/src/orxonox/infos/GametypeInfo.cc (modified) fixed some warnings, added vs to ignore list Sun, 10 Jul 2011 08:41:13 GMT landauf [8739] * code/branches/output (copied) created new branch to work on the console- and log-output Sat, 09 Jul 2011 17:45:14 GMT landauf [8738] * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.cc (modified) * code/trunk/src/orxonox/interfaces/RadarViewable.h (modified) added "scale" for radar viewables. scale is relative, 1.0 means ... Sat, 09 Jul 2011 10:05:56 GMT landauf [8737] * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) fixed radar flashing red after killing an enemy with the steerable rocket Thu, 07 Jul 2011 17:17:39 GMT jo [8736] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) Bots use boost now. Thu, 07 Jul 2011 13:59:54 GMT jo [8735] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/controllers/Controller.cc (modified) * code/branches/ai2/src/orxonox/controllers/Controller.h (modified) * code/branches/ai2/src/orxonox/worldentities/pawns/Pawn.cc (modified) Adjust weapon behaviour if bot dies and is respawned with a different ... Wed, 06 Jul 2011 20:50:18 GMT dafrick [8734] * code/branches/ai2/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/branches/ai2/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/branches/ai2/src/orxonox/infos/PlayerInfo.cc (modified) Fix for AI and rockets. Tue, 05 Jul 2011 21:59:37 GMT jo [8733] * code/branches/ai2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h (modified) Further narrowing down. The bug is triggered, when a bot calls ... Tue, 05 Jul 2011 20:57:40 GMT jo [8732] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) doFire() is definitely the error's source. Tue, 05 Jul 2011 20:39:50 GMT jo [8731] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) Narrowed down: Bug triggered in the doFire() function in ... Tue, 05 Jul 2011 20:16:47 GMT jo [8730] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) Going back one step (version without hud bug). Bots have better ... Mon, 04 Jul 2011 00:47:44 GMT rgrieder [8729] * code/trunk (modified) * code/trunk/cmake/CompilerConfigGCC.cmake (modified) * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/tools/BuildUnits.cmake (copied) * code/trunk/cmake/tools/GenerateToluaBindings.cmake (modified) * code/trunk/cmake/tools/SourceFileUtilities.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/data/gui/scripts/ChatBox-inputonly.lua (modified) * code/trunk/data/gui/scripts/ChatBox.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/lua/Tools.lua (modified) * code/trunk/src/BuildUnitsConfigGCC.cmake (copied) * code/trunk/src/BuildUnitsConfigMSVC.cmake (copied) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/trunk/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/trunk/src/external/bullet/CMakeLists.txt (modified) * code/trunk/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/trunk/src/external/enet/CMakeLists.txt (modified) * code/trunk/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/trunk/src/external/ois/CMakeLists.txt (modified) * code/trunk/src/external/ois/linux/CMakeLists.txt (modified) * code/trunk/src/external/ois/mac/CMakeLists.txt (modified) * code/trunk/src/external/ois/win32/CMakeLists.txt (modified) * code/trunk/src/external/tinyxml/CMakeLists.txt (modified) * code/trunk/src/external/tolua/lua/basic.lua (modified) * code/trunk/src/external/tolua/lua/package.lua (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/CommandLineParser.cc (modified) * code/trunk/src/libraries/core/CommandLineParser.h (modified) * code/trunk/src/libraries/core/ConfigValueIncludes.h (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/EventIncludes.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/LuaState.cc (modified) * code/trunk/src/libraries/core/LuaState.h (modified) * code/trunk/src/libraries/core/ObjectListBase.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/PathConfig.cc (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/ToluaInterface.h (deleted) * code/trunk/src/libraries/core/ToluaInterfaceHook.lua (copied) * code/trunk/src/libraries/core/ViewportEventListener.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/IOConsolePOSIX.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.cc (modified) * code/trunk/src/libraries/core/command/IOConsoleWindows.h (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/Shell.h (modified) * code/trunk/src/libraries/core/input/InputHandler.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) * code/trunk/src/libraries/core/input/InputPrereqs.h (modified) * code/trunk/src/libraries/core/input/InputState.cc (modified) * code/trunk/src/libraries/core/input/InputState.h (modified) * code/trunk/src/libraries/core/input/JoyStick.h (modified) * code/trunk/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/trunk/src/libraries/core/input/KeyBinderManager.h (modified) * code/trunk/src/libraries/core/input/KeyDetector.h (modified) * code/trunk/src/libraries/core/input/Keyboard.h (modified) * code/trunk/src/libraries/core/input/Mouse.cc (modified) * code/trunk/src/libraries/network/WANDiscoverable.h (modified) * code/trunk/src/libraries/network/packet/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/CMakeLists.txt (modified) * code/trunk/src/libraries/tools/Shader.h (modified) * code/trunk/src/libraries/tools/Timer.cc (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/libraries/util/CMakeLists.txt (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Debug.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/OutputHandler.cc (modified) * code/trunk/src/libraries/util/OutputHandler.h (modified) * code/trunk/src/libraries/util/TriBool.h (deleted) * code/trunk/src/libraries/util/UtilPrereqs.h (modified) * code/trunk/src/libraries/util/tribool.h (copied) * code/trunk/src/modules/docking/Dock.cc (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.cc (modified) * code/trunk/src/modules/overlays/hud/GametypeFadingMessage.h (modified) * code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pong/CMakeLists.txt (modified) * code/trunk/src/modules/pong/PongAI.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc (modified) * code/trunk/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/controllers/AIController.cc (modified) * code/trunk/src/orxonox/controllers/AIController.h (modified) * code/trunk/src/orxonox/controllers/DroneController.cc (modified) * code/trunk/src/orxonox/controllers/DroneController.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/graphics/CMakeLists.txt (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc (modified) Merged unity_build branch back to trunk. Features: - Implemented ... Sun, 03 Jul 2011 15:44:55 GMT dafrick [8728] * code/branches/bigships (deleted) Removing bigships branch. Sun, 03 Jul 2011 15:42:19 GMT dafrick [8727] * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/items/MultiStateEngine.cc (modified) * code/trunk/src/orxonox/items/MultiStateEngine.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Cleaning up in SpaceShip and Engine. Fixed several bugs. Kicked ... Thu, 30 Jun 2011 22:59:23 GMT jo [8724] * code/branches/ai2/src/orxonox/controllers/AIController.cc (modified) Buggy version: After being shot dead in a simple level the hud ... Thu, 30 Jun 2011 22:54:47 GMT jo [8723] * code/branches/ai2/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai2/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai2/src/orxonox/controllers/DroneController.cc (modified) * code/branches/ai2/src/orxonox/controllers/DroneController.h (modified) * code/branches/ai2/src/orxonox/worldentities/ControllableEntity.h (modified) 'Stable' update. Merging by hand. Thu, 30 Jun 2011 20:49:24 GMT dafrick [8722] * code/branches/pickup (deleted) Removing pickup branch. Thu, 30 Jun 2011 18:39:58 GMT jo [8721] * code/branches/ai2 (copied) Thu, 30 Jun 2011 18:30:13 GMT jo [8720] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) Just a backup, before starting to update the ai branch. Thu, 30 Jun 2011 15:20:39 GMT jo [8719] * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) Trying to find a way to identify a weapon by its munition name. The ... Tue, 28 Jun 2011 02:28:58 GMT rgrieder [8716] * code/branches/unity_build/src/libraries/core/input/Mouse.cc (modified) Fixed Linux build when using build units Mon, 27 Jun 2011 08:45:15 GMT dafrick [8713] * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (modified) Cleaning up ShrinkPickup. Wed, 22 Jun 2011 16:57:16 GMT jo [8711] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) Bots are ready for rocket usage. (The hit rate for rockets is just ... Sat, 18 Jun 2011 11:11:04 GMT FelixSchulthess [8710] * code/branches/presentation/data/levels/myTestLevel.oxw (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.h (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.cc (modified) * code/branches/presentation/src/orxonox/graphics/Billboard.h (modified) space boundary billboard is now animated. test run with myTestLevel.oxw Tue, 14 Jun 2011 18:53:28 GMT dafrick [8706] * code/trunk (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/layouts/DockingDialog.layout (copied) * code/trunk/data/gui/layouts/QuestGUI.layout (modified) * code/trunk/data/gui/scripts/DockingDialog.lua (copied) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/FPSTest.oxw (modified) * code/trunk/data/levels/asteroids.oxw (modified) * code/trunk/data/levels/docking.oxw (copied) * code/trunk/data/levels/dynamicMatch.oxw (modified) * code/trunk/data/levels/earth.oxw (modified) * code/trunk/data/levels/emptyLevel.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/notifications.oxi (copied) * code/trunk/data/levels/includes/pickups.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (modified) * code/trunk/data/levels/includes/weaponSettingsAssff2.oxi (copied) * code/trunk/data/levels/includes/weaponSettingsImmTest.oxi (copied) * code/trunk/data/levels/lastManStanding.oxw (modified) * code/trunk/data/levels/lastTeamStanding.oxw (modified) * code/trunk/data/levels/lastTeamStandingII.oxw (modified) * code/trunk/data/levels/myTestLevel.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (modified) * code/trunk/data/levels/planets.oxw (modified) * code/trunk/data/levels/pong.oxw (modified) * code/trunk/data/levels/portals.oxw (modified) * code/trunk/data/levels/presentation.oxw (modified) * code/trunk/data/levels/presentation09.oxw (modified) * code/trunk/data/levels/presentation09b.oxw (modified) * code/trunk/data/levels/presentationDM.oxw (modified) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationFS11.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (modified) * code/trunk/data/levels/quests.oxw (copied) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/shieldTest.oxw (copied) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/spaceRace.oxw (copied) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/teamDeathMatch.oxw (modified) * code/trunk/data/levels/templates/lodInformation.oxt (modified) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/templates/spaceshipAssff2.oxt (copied) * code/trunk/data/levels/templates/spaceshipGhost.oxt (modified) * code/trunk/data/levels/templates/spaceshipH2.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXY.oxt (modified) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (modified) * code/trunk/data/levels/templates/spaceshipImmTest.oxt (copied) * code/trunk/data/levels/templates/spaceshipPirate.oxt (modified) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (modified) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (modified) * code/trunk/data/levels/testStars.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/tetris.oxw (copied) * code/trunk/data/levels/theTimeMachine.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUDTemplates3.oxo (modified) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/data/particle/RingExp.particle (copied) * code/trunk/data/particle/RingExp2.particle (copied) * code/trunk/data/particle/RingExp3.particle (copied) * code/trunk/data/particle/Shield.particle (copied) * code/trunk/data/particle/weaponflare.particle (copied) * code/trunk/data/particle/weaponshoot.particle (copied) * code/trunk/doc/api/Groups.dox (modified) * code/trunk/doc/api/groups/Portals.dox (copied) * code/trunk/doc/api/groups/Triggers.dox (modified) * code/trunk/src/libraries/core/BaseObject.cc (modified) * code/trunk/src/libraries/core/ConfigValueContainer.h (modified) * code/trunk/src/libraries/core/CoreIncludes.h (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Game.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Identifier.h (modified) * code/trunk/src/libraries/core/Super.h (modified) * code/trunk/src/libraries/core/ThreadWin.cc (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/network/LANDiscovery.cc (modified) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.cc (modified) * code/trunk/src/libraries/network/packet/Welcome.h (modified) * code/trunk/src/libraries/network/synchronisable/Serialise.h (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/util/Convert.h (modified) * code/trunk/src/libraries/util/Exception.h (modified) * code/trunk/src/libraries/util/Math.h (modified) * code/trunk/src/libraries/util/MultiTypeValue.h (modified) * code/trunk/src/libraries/util/ScopedSingletonManager.h (modified) * code/trunk/src/libraries/util/Serialise.h (modified) * code/trunk/src/libraries/util/SubString.h (modified) * code/trunk/src/modules/CMakeLists.txt (modified) * code/trunk/src/modules/docking (copied) * code/trunk/src/modules/docking/CMakeLists.txt (copied) * code/trunk/src/modules/docking/Dock.cc (copied) * code/trunk/src/modules/docking/Dock.h (copied) * code/trunk/src/modules/docking/DockToShip.cc (copied) * code/trunk/src/modules/docking/DockToShip.h (copied) * code/trunk/src/modules/docking/DockingAnimation.cc (copied) * code/trunk/src/modules/docking/DockingAnimation.h (copied) * code/trunk/src/modules/docking/DockingController.cc (copied) * code/trunk/src/modules/docking/DockingController.h (copied) * code/trunk/src/modules/docking/DockingEffect.cc (copied) * code/trunk/src/modules/docking/DockingEffect.h (copied) * code/trunk/src/modules/docking/DockingPrecompiledHeaders.h (copied) * code/trunk/src/modules/docking/DockingPrereqs.h (copied) * code/trunk/src/modules/docking/DockingTarget.cc (copied) * code/trunk/src/modules/docking/DockingTarget.h (copied) * code/trunk/src/modules/docking/MoveToDockingTarget.cc (copied) * code/trunk/src/modules/docking/MoveToDockingTarget.h (copied) * code/trunk/src/modules/gametypes (copied) * code/trunk/src/modules/gametypes/CMakeLists.txt (copied) * code/trunk/src/modules/gametypes/GametypesPrecompiledHeaders.h (copied) * code/trunk/src/modules/gametypes/GametypesPrereqs.h (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.cc (copied) * code/trunk/src/modules/gametypes/RaceCheckPoint.h (copied) * code/trunk/src/modules/gametypes/SpaceRace.cc (copied) * code/trunk/src/modules/gametypes/SpaceRace.h (copied) * code/trunk/src/modules/notifications/CMakeLists.txt (modified) * code/trunk/src/modules/notifications/Notification.cc (deleted) * code/trunk/src/modules/notifications/Notification.h (deleted) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.cc (copied) * code/trunk/src/modules/notifications/NotificationQueueCEGUI.h (copied) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.cc (modified) * code/trunk/src/modules/objects/CMakeLists.txt (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Script.cc (modified) * code/trunk/src/modules/objects/SpaceBoundaries.cc (copied) * code/trunk/src/modules/objects/SpaceBoundaries.h (copied) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.cc (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) * code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/GametypeStatus.cc (deleted) * code/trunk/src/modules/overlays/hud/GametypeStatus.h (deleted) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDBar.h (modified) * code/trunk/src/modules/overlays/hud/HUDBoostBar.cc (copied) * code/trunk/src/modules/overlays/hud/HUDBoostBar.h (copied) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/overlays/hud/HUDSpeedBar.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupPrereqs.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/items/CMakeLists.txt (modified) * code/trunk/src/modules/pickup/items/ShrinkPickup.cc (copied) * code/trunk/src/modules/pickup/items/ShrinkPickup.h (copied) * code/trunk/src/modules/pong/PongBat.h (modified) * code/trunk/src/modules/portals/CMakeLists.txt (modified) * code/trunk/src/modules/portals/PortalEndPoint.cc (modified) * code/trunk/src/modules/portals/PortalEndPoint.h (modified) * code/trunk/src/modules/portals/PortalLink.cc (modified) * code/trunk/src/modules/portals/PortalLink.h (modified) * code/trunk/src/modules/portals/PortalsPrecompiledHeaders.h (modified) * code/trunk/src/modules/portals/PortalsPrereqs.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/tetris (copied) * code/trunk/src/modules/tetris/CMakeLists.txt (copied) * code/trunk/src/modules/tetris/Tetris.cc (copied) * code/trunk/src/modules/tetris/Tetris.h (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.cc (copied) * code/trunk/src/modules/tetris/TetrisCenterpoint.h (copied) * code/trunk/src/modules/tetris/TetrisPrereqs.h (copied) * code/trunk/src/modules/tetris/TetrisStone.cc (copied) * code/trunk/src/modules/tetris/TetrisStone.h (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.cc (copied) * code/trunk/src/modules/weapons/projectiles/BasicProjectile.h (copied) * code/trunk/src/modules/weapons/projectiles/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified) * code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/Rocket.h (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc (modified) * code/trunk/src/modules/weapons/projectiles/SimpleRocket.h (modified) * code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/HsW01.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/MoodManager.cc (modified) * code/trunk/src/orxonox/MoodManager.h (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) * code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.h (modified) * code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.h (modified) * code/trunk/src/orxonox/controllers/Controller.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/trunk/src/orxonox/gametypes/Dynamicmatch.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/gametypes/LastTeamStanding.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.cc (modified) * code/trunk/src/orxonox/graphics/Billboard.h (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/infos/GametypeInfo.cc (modified) * code/trunk/src/orxonox/infos/GametypeInfo.h (modified) * code/trunk/src/orxonox/infos/PlayerInfo.cc (modified) * code/trunk/src/orxonox/infos/PlayerInfo.h (modified) * code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified) * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.cc (copied) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/trunk/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.h (modified) * code/trunk/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/trunk/src/orxonox/worldentities/CMakeLists.txt (modified) * code/trunk/src/orxonox/worldentities/CameraPosition.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.cc (modified) * code/trunk/src/orxonox/worldentities/MobileEntity.h (modified) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.cc (deleted) * code/trunk/src/orxonox/worldentities/SpaceBoundaries.h (deleted) * code/trunk/src/orxonox/worldentities/SpawnPoint.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging presentation branch back into trunk. There are many new ... Tue, 14 Jun 2011 18:04:44 GMT dafrick [8705] * code/branches/presentation/src/modules/docking/Dock.cc (modified) * code/branches/presentation/src/modules/docking/Dock.h (modified) The calling of tthe docking dialog is now synchronized (but not the ... Mon, 13 Jun 2011 12:35:18 GMT dafrick [8704] * code/branches/presentation/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/presentation/src/libraries/core/GUIManager.cc (modified) * code/branches/presentation/src/libraries/core/GUIManager.h (modified) Only escape [] in CEGUI tetx of version is >= 0.7 Sun, 12 Jun 2011 23:49:05 GMT landauf [8703] * code/branches/presentation/data/gui/scripts/NotificationLayer.lua (modified) two fixes for cegui 0.7 sometimes there's an exception while ... Sat, 11 Jun 2011 11:47:05 GMT landauf [8702] * code/branches/presentation/src/orxonox/worldentities/MobileEntity.h (modified) fixed radian <-> degree conversion bug Thu, 09 Jun 2011 21:40:54 GMT jo [8701] * code/branches/ai/src/modules/weapons/projectiles/Rocket.cc (modified) * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/AIController.h (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) * code/branches/ai/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/ai/src/orxonox/worldentities/ControllableEntity.h (modified) First successful attempt, to make bots shoot rockets. Unfortunately ... Mon, 06 Jun 2011 06:15:38 GMT dafrick [8700] * code/branches/presentation/data/gui/layouts/DockingDialog.layout (modified) * code/branches/presentation/data/gui/scripts/DockingDialog.lua (modified) * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/src/modules/docking/Dock.cc (modified) * code/branches/presentation/src/modules/docking/Dock.h (modified) * code/branches/presentation/src/modules/docking/DockingTarget.cc (modified) * code/branches/presentation/src/modules/docking/DockingTarget.h (modified) Adherence to styleguide. Thu, 02 Jun 2011 12:05:27 GMT scheusso [8694] * code/branches/presentation/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation/src/modules/notifications/dispatchers/SimpleNotification.cc (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/presentation/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/Trigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/TriggerBase.cc (modified) * code/branches/presentation/src/modules/pickup/PickupRepresentation.cc (modified) * code/branches/presentation/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) * code/branches/presentation/src/orxonox/graphics/Camera.cc (modified) * code/branches/presentation/src/orxonox/weaponsystem/WeaponSlot.cc (modified) * code/branches/presentation/src/orxonox/worldentities/CameraPosition.cc (modified) * code/branches/presentation/src/orxonox/worldentities/SpawnPoint.cc (modified) fixed a network problem with SpaceBoundaries please don't use new on ... Tue, 31 May 2011 15:34:18 GMT rgrieder [8692] * code/branches/presentation/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/presentation/src/orxonox/gamestates/GSRoot.h (modified) Added "getTimeFactor" console command. Mon, 30 May 2011 17:03:57 GMT rgrieder [8690] * code/branches/unity_build/src/libraries/core/GUIManager.h (modified) Fixed tolua warning: operator != is not support by tolua because ... Mon, 30 May 2011 16:59:50 GMT rgrieder [8689] * code/branches/unity_build/src/libraries/core/GUIManager.h (modified) * code/branches/unity_build/src/libraries/util/tribool.h (modified) Fixed GCC build and warnings. Mon, 30 May 2011 16:51:00 GMT rgrieder [8688] * code/branches/unity_build/cmake/tools/GenerateToluaBindings.cmake (modified) * code/branches/unity_build/src/CMakeLists.txt (modified) * code/branches/unity_build/src/external/tolua/lua/basic.lua (modified) * code/branches/unity_build/src/external/tolua/lua/package.lua (modified) * code/branches/unity_build/src/libraries/core/LuaState.cc (modified) * code/branches/unity_build/src/libraries/core/LuaState.h (modified) * code/branches/unity_build/src/libraries/core/ToluaInterface.h (deleted) * code/branches/unity_build/src/libraries/core/ToluaInterfaceHook.lua (added) * code/branches/unity_build/src/modules/notifications/NotificationManager.cc (modified) * code/branches/unity_build/src/modules/pickup/PickupManager.cc (modified) * code/branches/unity_build/src/modules/questsystem/QuestManager.cc (modified) * code/branches/unity_build/src/orxonox/Main.cc (modified) Removed the need to declare the tolua interface explicitly ... Mon, 30 May 2011 16:45:06 GMT rgrieder [8687] * code/branches/unity_build/data/gui/scripts/ChatBox-inputonly.lua (modified) * code/branches/unity_build/data/gui/scripts/ChatBox.lua (modified) * code/branches/unity_build/data/gui/scripts/MenuSheet.lua (modified) * code/branches/unity_build/data/gui/scripts/MiscConfigMenu.lua (modified) * code/branches/unity_build/data/gui/scripts/NotificationLayer.lua (modified) * code/branches/unity_build/data/gui/scripts/SheetManager.lua (modified) * code/branches/unity_build/data/lua/Tools.lua (modified) * code/branches/unity_build/src/libraries/core/GUIManager.h (modified) * code/branches/unity_build/src/libraries/util/tribool.h (modified) Adjusted implementation of tribool to work well with tolua and ... Mon, 30 May 2011 16:20:22 GMT rgrieder [8686] * code/branches/presentation/src/orxonox/interfaces/PlayerTrigger.h (modified) Fixed missing include. Mon, 30 May 2011 09:14:06 GMT dafrick [8684] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) Adding some sound. Mon, 30 May 2011 08:20:27 GMT dafrick [8682] * code/branches/presentation/src/orxonox/infos/PlayerInfo.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) Hack-ish Hack to just have one HUD at a time. Mon, 30 May 2011 07:58:19 GMT dafrick [8681] * code/branches/presentation/src/orxonox/infos/GametypeInfo.cc (modified) gametypeInfo didn't quite work in Tetris. Mon, 30 May 2011 07:55:38 GMT dafrick [8680] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h (modified) Make the camera position stay the same between differnet stones in ... Mon, 30 May 2011 07:07:31 GMT dafrick [8679] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/data/levels/spaceRace.oxw (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt (modified) Finalizing presentation level. Mon, 30 May 2011 00:38:34 GMT rgrieder [8678] * code/branches/unity_build/src/libraries/core/GUIManager.cc (modified) * code/branches/unity_build/src/libraries/core/GUIManager.h (modified) * code/branches/unity_build/src/libraries/core/input/InputManager.cc (modified) * code/branches/unity_build/src/libraries/core/input/InputManager.h (modified) * code/branches/unity_build/src/libraries/core/input/InputState.cc (modified) * code/branches/unity_build/src/libraries/core/input/InputState.h (modified) * code/branches/unity_build/src/libraries/util/TriBool.h (deleted) * code/branches/unity_build/src/libraries/util/tribool.h (added) * code/branches/unity_build/src/orxonox/gamestates/GSLevel.cc (modified) Replaced TriBool with a modified version of boost::tribool. The main ... Sun, 29 May 2011 22:31:28 GMT rgrieder [8677] * code/branches/unity_build/cmake/CompilerConfigGCC.cmake (modified) * code/branches/unity_build/cmake/CompilerConfigMSVC.cmake (modified) * code/branches/unity_build/src/OrxonoxConfig.cmake (modified) The __COUNTER__ macro required for full build units was only added in ... Sun, 29 May 2011 22:22:19 GMT rgrieder [8676] * code/branches/unity_build/src/libraries/util/CMakeLists.txt (modified) * code/branches/unity_build/src/libraries/util/Convert.h (modified) Fixed MSVC warnings in Convert.h in a different fashion that doesn't ... Sun, 29 May 2011 22:14:57 GMT dafrick [8675] * code/branches/presentation/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/DistanceMultiTrigger.h (modified) * code/branches/presentation/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/DistanceTrigger.h (modified) Fixing problems with beaconMask being NULL. Sun, 29 May 2011 22:01:33 GMT rgrieder [8674] * code/branches/unity_build/src/libraries/tools/Shader.h (modified) * code/branches/unity_build/src/libraries/tools/Timer.cc (modified) * code/branches/unity_build/src/libraries/tools/Timer.h (modified) * code/branches/unity_build/src/modules/pong/PongAI.cc (modified) * code/branches/unity_build/src/modules/weapons/munitions/ReplenishingMunition.cc (modified) * code/branches/unity_build/src/modules/weapons/projectiles/LightningGunProjectile.cc (modified) * code/branches/unity_build/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/unity_build/src/orxonox/weaponsystem/Munition.cc (modified) Reduced some header file dependencies in tools: - moved ... Sun, 29 May 2011 21:59:17 GMT dafrick [8673] * code/branches/presentation (modified) * code/branches/presentation/data/overlays/HUDTemplates3.oxo (modified) * code/branches/presentation/src/modules/overlays/OverlaysPrereqs.h (modified) * code/branches/presentation/src/modules/overlays/hud/CMakeLists.txt (modified) * code/branches/presentation/src/modules/overlays/hud/HUDBar.cc (modified) * code/branches/presentation/src/modules/overlays/hud/HUDBar.h (modified) * code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.cc (copied) * code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.h (copied) * code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc (modified) * code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging hudimprovements branch into presentation branch. Sun, 29 May 2011 21:02:17 GMT rgrieder [8672] * code/branches/unity_build/src/libraries/core/Core.h (modified) * code/branches/unity_build/src/libraries/core/CoreIncludes.h (modified) * code/branches/unity_build/src/libraries/core/EventIncludes.h (modified) * code/branches/unity_build/src/libraries/core/LuaState.h (modified) * code/branches/unity_build/src/libraries/core/ObjectListBase.h (modified) * code/branches/unity_build/src/libraries/core/OrxonoxClass.h (modified) * code/branches/unity_build/src/libraries/core/Super.h (modified) * code/branches/unity_build/src/libraries/core/ToluaInterface.h (modified) * code/branches/unity_build/src/libraries/core/ViewportEventListener.h (modified) * code/branches/unity_build/src/libraries/core/command/Functor.h (modified) * code/branches/unity_build/src/libraries/core/command/IOConsoleWindows.h (modified) * code/branches/unity_build/src/libraries/core/input/InputManager.h (modified) * code/branches/unity_build/src/libraries/core/input/InputPrereqs.h (modified) * code/branches/unity_build/src/libraries/core/input/JoyStick.h (modified) * code/branches/unity_build/src/libraries/core/input/JoyStickQuantityListener.h (modified) * code/branches/unity_build/src/libraries/core/input/KeyBinderManager.h (modified) * code/branches/unity_build/src/libraries/core/input/KeyDetector.h (modified) * code/branches/unity_build/src/libraries/core/input/Keyboard.h (modified) * code/branches/unity_build/src/libraries/network/WANDiscoverable.h (modified) * code/branches/unity_build/src/modules/objects/eventsystem/EventFilter.cc (modified) * code/branches/unity_build/src/modules/objects/eventsystem/EventListener.cc (modified) * code/branches/unity_build/src/orxonox/weaponsystem/WeaponSystem.cc (modified) Removed some includes in the Core header files. Also removed ... Sun, 29 May 2011 20:59:37 GMT rgrieder [8671] * code/branches/unity_build/src/libraries/core/input/InputHandler.h (modified) * code/branches/unity_build/src/libraries/util/Math.h (modified) * code/branches/unity_build/src/libraries/util/UtilPrereqs.h (modified) Moved IntVector2 from util/Math.h to InputHandler.h because that ... Sun, 29 May 2011 20:58:28 GMT rgrieder [8670] * code/branches/unity_build/src/libraries/core/CommandLineParser.h (modified) * code/branches/unity_build/src/libraries/core/command/Shell.h (modified) - Shell shouldn't inherit OrxonoxClass twice if not necessary. - ... Sun, 29 May 2011 20:56:57 GMT rgrieder [8669] * code/branches/unity_build/src/libraries/core/GUIManager.cc (modified) * code/branches/unity_build/src/libraries/core/GUIManager.h (modified) * code/branches/unity_build/src/libraries/core/command/Shell.cc (modified) * code/branches/unity_build/src/libraries/core/command/Shell.h (modified) Moved a few methods from header to source. Sun, 29 May 2011 17:15:43 GMT landauf [8668] * code/branches/presentation/src/orxonox/controllers/Controller.h (modified) * code/branches/presentation/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/presentation/src/orxonox/interfaces/PlayerTrigger.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) small cleanup Sun, 29 May 2011 16:44:45 GMT dafrick [8667] * code/branches/presentation/src/modules/docking/Dock.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationDispatcher.cc (modified) * code/branches/presentation/src/modules/objects/Script.cc (modified) * code/branches/presentation/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/branches/presentation/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/branches/presentation/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/branches/presentation/src/orxonox/interfaces/InterfaceCompilation.cc (modified) * code/branches/presentation/src/orxonox/interfaces/PlayerTrigger.h (modified) Possible fix for segfaults due to player being NULL. Sun, 29 May 2011 15:46:39 GMT dafrick [8666] * code/branches/presentation/src/modules/notifications/NotificationDispatcher.cc (modified) Possible fix. Doesn't really address the issoe though. Sun, 29 May 2011 15:39:19 GMT dafrick [8665] * code/branches/presentation/src/modules/notifications/NotificationQueue.cc (modified) Notifications should now work over the network. Thanks for the help, Oli. Sun, 29 May 2011 15:25:02 GMT dafrick [8664] * code/branches/presentation/data/levels/includes/notifications.oxi (modified) * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/data/levels/templates/spaceshipAssff.oxt (modified) Presentation level is getting ready. Sun, 29 May 2011 15:24:39 GMT dafrick [8663] * code/branches/presentation/src/libraries/core/BaseObject.cc (modified) Fixing warning. Sun, 29 May 2011 15:24:04 GMT dafrick [8662] * code/branches/presentation/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.h (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h (modified) Anotehr step towards networked notifications. Sun, 29 May 2011 15:01:53 GMT landauf [8661] * code/branches/presentation/src/modules/tetris/Tetris.cc (modified) fixed two possible causes which stacked multiple tetris stones at the ... Sun, 29 May 2011 14:02:07 GMT landauf [8660] * code/branches/presentation/data/levels/myTestLevel.oxw (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) * code/branches/presentation/src/modules/objects/SpaceBoundaries.h (modified) added fade in/out effect for space boundaries (alpha value, based on ... Sun, 29 May 2011 13:40:02 GMT dafrick [8659] * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) Adding missing include. Sun, 29 May 2011 11:40:53 GMT landauf [8658] * code/branches/presentation/src/orxonox/items/Engine.cc (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) the "lift" which is applied to the spaceship when pitching is now ... Sun, 29 May 2011 11:12:28 GMT dafrick [8657] * code/branches/presentation/src/modules/objects/SpaceBoundaries.cc (modified) Fixing singularity bug in SpaceBoundaries. Sun, 29 May 2011 09:24:31 GMT dafrick [8656] * code/branches/presentation/data/levels/presentationFS11.oxw (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.h (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h (modified) Adding network callbacks. Still doesn't work yet, though. Sun, 29 May 2011 08:31:15 GMT landauf [8655] * code/branches/presentation/src/libraries/core/BaseObject.cc (modified) fixed crashing assertion in case a template linked to a non-existing ... Sun, 29 May 2011 07:58:34 GMT landauf [8654] * code/branches/presentation/src/orxonox/items/Engine.cc (modified) fixed engine destructor Sat, 28 May 2011 20:40:10 GMT rgrieder [8653] * code/branches/unity_build/cmake/tools/BuildUnits.cmake (modified) * code/branches/unity_build/cmake/tools/TargetUtilities.cmake (modified) * code/branches/unity_build/src/external/bullet/BulletCollision/CMakeLists.txt (modified) * code/branches/unity_build/src/external/bullet/BulletDynamics/CMakeLists.txt (modified) * code/branches/unity_build/src/external/bullet/CMakeLists.txt (modified) * code/branches/unity_build/src/external/bullet/LinearMath/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ogreceguirenderer/CMakeLists.txt (modified) * code/branches/unity_build/src/external/ois/CMakeLists.txt (modified) * code/branches/unity_build/src/external/tinyxml/CMakeLists.txt (modified) Since we already have it now: use automatic full build units for ... Sat, 28 May 2011 20:31:50 GMT rgrieder [8652] * code/branches/unity_build/src/external/enet/CMakeLists.txt (modified) I don't know, but compiling a C library in one unit just seems too ... Sat, 28 May 2011 20:11:23 GMT scheusso [8651] * code/branches/presentation/src/modules/notifications/NotificationQueue.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueue.h (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc (modified) * code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h (modified) * code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) first attempt to make notifications synchronisable not yet succeeded ... Sat, 28 May 2011 19:57:45 GMT rgrieder [8650] * code/branches/unity_build/cmake/tools/GenerateToluaBindings.cmake (modified) * code/branches/unity_build/cmake/tools/TargetUtilities.cmake (modified) * code/branches/unity_build/src/libraries/core/CMakeLists.txt (modified) Also add tolua bind files to build units (for the sake of ... Sat, 28 May 2011 19:56:50 GMT rgrieder [8649] * code/branches/unity_build/cmake/tools/BuildUnits.cmake (modified) * code/branches/unity_build/cmake/tools/TargetUtilities.cmake (modified) Added EXCLUDE_FROM_BUILD_UNITS to the ADD_TARGET commands and ...