# # ChangeLog for code/trunk # # Generated by Trac 1.0.9 # Nov 29, 2024, 9:18:07 PM Sat, 19 Mar 2011 08:31:17 GMT adrfried [8093] * code/trunk/contrib (added) * code/trunk/contrib/orxonox.desktop (added) * code/trunk/contrib/orxonox.manpage.xml (added) * code/trunk/contrib/orxonox.svg (added) add desktop-file, icon and manpage Thu, 17 Mar 2011 23:08:44 GMT adrfried [8088] * code/trunk/src/external/enet/ChangeLog (modified) * code/trunk/src/external/enet/LICENSE (modified) * code/trunk/src/external/enet/VERSION (modified) * code/trunk/src/external/enet/enet.h (modified) * code/trunk/src/external/enet/patches/0001-Add-IPv6-support-to-Enet.patch (moved) * code/trunk/src/external/enet/peer.c (modified) * code/trunk/src/external/enet/protocol.c (modified) Updated Enet to version 1.3.1 updated patch Tue, 15 Mar 2011 20:47:11 GMT landauf [8079] * code/trunk (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/data/defaultConfig/keybindings.ini (modified) * code/trunk/data/gui/configs/CEGUIConfig.xsd (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/schemes/GUIScheme.xsd (modified) * code/trunk/data/gui/schemes/OrxonoxLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezGreenLook.scheme (modified) * code/trunk/data/gui/schemes/TaharezLook.scheme (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/DecisionPopup.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HostMenu.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/KeyBindMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MiscConfigMenu.lua (modified) * code/trunk/data/gui/scripts/MouseControlsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.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/dynamicMatch.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/lastManStanding.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/presentationFS102.oxw (modified) * code/trunk/data/levels/presentationFS10Ed.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (modified) * code/trunk/data/levels/testSwallow.oxw (modified) * code/trunk/data/levels/underAttack.oxw (modified) * code/trunk/data/overlays/debug.oxo (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/external/enet/win32.c (modified) * code/trunk/src/libraries/core/CMakeLists.txt (modified) * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/CorePrereqs.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.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/ViewportEventListener.cc (copied) * code/trunk/src/libraries/core/ViewportEventListener.h (copied) * code/trunk/src/libraries/core/WeakPtr.h (modified) * code/trunk/src/libraries/core/command/CommandEvaluation.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/command/ConsoleCommandCompilation.cc (modified) * code/trunk/src/libraries/core/command/Shell.cc (modified) * code/trunk/src/libraries/core/command/TclBind.cc (modified) * code/trunk/src/libraries/core/command/TclBind.h (modified) * code/trunk/src/libraries/core/command/TclThreadManager.cc (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/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/Keyboard.cc (modified) * code/trunk/src/libraries/core/input/Keyboard.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) * code/trunk/src/libraries/tools/Shader.cc (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/tools/ToolsPrereqs.h (modified) * code/trunk/src/modules/designtools/ScreenshotManager.cc (modified) * code/trunk/src/modules/designtools/ScreenshotManager.h (modified) * code/trunk/src/modules/designtools/SkyboxGenerator.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationQueue.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTrigger.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/PauseNotice.cc (copied) * code/trunk/src/modules/overlays/hud/PauseNotice.h (copied) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/questsystem/QuestItem.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified) * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/CameraManager.h (modified) * code/trunk/src/orxonox/ChatInputHandler.cc (modified) * code/trunk/src/orxonox/ChatInputHandler.h (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/controllers/HumanController.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) * code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) * code/trunk/src/orxonox/gamestates/GSRoot.h (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/graphics/Camera.cc (modified) * code/trunk/src/orxonox/graphics/Camera.h (modified) * code/trunk/src/orxonox/graphics/GlobalShader.cc (modified) * code/trunk/src/orxonox/graphics/GlobalShader.h (modified) * code/trunk/src/orxonox/graphics/Model.cc (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) merged usability branch back to trunk incomplete summary of the ... Thu, 03 Mar 2011 13:44:37 GMT jo [8009] * code/trunk/data/levels/asteroids.oxw (modified) Fixed timers in asteroids level. The goal can be reached with 4s ... Thu, 24 Feb 2011 21:56:43 GMT dafrick [7958] * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) Fixed a warning. Thu, 24 Feb 2011 06:36:44 GMT rgrieder [7955] * code/trunk/cmake/LibraryConfig.cmake (modified) * code/trunk/src/CMakeLists.txt (modified) No auto-linking for POCO too. Fixed build by explicitly linking ... Thu, 24 Feb 2011 06:35:28 GMT rgrieder [7954] * code/trunk/src/external/enet/win32.c (modified) * code/trunk/src/external/enet/win32.h (modified) Resolved ENet and windows header include problem for good. Thu, 24 Feb 2011 05:21:24 GMT rgrieder [7952] * code/trunk/src/libraries/network/NetworkPrecompiledHeaders.h (modified) Fixed MSCV include order problem with ENet and Ogre (only occurs with ... Sun, 20 Feb 2011 17:06:09 GMT landauf [7937] * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) fixing WE crash also in trunk since it's a rather severe problem Sat, 19 Feb 2011 15:33:50 GMT landauf [7914] * code/trunk/data/tcl/init.tcl (modified) since the mac_osx branch doesn't seem to get merged anytime soon, I ... Sat, 19 Feb 2011 15:25:52 GMT landauf [7913] * code/trunk/data/gui/scripts/GUITools.lua (modified) fixed crash when pressing 'enter' in a menu (why does no one notice ... Thu, 17 Feb 2011 23:08:00 GMT landauf [7911] * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) Pong gametype should delete the objects it created Thu, 17 Feb 2011 23:07:04 GMT landauf [7910] * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) * code/trunk/src/orxonox/worldentities/WorldEntity.h (modified) Ok, here comes a tricky one: we knew the destructor of WorldEntity is ... Wed, 16 Feb 2011 21:29:06 GMT landauf [7905] * code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified) fixed positioning of independent children in destructor of WorldEntity Wed, 16 Feb 2011 21:23:00 GMT landauf [7904] * code/trunk/src/libraries/network/LANDiscoverable.h (modified) * code/trunk/src/libraries/util/Singleton.h (modified) * code/trunk/src/modules/overlays/hud/UnderAttackHealthBar.h (modified) * code/trunk/src/orxonox/graphics/ParticleEmitter.h (modified) 2x virtual because it may be required in some cases (Singleton & ... Mon, 14 Feb 2011 22:21:33 GMT landauf [7896] * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) actually I believe the condition should be the other way round ... Mon, 14 Feb 2011 22:14:46 GMT landauf [7895] * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (modified) * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) implemented instant reloading of rocket munition because this was a ... Mon, 14 Feb 2011 21:51:44 GMT landauf [7892] * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) fixed bug in bug fix Mon, 14 Feb 2011 21:30:01 GMT landauf [7891] * code/trunk/src/libraries/core/input/Button.cc (modified) * code/trunk/src/libraries/core/input/InputCommands.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) keybind mode shouldn't be changed if it was defined explicitly in the ... Mon, 14 Feb 2011 19:24:00 GMT landauf [7889] * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/ControllableEntity.h (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) hack-fix: overridden implementations of stopLocalHumanControl() were ... Mon, 14 Feb 2011 18:59:51 GMT landauf [7888] * code/trunk/data/gui/layouts/MiscConfigMenu.layout (modified) fixed title of miscellaneous settings Mon, 14 Feb 2011 17:20:03 GMT landauf [7887] * code/trunk/data/gui/layouts/HostMenu.layout (modified) * code/trunk/data/gui/layouts/NotificationLayer.layout (modified) * code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (modified) * code/trunk/data/gui/schemes/OrxonoxLook.scheme (modified) * code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (modified) * code/trunk/data/gui/scripts/HostMenu.lua (modified) * code/trunk/data/gui/scripts/NotificationLayer.lua (modified) eol-style native Mon, 14 Feb 2011 14:31:53 GMT landauf [7886] * code/trunk/src/modules/pong/PongBall.cc (modified) simplification Mon, 14 Feb 2011 14:27:56 GMT landauf [7885] * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) fixed minor memory leak Sun, 13 Feb 2011 20:52:42 GMT landauf [7880] * code/trunk/src/modules/overlays/hud/HUDRadar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDRadar.h (modified) radar doesn't abort if owner is missing radar works with all ... Sun, 13 Feb 2011 20:35:47 GMT landauf [7879] * code/trunk/src/orxonox/CameraManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) moved compositor unloading to avoid crashes in rare cases disabled ... Sun, 13 Feb 2011 16:57:05 GMT dafrick [7877] * code/trunk/data/gui/scripts/InGameMenu.lua (modified) Some minor simplification in InGameMenu.lua Sun, 13 Feb 2011 16:49:41 GMT dafrick [7876] * code/trunk/data/gui/scripts/HostMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.h (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified) Extending startGame and similar console commands, now also the level ... Sun, 13 Feb 2011 00:25:46 GMT landauf [7874] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/libraries/core/WindowEventListener.cc (modified) * code/trunk/src/libraries/core/WindowEventListener.h (modified) * code/trunk/src/libraries/core/input/InputManager.cc (modified) * code/trunk/src/libraries/core/input/InputManager.h (modified) WindowEventListener now declares if the window's focus is active or ... Sat, 12 Feb 2011 20:10:41 GMT landauf [7873] * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) fixed mouse cursor offset after window resize Sat, 12 Feb 2011 18:40:56 GMT rgrieder [7872] * code/trunk/src/libraries/core/Core.cc (modified) Fixed msvc warning. Sat, 12 Feb 2011 18:39:29 GMT rgrieder [7871] * code/trunk/src/libraries/core/command/Functor.h (modified) Fixed msvc build: Functor does not necessarily have to be ... Sat, 12 Feb 2011 18:24:16 GMT landauf [7870] * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/Core.h (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) added feature: ogre config dialog keeps showing up on startup until ... Sat, 12 Feb 2011 15:28:53 GMT landauf [7868] * code/trunk/src/libraries/core/Core.cc (modified) * code/trunk/src/libraries/core/GraphicsManager.cc (modified) use exit() instead of abort() if the ogre config dialog was canceled ... Sat, 12 Feb 2011 14:08:59 GMT landauf [7865] * code/trunk/data/levels/pong.oxw (moved) * code/trunk/src/modules/pong/Pong.cc (modified) * code/trunk/src/modules/pong/Pong.h (modified) renamed pong level, added a bot, and changed the pong gametype to ... Sat, 12 Feb 2011 12:09:42 GMT landauf [7863] * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) disabled suicide for Spectator Sat, 12 Feb 2011 10:57:28 GMT landauf [7862] * code/trunk/src/orxonox/controllers/HumanController.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified) added feature to Spectator which changes the keybind mode of the fire ... Sat, 12 Feb 2011 10:54:07 GMT landauf [7861] * code/trunk/src/libraries/core/command/ConsoleCommand.cc (modified) * code/trunk/src/libraries/core/command/ConsoleCommand.h (modified) * code/trunk/src/libraries/core/input/InputCommands.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) added function to KeyBinder which allows to change the keybind mode ... Sat, 12 Feb 2011 10:37:25 GMT landauf [7860] * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) fixed a few issues related to the free mouse look mode (default CTRL ... Sat, 12 Feb 2011 10:34:40 GMT landauf [7859] * code/trunk/src/libraries/core/input/HalfAxis.h (modified) * code/trunk/src/libraries/core/input/KeyBinder.cc (modified) * code/trunk/src/libraries/core/input/KeyBinder.h (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.h (modified) implemented feature to reset the mouse cursor to the center used in ... Sat, 12 Feb 2011 10:30:33 GMT landauf [7858] * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) removed some spaces Fri, 11 Feb 2011 16:17:39 GMT landauf [7857] * code/trunk/src/orxonox/worldentities/ControllableEntity.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/Spectator.h (modified) - fixed a crash if mouse look was switched on and off for a ... Fri, 11 Feb 2011 15:05:55 GMT landauf [7856] * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.h (modified) * code/trunk/src/orxonox/sound/BaseSound.cc (modified) * code/trunk/src/orxonox/sound/BaseSound.h (modified) * code/trunk/src/orxonox/sound/SoundManager.cc (modified) fixed (?) an endless loop in SoundManager::preUpdate if a non-looping ... Fri, 11 Feb 2011 13:20:13 GMT landauf [7855] * code/trunk/src/orxonox/sound/SoundManager.cc (modified) * code/trunk/src/orxonox/sound/SoundManager.h (modified) fixed a bug which caused the application to crash if the game was ... Fri, 11 Feb 2011 12:03:47 GMT landauf [7854] * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentationPong.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.cc (modified) * code/trunk/src/orxonox/sound/AmbientSound.h (modified) * code/trunk/src/orxonox/sound/BaseSound.h (modified) * code/trunk/src/orxonox/sound/CMakeLists.txt (modified) * code/trunk/src/orxonox/sound/WorldAmbientSound.cc (added) * code/trunk/src/orxonox/sound/WorldAmbientSound.h (added) * code/trunk/src/orxonox/sound/WorldSound.h (modified) detached AmbientSound from BaseObject - AmbientSound can not be ... Fri, 11 Feb 2011 00:38:36 GMT landauf [7853] * code/trunk/data/levels/presentationPong.oxw (modified) fixed ambient sound in pong level Thu, 10 Feb 2011 22:46:07 GMT landauf [7852] * code/trunk/src/modules/pong/Pong.h (modified) * code/trunk/src/modules/pong/PongBall.cc (modified) * code/trunk/src/modules/pong/PongBall.h (modified) fixed crash in Pong gametype if the game was ended right after the ... Thu, 10 Feb 2011 22:34:20 GMT landauf [7851] * code/trunk/src/libraries/core/XMLPort.h (modified) * code/trunk/src/libraries/core/command/Functor.h (modified) * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/orxonox/weaponsystem/Munition.h (modified) added "safe mode" feature to FunctorMember: if enabled, the functor ... Thu, 10 Feb 2011 21:26:46 GMT landauf [7850] * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/WeakPtr.h (modified) moved if(object) condition from WeakPtr to DestructionListener Thu, 10 Feb 2011 20:52:23 GMT landauf [7849] * code/trunk/src/libraries/core/CorePrereqs.h (modified) * code/trunk/src/libraries/core/OrxonoxClass.cc (modified) * code/trunk/src/libraries/core/OrxonoxClass.h (modified) * code/trunk/src/libraries/core/WeakPtr.h (modified) Added DestructionListener, a class which gets notified if a certain ... Thu, 10 Feb 2011 17:05:08 GMT landauf [7848] * code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified) fixed "sound volume out of range" warning when firing a rocked. max ... Thu, 10 Feb 2011 16:42:29 GMT landauf [7847] * code/trunk/src/orxonox/weaponsystem/Munition.cc (modified) * code/trunk/src/orxonox/weaponsystem/WeaponMode.cc (modified) fixed two bugs regarding the munition Thu, 10 Feb 2011 15:59:00 GMT landauf [7846] * code/trunk/src/modules/weapons/WeaponsPrereqs.h (modified) * code/trunk/src/modules/weapons/munitions/CMakeLists.txt (modified) * code/trunk/src/modules/weapons/munitions/RocketMunition.cc (added) * code/trunk/src/modules/weapons/munitions/RocketMunition.h (added) * code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc (modified) * code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified) fixed "No munition class defined in WeaponMode" warning: you have to ... Thu, 10 Feb 2011 15:56:45 GMT landauf [7845] * code/trunk/data/levels/fightInOurBack.oxw (modified) * code/trunk/data/levels/includes/weaponSettings1.oxi (deleted) * code/trunk/data/levels/includes/weaponSettings2.oxi (deleted) * code/trunk/data/levels/includes/weaponSettingsAssff.oxi (moved) * code/trunk/data/levels/templates/spaceshipAssff.oxt (modified) * code/trunk/data/levels/theTimeMachine.oxw (modified) renamed weaponSettings3.oxi as weaponSettingsAssff.oxi removed ... Thu, 10 Feb 2011 15:11:09 GMT landauf [7844] * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) fixed warning. hope this works on all supported systems, because ... Mon, 31 Jan 2011 19:00:08 GMT dafrick [7839] * code/trunk/src/orxonox/LevelManager.cc (modified) Fixing bug in LevelManager, already fixed in tutoriallevel branch, ... Sun, 26 Dec 2010 20:12:31 GMT rgrieder [7819] * code/trunk/src/CMakeLists.txt (modified) Removed inconvenient code again. Sun, 26 Dec 2010 20:07:43 GMT rgrieder [7818] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) * code/trunk/cmake/PackageConfigMSVC.cmake (modified) * code/trunk/cmake/tools/SourceFileUtilities.cmake (modified) * code/trunk/cmake/tools/TargetUtilities.cmake (modified) * code/trunk/doc/api/doxy.config.in (modified) * code/trunk/src/CMakeLists.txt (modified) * code/trunk/src/OrxonoxConfig.cmake (modified) * code/trunk/src/OrxonoxConfig.h.in (modified) * code/trunk/src/SpecialConfig.h.in (modified) Merged changes related to Visual Leak Detector and source file ... Sun, 26 Dec 2010 12:06:29 GMT rgrieder [7811] * code/trunk/src/libraries/core/GUIManager.cc (modified) Fixed possible bug. Sun, 26 Dec 2010 11:55:09 GMT rgrieder [7810] * code/trunk/cmake/CompilerConfigMSVC.cmake (modified) Added comment. Sun, 26 Dec 2010 11:53:02 GMT rgrieder [7809] * code/trunk/src/libraries/core/input/JoyStick.h (modified) * code/trunk/src/libraries/core/input/Keyboard.h (modified) * code/trunk/src/libraries/core/input/Mouse.h (modified) Fixed Doxygen problem ('Template' is not always a type). Sat, 25 Dec 2010 20:32:34 GMT dafrick [7804] * code/trunk/src/libraries/network/MasterServerComm.h (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) Some more minor changes in documentation. Sat, 25 Dec 2010 19:53:13 GMT dafrick [7803] * code/trunk/src/orxonox/LevelManager.h (modified) Some small addition to the documentation. Sat, 25 Dec 2010 19:51:17 GMT dafrick [7802] * code/trunk/src/orxonox/LevelInfo.h (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) Making the level list in the LevelManager (and as consequence the ... Wed, 22 Dec 2010 18:24:24 GMT dafrick [7801] * code/trunk (modified) * code/trunk/bin/CMakeLists.txt (modified) * code/trunk/bin/masterserver.bat.in (copied) * code/trunk/bin/masterserver.in (copied) * code/trunk/data/gui/layouts/AudioMenu.layout (modified) * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/GraphicsMenu.layout (modified) * code/trunk/data/gui/layouts/InGameMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/schemes/OrxonoxHUDWidgets.scheme (copied) * code/trunk/data/gui/schemes/OrxonoxLookHUDWidgets.scheme (deleted) * code/trunk/data/gui/schemes/OrxonoxLookMenuWidgets.scheme (deleted) * code/trunk/data/gui/schemes/OrxonoxMenuWidgets.scheme (copied) * code/trunk/data/gui/scripts/ChatBox-inputonly.lua (modified) * code/trunk/data/gui/scripts/ChatBox.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/network/CMakeLists.txt (modified) * code/trunk/src/libraries/network/Client.cc (modified) * code/trunk/src/libraries/network/Client.h (modified) * code/trunk/src/libraries/network/ClientConnection.cc (modified) * code/trunk/src/libraries/network/ClientConnection.h (modified) * code/trunk/src/libraries/network/ClientInformation.cc (modified) * code/trunk/src/libraries/network/ClientInformation.h (modified) * code/trunk/src/libraries/network/Connection.cc (modified) * code/trunk/src/libraries/network/Connection.h (modified) * code/trunk/src/libraries/network/FunctionCallManager.cc (modified) * code/trunk/src/libraries/network/FunctionCallManager.h (modified) * code/trunk/src/libraries/network/GamestateClient.cc (modified) * code/trunk/src/libraries/network/GamestateClient.h (modified) * code/trunk/src/libraries/network/GamestateHandler.cc (modified) * code/trunk/src/libraries/network/GamestateHandler.h (modified) * code/trunk/src/libraries/network/GamestateManager.cc (modified) * code/trunk/src/libraries/network/GamestateManager.h (modified) * code/trunk/src/libraries/network/Host.cc (modified) * code/trunk/src/libraries/network/Host.h (modified) * code/trunk/src/libraries/network/LANDiscoverable.cc (modified) * code/trunk/src/libraries/network/MasterServer.cc (copied) * code/trunk/src/libraries/network/MasterServer.h (copied) * code/trunk/src/libraries/network/MasterServerComm.cc (copied) * code/trunk/src/libraries/network/MasterServerComm.h (copied) * code/trunk/src/libraries/network/MasterServerProtocol.h (copied) * code/trunk/src/libraries/network/NetworkPrereqs.h (modified) * code/trunk/src/libraries/network/PeerList.cc (copied) * code/trunk/src/libraries/network/PeerList.h (copied) * code/trunk/src/libraries/network/Server.cc (modified) * code/trunk/src/libraries/network/Server.h (modified) * code/trunk/src/libraries/network/ServerConnection.cc (modified) * code/trunk/src/libraries/network/ServerConnection.h (modified) * code/trunk/src/libraries/network/ServerList.cc (copied) * code/trunk/src/libraries/network/ServerList.h (copied) * code/trunk/src/libraries/network/WANDiscoverable.cc (copied) * code/trunk/src/libraries/network/WANDiscoverable.h (copied) * code/trunk/src/libraries/network/WANDiscovery.cc (copied) * code/trunk/src/libraries/network/WANDiscovery.h (copied) * code/trunk/src/libraries/network/packet/Acknowledgement.cc (modified) * code/trunk/src/libraries/network/packet/Acknowledgement.h (modified) * code/trunk/src/libraries/network/packet/Chat.cc (modified) * code/trunk/src/libraries/network/packet/Chat.h (modified) * code/trunk/src/libraries/network/packet/ClassID.cc (modified) * code/trunk/src/libraries/network/packet/ClassID.h (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.cc (modified) * code/trunk/src/libraries/network/packet/DeleteObjects.h (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.cc (modified) * code/trunk/src/libraries/network/packet/FunctionCalls.h (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.cc (modified) * code/trunk/src/libraries/network/packet/FunctionIDs.h (modified) * code/trunk/src/libraries/network/packet/Gamestate.cc (modified) * code/trunk/src/libraries/network/packet/Gamestate.h (modified) * code/trunk/src/libraries/network/packet/Packet.cc (modified) * code/trunk/src/libraries/network/packet/Packet.h (modified) * code/trunk/src/libraries/network/packet/ServerInformation.cc (modified) * code/trunk/src/libraries/network/packet/ServerInformation.h (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/Synchronisable.cc (modified) * code/trunk/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/trunk/src/libraries/util/SignalHandler.cc (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/overlays/hud/HUDBar.cc (modified) * code/trunk/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/weapons/MuzzleFlash.cc (modified) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/Main.cc (modified) * code/trunk/src/orxonox/controllers/ArtificialController.cc (modified) * code/trunk/src/orxonox/controllers/NewHumanController.cc (modified) * code/trunk/src/orxonox/gamestates/CMakeLists.txt (modified) * code/trunk/src/orxonox/gamestates/GSMasterServer.cc (copied) * code/trunk/src/orxonox/gamestates/GSMasterServer.h (copied) * code/trunk/src/orxonox/gamestates/GSServer.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.cc (modified) * code/trunk/src/orxonox/gametypes/Gametype.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified) * code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified) Merging presentation2 branch back to trunk. Tue, 21 Dec 2010 12:41:51 GMT decapitb [7785] * code/trunk/data/levels/lastManStanding.oxw (modified) skyBoxMoreNebula inserted in level lastManStanding, let me know if ... Wed, 08 Dec 2010 14:42:53 GMT dafrick [7734] * code/trunk/data/gui/schemes/OrxonoxLook.scheme (added) * code/trunk/data/gui/schemes/OrxonoxLookHUDWidgets.scheme (added) * code/trunk/data/gui/schemes/OrxonoxLookMenuWidgets.scheme (added) * code/trunk/data/gui/scripts/InitialiseGUI.lua (modified) Adding new looknfeel (still experimental, thus not new default). Wed, 08 Dec 2010 14:29:28 GMT konrad [7732] * code/trunk/data/gui/layouts/CreditsMenu.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/QuestGUI.lua (modified) Credits Menu is now scrollable Wed, 08 Dec 2010 12:27:51 GMT konrad [7726] * code/trunk/data/gui/scripts/DecisionPopup.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) decision popup in ingame menu has been changed Fri, 03 Dec 2010 13:58:02 GMT dafrick [7724] * code/trunk/src/orxonox/LevelManager.cc (modified) Changing default level, since it has been renamed. Fri, 03 Dec 2010 13:37:11 GMT dafrick [7709] * code/trunk (modified) * code/trunk/data/DefaultResources.oxr (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/tools/ResourceLocation.cc (modified) Merging data_cleanup branch. You will need to update your data ... Wed, 01 Dec 2010 14:21:11 GMT dafrick [7690] * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) Adjusting some small thing that got forgotten while merging. Wed, 01 Dec 2010 14:00:19 GMT dafrick [7689] * code/trunk (modified) * code/trunk/data/gui/layouts/HostMenu.layout (copied) * code/trunk/data/gui/layouts/MainMenuBackground.layout (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/scripts/AudioMenu.lua (modified) * code/trunk/data/gui/scripts/ControlsMenu.lua (modified) * code/trunk/data/gui/scripts/CreditsMenu.lua (modified) * code/trunk/data/gui/scripts/GUISheet.lua (modified) * code/trunk/data/gui/scripts/GUITools.lua (modified) * code/trunk/data/gui/scripts/GraphicsMenu.lua (modified) * code/trunk/data/gui/scripts/HostMenu.lua (copied) * code/trunk/data/gui/scripts/InGameMenu.lua (modified) * code/trunk/data/gui/scripts/MainMenu.lua (modified) * code/trunk/data/gui/scripts/MenuSheet.lua (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/SettingsMenu.lua (modified) * code/trunk/data/gui/scripts/SheetManager.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified) * code/trunk/src/orxonox/overlays/InGameConsole.cc (modified) Merging menu branch to trunk. Tue, 30 Nov 2010 21:40:06 GMT dafrick [7680] * code/trunk/data/levels/presentationPong.oxw (moved) Forgot to rename one level file. Sun, 28 Nov 2010 22:21:20 GMT dafrick [7679] * code/trunk/data/levels/FPSTest.oxw (moved) * code/trunk/data/levels/asteroids.oxw (moved) * code/trunk/data/levels/dynamicMatch.oxw (moved) * code/trunk/data/levels/emptyLevel.oxw (moved) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fightInOurBack.oxw (moved) * code/trunk/data/levels/includes/weaponSettings1.oxi (moved) * code/trunk/data/levels/includes/weaponSettings2.oxi (moved) * code/trunk/data/levels/includes/weaponSettings3.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsFPS.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsGhost.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsH2.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsHXY.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsPirate.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsSwallow.oxi (moved) * code/trunk/data/levels/includes/weaponSettingsTransporter.oxi (moved) * code/trunk/data/levels/lastManStanding.oxw (moved) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/old/CuboidSpaceStation.oxw (modified) * code/trunk/data/levels/old/physicsTest.oxw (moved) * code/trunk/data/levels/old/physicsTest2.oxw (moved) * code/trunk/data/levels/old/planetTest.oxw (moved) * code/trunk/data/levels/old/presentationLOD.oxw (modified) * code/trunk/data/levels/old/presentationPhysics.oxw (moved) * code/trunk/data/levels/old/princessAeryn.oxw (moved) * code/trunk/data/levels/old/questSystem.oxw (moved) * code/trunk/data/levels/old/sample4.oxw (modified) * code/trunk/data/levels/old/spaceshipTemplatesPhysics.oxw (moved) * code/trunk/data/levels/old/tutorialHS08.oxw (moved) * code/trunk/data/levels/pickups.oxw (modified) * code/trunk/data/levels/pirateAttack.oxw (moved) * 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 (moved) * code/trunk/data/levels/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationFS102.oxw (moved) * code/trunk/data/levels/presentationFS10Ed.oxw (moved) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentation_pong.oxw (modified) * code/trunk/data/levels/princessAeryn.oxw (moved) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/teamBaseMatch.oxw (moved) * code/trunk/data/levels/teamDeathMatch.oxw (moved) * code/trunk/data/levels/templates/FPS.oxt (moved) * code/trunk/data/levels/templates/lodInformation.oxt (moved) * code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt (moved) * code/trunk/data/levels/templates/spaceshipAssff.oxt (moved) * code/trunk/data/levels/templates/spaceshipGhost.oxt (moved) * code/trunk/data/levels/templates/spaceshipH2.oxt (moved) * code/trunk/data/levels/templates/spaceshipHXY.oxt (moved) * code/trunk/data/levels/templates/spaceshipHXYSL.oxt (moved) * code/trunk/data/levels/templates/spaceshipPirate.oxt (moved) * code/trunk/data/levels/templates/spaceshipSwallow.oxt (moved) * code/trunk/data/levels/templates/spaceshipTransporter.oxt (moved) * code/trunk/data/levels/templates/spaceshipTransporterSL.oxt (moved) * code/trunk/data/levels/testStars.oxw (moved) * code/trunk/data/levels/testSwallow.oxw (moved) * code/trunk/data/levels/theTimeMachine.oxw (moved) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/underAttack.oxw (moved) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/data/overlays/HUD.oxo (moved) * code/trunk/data/overlays/HUDTemplates3.oxo (moved) * code/trunk/data/overlays/HUDTemplatesFPS.oxo (moved) * code/trunk/data/overlays/dynamicMatchHUD.oxo (moved) * code/trunk/data/overlays/lastManStandingHUD.oxo (moved) * code/trunk/data/overlays/pongHUD.oxo (moved) * code/trunk/data/overlays/teamBaseMatchHUD.oxo (moved) * code/trunk/data/overlays/underAttackHUD.oxo (moved) * code/trunk/doc/api/Groups.dox (modified) Renaming levelfiles (and some other) according to our new naming ... Fri, 26 Nov 2010 12:40:00 GMT dafrick [7678] * code/trunk/src/modules/objects/ForceField.h (modified) Adding documentation for invertedSphere ForceField. Fri, 26 Nov 2010 12:25:56 GMT dafrick [7677] * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Adding yet another class of ForceFields and using it in The Time Machine. Fri, 26 Nov 2010 07:44:48 GMT dafrick [7676] * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Some documentation and simplification Thu, 25 Nov 2010 23:06:43 GMT dafrick [7675] * code/trunk/data/levels/The Time Machine.oxw (modified) Forgot to revert The Time Machine Thu, 25 Nov 2010 23:01:53 GMT dafrick [7674] * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) Resolving some stupid bugs and some adding some minor improvements. Thu, 25 Nov 2010 22:24:50 GMT dafrick [7673] * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/src/modules/objects/ForceField.cc (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/orxonox/infos/Bot.cc (modified) Documenting and extending ForceField. A little cleaning up in The ... Thu, 18 Nov 2010 20:54:39 GMT rgrieder [7655] * code/trunk (modified) * code/trunk/data/levels/gametype_asteroids.oxw (modified) * code/trunk/data/levels/gametype_dynamicmatch.oxw (modified) * code/trunk/data/levels/gametype_lastmanstanding.oxw (copied) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/test_swallow.oxw (modified) * code/trunk/data/overlays/dynamicmatchhud.oxo (modified) * code/trunk/data/overlays/lastmanstandinghud.oxo (copied) * code/trunk/src/modules/notifications/Notification.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/LastManStandingInfos.cc (copied) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (copied) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) * code/trunk/src/orxonox/gametypes/Asteroids.cc (modified) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (copied) * code/trunk/src/orxonox/gametypes/LastManStanding.h (copied) * code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified) Merged lastmanstanding back to trunk. Thu, 18 Nov 2010 20:49:55 GMT rgrieder [7654] * code/trunk (modified) * code/trunk/data/levels/gametype_lastmanstanding.oxw (deleted) * code/trunk/data/overlays/lastmanstandinghud.oxo (deleted) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (deleted) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (deleted) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (deleted) * code/trunk/src/orxonox/gametypes/LastManStanding.h (deleted) Reverted attempt to merge lastmanstanding branch. Thu, 18 Nov 2010 20:37:19 GMT jo [7653] * code/trunk (modified) * code/trunk/data/levels/gametype_lastmanstanding.oxw (added) * code/trunk/data/overlays/lastmanstandinghud.oxo (added) * code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc (added) * code/trunk/src/modules/overlays/hud/LastManStandingInfos.h (added) * code/trunk/src/orxonox/gametypes/CMakeLists.txt (modified) * code/trunk/src/orxonox/gametypes/LastManStanding.cc (added) * code/trunk/src/orxonox/gametypes/LastManStanding.h (added) initial upload Thu, 18 Nov 2010 19:22:04 GMT landauf [7652] * code/trunk/src/modules/objects/triggers/TriggerBase.cc (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.h (modified) * code/trunk/src/orxonox/LevelInfo.cc (modified) * code/trunk/src/orxonox/LevelInfo.h (modified) eol-style native Sat, 13 Nov 2010 22:55:23 GMT dafrick [7648] * code/trunk (modified) * code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified) * code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified) * code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified) * code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified) * code/trunk/data/levels/Fight in our Back.oxw (modified) * code/trunk/data/levels/Quest_PirateAttack.oxw (modified) * code/trunk/data/levels/The Time Machine.oxw (modified) * code/trunk/data/levels/empty_level.oxw (modified) * code/trunk/data/levels/events.oxw (modified) * code/trunk/data/levels/fps_test.oxw (modified) * code/trunk/data/levels/notifications.oxw (modified) * code/trunk/data/levels/pickups.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/presentationFS10.oxw (modified) * code/trunk/data/levels/presentationHS09.oxw (modified) * code/trunk/data/levels/presentationHS09b.oxw (modified) * code/trunk/data/levels/presentation_FS10.oxw (modified) * code/trunk/data/levels/presentation_FS10_ed.oxw (modified) * code/trunk/data/levels/presentation_dm.oxw (modified) * code/trunk/data/levels/princessaeryn.oxw (modified) * code/trunk/data/levels/screenshot.oxw (modified) * code/trunk/data/levels/sound.oxw (modified) * code/trunk/data/levels/teambasematchlevel.oxw (modified) * code/trunk/data/levels/teamdeathmatch.oxw (modified) * code/trunk/data/levels/test_stars.oxw (modified) * code/trunk/data/levels/test_swallow.oxw (modified) * code/trunk/data/levels/tutorial.oxw (modified) * code/trunk/data/levels/waypoints.oxw (modified) * code/trunk/src/libraries/core/GUIManager.cc (modified) * code/trunk/src/libraries/core/GUIManager.h (modified) * code/trunk/src/libraries/core/Loader.cc (modified) * code/trunk/src/libraries/core/Loader.h (modified) * code/trunk/src/orxonox/CMakeLists.txt (modified) * code/trunk/src/orxonox/Level.cc (modified) * code/trunk/src/orxonox/LevelInfo.cc (copied) * code/trunk/src/orxonox/LevelInfo.h (copied) * code/trunk/src/orxonox/LevelManager.cc (modified) * code/trunk/src/orxonox/LevelManager.h (modified) * code/trunk/src/orxonox/OrxonoxPrereqs.h (modified) Merged releasetodo, containing a new way to describe and tag levels, ... Thu, 04 Nov 2010 09:57:19 GMT dafrick [7612] * code/trunk/data/gui/layouts/ChatBox.layout (modified) * code/trunk/data/gui/scripts/ChatBox.lua (modified) Reverting a change that I made some time ago. It turns out, that ... Wed, 03 Nov 2010 11:51:32 GMT dafrick [7610] * code/trunk/doc/api/Groups.dox (modified) Removing unintentionally copy-pasted link. Wed, 03 Nov 2010 11:43:04 GMT dafrick [7609] * code/trunk/doc/api/Groups.dox (modified) Moving MultiTrigger documentation to doxygen. Tue, 02 Nov 2010 21:36:20 GMT dafrick [7606] * code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified) Some small detail I forgot to change. Sat, 30 Oct 2010 11:54:49 GMT dafrick [7601] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/src/modules/objects/Attacher.h (modified) * code/trunk/src/modules/objects/ForceField.h (modified) * code/trunk/src/modules/objects/ObjectsPrereqs.h (modified) * code/trunk/src/modules/objects/Planet.h (modified) * code/trunk/src/modules/objects/Script.h (modified) * code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.h (modified) * code/trunk/src/modules/objects/collisionshapes/SphereCollisionShape.h (modified) * code/trunk/src/modules/objects/eventsystem/EventDispatcher.h (modified) * code/trunk/src/modules/objects/eventsystem/EventFilter.h (modified) * code/trunk/src/modules/objects/eventsystem/EventListener.h (modified) * code/trunk/src/modules/objects/eventsystem/EventName.h (modified) * code/trunk/src/modules/objects/eventsystem/EventTarget.h (modified) * code/trunk/src/modules/objects/triggers/CMakeLists.txt (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.cc (modified) * code/trunk/src/modules/objects/triggers/CheckPoint.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/DistanceTriggerBeacon.cc (modified) * code/trunk/src/modules/objects/triggers/DistanceTriggerBeacon.h (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventMultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/EventTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified) * code/trunk/src/modules/objects/triggers/MultiTriggerContainer.h (modified) * code/trunk/src/modules/objects/triggers/Trigger.cc (modified) * code/trunk/src/modules/objects/triggers/Trigger.h (modified) * code/trunk/src/modules/objects/triggers/TriggerBase.cc (added) * code/trunk/src/modules/objects/triggers/TriggerBase.h (added) * code/trunk/src/orxonox/interfaces/PlayerTrigger.h (modified) Adding all classes in modules/objects to Objects module (in doxygen). ... Sun, 17 Oct 2010 20:50:43 GMT dafrick [7552] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/src/modules/notifications/Notification.h (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.cc (modified) * code/trunk/src/modules/notifications/NotificationDispatcher.h (modified) * code/trunk/src/modules/notifications/NotificationManager.cc (modified) * code/trunk/src/modules/notifications/NotificationManager.h (modified) * code/trunk/src/modules/notifications/NotificationQueue.h (modified) * code/trunk/src/modules/notifications/dispatchers/CommandNotification.h (modified) * code/trunk/src/modules/notifications/dispatchers/SimpleNotification.h (modified) * code/trunk/src/modules/questsystem/GlobalQuest.cc (modified) * code/trunk/src/modules/questsystem/GlobalQuest.h (modified) * code/trunk/src/modules/questsystem/LocalQuest.cc (modified) * code/trunk/src/modules/questsystem/LocalQuest.h (modified) * code/trunk/src/modules/questsystem/Quest.cc (modified) * code/trunk/src/modules/questsystem/Quest.h (modified) * code/trunk/src/modules/questsystem/QuestDescription.h (modified) * code/trunk/src/modules/questsystem/QuestEffect.h (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) * code/trunk/src/modules/questsystem/QuestEffectBeacon.h (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.h (modified) * code/trunk/src/modules/questsystem/QuestItem.h (modified) * code/trunk/src/modules/questsystem/QuestListener.h (modified) * code/trunk/src/modules/questsystem/QuestManager.cc (modified) * code/trunk/src/modules/questsystem/QuestManager.h (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuest.h (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.cc (modified) * code/trunk/src/modules/questsystem/effects/AddQuestHint.h (modified) * code/trunk/src/modules/questsystem/effects/AddReward.h (modified) * code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/CompleteQuest.h (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.cc (modified) * code/trunk/src/modules/questsystem/effects/FailQuest.h (modified) * code/trunk/src/orxonox/interfaces/NotificationListener.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/items/Engine.h (modified) Resolving some TODOs and doing some additional cleanup. Almost done ... Sun, 17 Oct 2010 19:40:53 GMT dafrick [7551] * code/trunk/doc/api/Groups.dox (modified) * code/trunk/doc/api/images/pickupmodule.png (added) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified) Moved documentation for pickup module from wiki to doxygen. Sat, 16 Oct 2010 12:45:07 GMT dafrick [7550] * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) Drone is much weaker now (makes less damage (pi/2) per gun), which ... Sat, 16 Oct 2010 12:18:45 GMT dafrick [7549] * code/trunk/src/modules/pickup/DroppedPickup.cc (modified) * code/trunk/src/modules/pickup/DroppedPickup.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) Resolving some more TODO's. Sat, 16 Oct 2010 11:22:15 GMT dafrick [7548] * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupRepresentation.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/questsystem/QuestHint.cc (modified) Resolving some TODO's. Sat, 16 Oct 2010 10:37:09 GMT dafrick [7547] * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/src/modules/pickup/CollectiblePickup.h (modified) * code/trunk/src/modules/pickup/Pickup.cc (modified) * code/trunk/src/modules/pickup/Pickup.h (modified) * code/trunk/src/modules/pickup/PickupCollection.cc (modified) * code/trunk/src/modules/pickup/PickupCollection.h (modified) * code/trunk/src/modules/pickup/PickupManager.cc (modified) * code/trunk/src/modules/pickup/PickupManager.h (modified) * code/trunk/src/modules/pickup/PickupRepresentation.h (modified) * code/trunk/src/modules/pickup/PickupSpawner.cc (modified) * code/trunk/src/modules/pickup/PickupSpawner.h (modified) * code/trunk/src/modules/pickup/items/DronePickup.cc (modified) * code/trunk/src/modules/pickup/items/DronePickup.h (modified) * code/trunk/src/modules/pickup/items/HealthPickup.cc (modified) * code/trunk/src/modules/pickup/items/HealthPickup.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) * code/trunk/src/modules/pickup/items/MetaPickup.cc (modified) * code/trunk/src/modules/pickup/items/MetaPickup.h (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) * code/trunk/src/modules/pickup/items/ShieldPickup.h (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) * code/trunk/src/modules/pickup/items/SpeedPickup.h (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.cc (modified) * code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified) * code/trunk/src/orxonox/interfaces/PickupListener.h (modified) * code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) * code/trunk/src/orxonox/interfaces/Pickupable.h (modified) * code/trunk/src/orxonox/items/Engine.cc (modified) * code/trunk/src/orxonox/items/Engine.h (modified) * code/trunk/src/orxonox/pickup/PickupIdentifier.h (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) Documenting and cleanup. Fri, 15 Oct 2010 06:43:02 GMT dafrick [7546] * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) Ok, this should finally do it. Fri, 15 Oct 2010 06:35:20 GMT dafrick [7545] * code/trunk/src/libraries/tools/Timer.h (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) Improvements in InvisiblePickup. Fri, 15 Oct 2010 06:14:03 GMT dafrick [7544] * code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) * code/trunk/src/modules/pickup/items/InvisiblePickup.h (modified) Fixing bug I introduced.