# # ChangeLog for / # # Generated by Trac 1.0.9 # Nov 28, 2024, 11:14:22 PM 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 16:18:30 GMT bknecht [7869] * code/branches/menuanimations2 (deleted) there will be an animation engine in CEGUI 0.7.x 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:32:12 GMT landauf [7867] * code/branches/consolecommands2 (deleted) * code/branches/consolecommands3 (deleted) removed console command branches Sat, 12 Feb 2011 14:11:12 GMT bknecht [7866] * code/branches/menuanimations (deleted) removing old branch 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 14:08:01 GMT bknecht [7864] * code/branches/menuanimations2 (copied) creating new branch to work on menu animations 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 ... Thu, 03 Feb 2011 16:46:31 GMT jo [7843] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) Little feature added: Bot's are following their victims. So that they ... Mon, 31 Jan 2011 22:36:18 GMT jo [7842] * 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) Console command still doesn't seem to work. botLevel_ is now defined ... Mon, 31 Jan 2011 20:33:18 GMT jo [7841] * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) That was not intened. Mon, 31 Jan 2011 20:30:13 GMT jo [7840] * code/branches/ai/src/orxonox/controllers/AIController.cc (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) Creating a console command. 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, ... Fri, 28 Jan 2011 20:13:56 GMT dafrick [7838] * data/test (deleted) Done testing... Fri, 28 Jan 2011 19:41:52 GMT dafrick [7837] * data/test/subfolder/redplanet.png (added) Adding symbolic link. Fri, 28 Jan 2011 19:40:57 GMT dafrick [7836] * data/test/folder (added) * data/test/folder/redplanet.png (added) * data/test/subfolder (added) Some things to test with. Fri, 28 Jan 2011 19:37:38 GMT dafrick [7835] * data/test (added) Create new test repository to test symbolic links. Thu, 27 Jan 2011 21:55:30 GMT jo [7834] * code/branches/ai/data/levels/gametype_lastmanstanding.oxw (modified) * code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) The bot's level can be set via spawnpoints. Example: lastmanstanding ... Thu, 27 Jan 2011 18:50:16 GMT jo [7833] * 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) The ai's strength can be modified by changing the value botlevel_ . ... Thu, 27 Jan 2011 14:58:04 GMT jo [7832] * 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) Now the ai use lensflare if the weapon is on board and if they are ... Mon, 17 Jan 2011 19:51:15 GMT dafrick [7831] * code/branches/tutoriallevel/data/gui/layouts/QuestGUI.layout (modified) * code/branches/tutoriallevel/data/gui/scripts/QuestGUI.lua (modified) Improvements on QuestGUI, also documented some of the code. Sun, 16 Jan 2011 13:15:39 GMT dafrick [7830] * code/branches/tutoriallevel/data/gui/layouts/QuestGUI.layout (modified) * code/branches/tutoriallevel/data/gui/scripts/QuestGUI.lua (modified) * code/branches/tutoriallevel/data/gui/scripts/SingleplayerMenu.lua (modified) * code/branches/tutoriallevel/data/levels/quests.oxw (added) * code/branches/tutoriallevel/src/modules/questsystem/QuestManager.cc (modified) * code/branches/tutoriallevel/src/modules/questsystem/QuestManager.h (modified) New implementation of QuestGUI. Should be much more usable now, ... Thu, 13 Jan 2011 22:43:20 GMT dafrick [7829] * code/branches/tutoriallevel/src/modules/objects/triggers/MultiTrigger.cc (modified) * code/branches/tutoriallevel/src/modules/objects/triggers/TriggerBase.h (modified) Fixing small bug in MultiTrigger. Thu, 13 Jan 2011 20:56:25 GMT dafrick [7828] * code/branches/tutoriallevel/src/orxonox/LevelManager.cc (modified) Fixed bug in LevelManager. Thu, 13 Jan 2011 19:25:19 GMT jo [7827] * code/branches/ai/src/orxonox/controllers/CMakeLists.txt (modified) * code/branches/ai/src/orxonox/controllers/Detector.cc (added) * code/branches/ai/src/orxonox/controllers/Detector.h (added) First draft. The detector tries to detect events that are critical ... Thu, 13 Jan 2011 19:22:15 GMT dafrick [7826] * code/branches/tutoriallevel (copied) Creating new branch to work on tutorial level (and everything that ... Wed, 29 Dec 2010 22:41:51 GMT scheusso [7825] * code/branches/network6/src/libraries/network/ClientConnection.cc (modified) * code/branches/network6/src/libraries/network/Connection.cc (modified) * code/branches/network6/src/libraries/network/Connection.h (modified) * code/branches/network6/src/libraries/network/GamestateManager.cc (modified) * code/branches/network6/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network6/src/libraries/network/synchronisable/Synchronisable.cc (modified) -enabling client-side gamestate diffing -added some optimisations Tue, 28 Dec 2010 18:11:32 GMT scheusso [7824] * code/branches/network6/src/libraries/network/Connection.cc (modified) this should prevent disconnecting clients from crashing our servers ;) Tue, 28 Dec 2010 15:46:42 GMT scheusso [7823] * code/branches/network6/src/libraries/network/CMakeLists.txt (modified) * code/branches/network6/src/libraries/network/ClientConnection.cc (modified) * code/branches/network6/src/libraries/network/ClientConnection.h (modified) * code/branches/network6/src/libraries/network/ClientConnectionListener.cc (modified) * code/branches/network6/src/libraries/network/ClientConnectionListener.h (modified) * code/branches/network6/src/libraries/network/ClientInformation.cc (deleted) * code/branches/network6/src/libraries/network/ClientInformation.h (deleted) * code/branches/network6/src/libraries/network/Connection.cc (modified) * code/branches/network6/src/libraries/network/Connection.h (modified) * code/branches/network6/src/libraries/network/GamestateClient.cc (deleted) * code/branches/network6/src/libraries/network/GamestateClient.h (deleted) * code/branches/network6/src/libraries/network/GamestateManager.h (modified) * code/branches/network6/src/libraries/network/Host.cc (modified) * code/branches/network6/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/network6/src/libraries/network/Server.cc (modified) * code/branches/network6/src/libraries/network/Server.h (modified) * code/branches/network6/src/libraries/network/ServerConnection.cc (modified) * code/branches/network6/src/libraries/network/ServerConnection.h (modified) * code/branches/network6/src/libraries/network/packet/Packet.cc (modified) * code/branches/network6/src/libraries/network/packet/Packet.h (modified) * code/branches/network6/src/modules/overlays/hud/ChatOverlay.cc (modified) * code/branches/network6/src/orxonox/ChatHistory.cc (modified) * code/branches/network6/src/orxonox/ChatInputHandler.cc (modified) * code/branches/network6/src/orxonox/PlayerManager.cc (modified) * code/branches/network6/src/orxonox/gamestates/GSRoot.cc (modified) * code/branches/network6/src/orxonox/gametypes/Dynamicmatch.cc (modified) * code/branches/network6/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/network6/src/orxonox/gametypes/LastManStanding.cc (modified) * code/branches/network6/src/orxonox/gametypes/TeamBaseMatch.cc (modified) * code/branches/network6/src/orxonox/gametypes/UnderAttack.cc (modified) * code/branches/network6/src/orxonox/infos/GametypeInfo.cc (modified) * code/branches/network6/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/network6/src/orxonox/infos/PlayerInfo.cc (modified) again some structural changes in network to increase ... Tue, 28 Dec 2010 15:43:05 GMT scheusso [7822] * code/branches/network6 (copied) creating new network6 branch to fix possible bug when client disconnects Tue, 28 Dec 2010 15:40:44 GMT scheusso [7821] * code/branches/network4 (deleted) * code/branches/network5 (deleted) * code/branches/presentation (deleted) * code/branches/presentation2 (deleted) removing branches not needed anymore Sun, 26 Dec 2010 20:16:53 GMT rgrieder [7820] * code/forks/sandbox_qt/cmake/tools/SourceFileUtilities.cmake (modified) * code/forks/sandbox_qt/cmake/tools/TargetUtilities.cmake (modified) * code/forks/sandbox_qt/src/CMakeLists.txt (modified) Fixed problem with files directly supplied to ORXONOX_ADD_TARGET. 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 16:26:58 GMT rgrieder [7817] * code/forks/pch_analyser/src/orxonox/Main.cc (modified) Merged r7816 from sandbox_qt. Sun, 26 Dec 2010 16:16:12 GMT rgrieder [7816] * code/forks/sandbox_qt/src/orxonox/Main.cc (modified) Improved exception handling in sandbox Qt. Sun, 26 Dec 2010 15:55:55 GMT rgrieder [7815] * code/forks/pch_analyser/src/orxonox/Analyser.cc (added) * code/forks/pch_analyser/src/orxonox/Analyser.h (added) * code/forks/pch_analyser/src/orxonox/CMakeLists.txt (modified) * code/forks/pch_analyser/src/orxonox/Main.cc (modified) * code/forks/pch_analyser/src/orxonox/MainWindow.cc (deleted) * code/forks/pch_analyser/src/orxonox/MainWindow.h (deleted) Added code for the PCH Analyser (but impossible to use without a ... Sun, 26 Dec 2010 15:53:28 GMT rgrieder [7814] * code/forks/pch_analyser (copied) Created fork for PCH analysis: MSVC can produce output that shows ... Sun, 26 Dec 2010 15:49:30 GMT rgrieder [7813] * code/forks/sandbox_qt/src/OrxonoxConfig.h.in (modified) Fixed build. Sun, 26 Dec 2010 12:54:30 GMT rgrieder [7812] * code/branches/ipv6 (deleted) Removed merged branch. 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 23:01:17 GMT rgrieder [7808] * code/forks/sandbox_qt/doc/api/doxy.config.in (modified) * code/forks/sandbox_qt/src/SpecialConfig.h.in (modified) Changed two details. Sat, 25 Dec 2010 23:00:59 GMT rgrieder [7807] * code/forks/sandbox_qt/cmake/CompilerConfigMSVC.cmake (modified) * code/forks/sandbox_qt/cmake/tools/TargetUtilities.cmake (modified) Adding static linker flags (used by MSVC only). Sat, 25 Dec 2010 23:00:14 GMT rgrieder [7806] * code/forks/sandbox_qt/cmake/CompilerConfigMSVC.cmake (modified) * code/forks/sandbox_qt/cmake/PackageConfigMSVC.cmake (modified) * code/forks/sandbox_qt/src/CMakeLists.txt (modified) * code/forks/sandbox_qt/src/OrxonoxConfig.cmake (modified) * code/forks/sandbox_qt/src/OrxonoxConfig.h.in (modified) Sorted out Visual Leak Detector issues (using new version 2 now). Sat, 25 Dec 2010 22:58:25 GMT rgrieder [7805] * code/forks/sandbox_qt/cmake/tools/SourceFileUtilities.cmake (modified) * code/forks/sandbox_qt/cmake/tools/TargetUtilities.cmake (modified) * code/forks/sandbox_qt/src/CMakeLists.txt (modified) * code/forks/sandbox_qt/src/orxonox/CMakeLists.txt (modified) Changed source file handling procedure, especially for Qt moc files. 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. Wed, 22 Dec 2010 12:38:02 GMT rgrieder [7800] * code/branches/presentation2/src/libraries/network/MasterServer.h (modified) * code/branches/presentation2/src/libraries/network/MasterServerComm.h (modified) Fixed build. Wed, 22 Dec 2010 12:34:41 GMT rgrieder [7799] * code/branches/presentation2/src/libraries/network/Connection.h (modified) Fixed build. Wed, 22 Dec 2010 10:19:25 GMT scheusso [7798] * code/branches/presentation2/src/modules/objects/ForceField.h (modified) another try ;) Wed, 22 Dec 2010 10:08:53 GMT scheusso [7797] * code/branches/presentation2/src/modules/objects/ForceField.cc (modified) * code/branches/presentation2/src/modules/objects/ForceField.h (modified) trying to make forcefield synchronisable Wed, 22 Dec 2010 09:37:18 GMT dafrick [7796] * code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) * code/branches/presentation2/src/modules/pickup/PickupSpawner.cc (modified) Making PickupSpawner more secure. Small gui adjustment. Wed, 22 Dec 2010 09:36:39 GMT scheusso [7795] * code/branches/presentation2/src/orxonox/controllers/ArtificialController.cc (modified) disabling formationflight per default (as it seems to make bots more ... Wed, 22 Dec 2010 09:15:12 GMT scheusso [7794] * code/branches/presentation2/src/libraries/network/WANDiscovery.cc (modified) * code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc (modified) WANDiscovery singleton is now in graphics scope (not needed in ... Wed, 22 Dec 2010 02:05:31 GMT scheusso [7793] * code/branches/presentation2/src/libraries/network/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/network/Connection.cc (modified) * code/branches/presentation2/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation2/src/libraries/network/MasterServerComm.h (modified) * code/branches/presentation2/src/libraries/network/Server.cc (modified) * code/branches/presentation2/src/libraries/network/Server.h (modified) * code/branches/presentation2/src/libraries/network/WANDiscoverable.cc (added) * code/branches/presentation2/src/libraries/network/WANDiscoverable.h (added) * code/branches/presentation2/src/libraries/network/packet/ServerInformation.cc (modified) * code/branches/presentation2/src/libraries/network/packet/ServerInformation.h (modified) some changes in WANDiscovering: - fixed a bug which caused memory ... Tue, 21 Dec 2010 22:23:07 GMT dafrick [7792] * code/branches/presentation2/src/orxonox/infos/Bot.cc (modified) Forgot a comma in the bot name list. Tue, 21 Dec 2010 21:24:50 GMT dafrick [7791] * code/branches/presentation2/src/modules/pickup/PickupSpawner.cc (modified) Resolving bug in release mode, asserts apparently are just ignored ... Tue, 21 Dec 2010 20:27:36 GMT scheusso [7790] * code/branches/presentation2/src/libraries/network/LANDiscoverable.cc (modified) * code/branches/presentation2/src/libraries/network/MasterServer.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/presentation2/src/orxonox/gamestates/GSServer.cc (modified) changing landiscoverable port to fix problem when running ... Tue, 21 Dec 2010 18:10:53 GMT rgrieder [7789] * code/branches/mac_osx (moved) Renaming branch to better fit it's purpose. Please use 'svn switch ... Tue, 21 Dec 2010 17:09:09 GMT scheusso [7788] * code/branches/presentation2 (modified) * code/branches/presentation2/src/libraries/network/CMakeLists.txt (modified) * code/branches/presentation2/src/libraries/network/Client.cc (modified) * code/branches/presentation2/src/libraries/network/Client.h (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ClientConnection.h (modified) * code/branches/presentation2/src/libraries/network/ClientInformation.cc (modified) * code/branches/presentation2/src/libraries/network/ClientInformation.h (modified) * code/branches/presentation2/src/libraries/network/Connection.cc (modified) * code/branches/presentation2/src/libraries/network/Connection.h (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/presentation2/src/libraries/network/FunctionCallManager.h (modified) * code/branches/presentation2/src/libraries/network/GamestateClient.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateClient.h (modified) * code/branches/presentation2/src/libraries/network/GamestateHandler.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateHandler.h (modified) * code/branches/presentation2/src/libraries/network/GamestateManager.cc (modified) * code/branches/presentation2/src/libraries/network/GamestateManager.h (modified) * code/branches/presentation2/src/libraries/network/Host.cc (modified) * code/branches/presentation2/src/libraries/network/Host.h (modified) * code/branches/presentation2/src/libraries/network/MasterServerComm.cc (modified) * code/branches/presentation2/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/presentation2/src/libraries/network/Server.cc (modified) * code/branches/presentation2/src/libraries/network/Server.h (modified) * code/branches/presentation2/src/libraries/network/ServerConnection.cc (modified) * code/branches/presentation2/src/libraries/network/ServerConnection.h (modified) * code/branches/presentation2/src/libraries/network/WANDiscovery.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Acknowledgement.h (modified) * code/branches/presentation2/src/libraries/network/packet/Chat.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Chat.h (modified) * code/branches/presentation2/src/libraries/network/packet/ClassID.cc (modified) * code/branches/presentation2/src/libraries/network/packet/ClassID.h (modified) * code/branches/presentation2/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/presentation2/src/libraries/network/packet/DeleteObjects.h (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionCalls.h (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/presentation2/src/libraries/network/packet/FunctionIDs.h (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Gamestate.h (modified) * code/branches/presentation2/src/libraries/network/packet/Packet.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Packet.h (modified) * code/branches/presentation2/src/libraries/network/packet/Welcome.cc (modified) * code/branches/presentation2/src/libraries/network/packet/Welcome.h (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.cc (modified) * code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h (modified) * code/branches/presentation2/src/libraries/util/SignalHandler.cc (modified) * code/branches/presentation2/src/modules/weapons/MuzzleFlash.cc (modified) * code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/presentation2/src/orxonox/gametypes/Gametype.h (modified) merged network5 into presentation2 branch (untested) Tue, 21 Dec 2010 17:04:36 GMT scheusso [7787] * code/branches/presentation2 (copied) creating presentation2 branch (in order to merge network5 into it) Tue, 21 Dec 2010 13:10:35 GMT dafrick [7786] * code/branches/presentation/data/levels/lastManStanding.oxw (modified) Also applying the skybox changes to the presentation branch. ;) 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 ... Tue, 21 Dec 2010 12:37:27 GMT decapitb [7784] * data/trunk/materials/OrxonoxSky.material (modified) skybox materials. Names: skyBoxBasic, skyBoxSomeNebula, skyBoxMoreNebula Tue, 21 Dec 2010 12:31:11 GMT decapitb [7783] * data/trunk/images/skyboxes/skybox1_bk.png (added) * data/trunk/images/skyboxes/skybox1_dn.png (added) * data/trunk/images/skyboxes/skybox1_fr.png (added) * data/trunk/images/skyboxes/skybox1_lf.png (added) * data/trunk/images/skyboxes/skybox1_rt.png (added) * data/trunk/images/skyboxes/skybox1_up.png (added) * data/trunk/images/skyboxes/skybox2_bk.png (added) * data/trunk/images/skyboxes/skybox2_dn.png (added) * data/trunk/images/skyboxes/skybox2_fr.png (added) * data/trunk/images/skyboxes/skybox2_lf.png (added) * data/trunk/images/skyboxes/skybox2_rt.png (added) * data/trunk/images/skyboxes/skybox2_up.png (added) * data/trunk/images/skyboxes/skybox3_bk.png (added) * data/trunk/images/skyboxes/skybox3_dn.png (added) * data/trunk/images/skyboxes/skybox3_fr.png (added) * data/trunk/images/skyboxes/skybox3_lf.png (added) * data/trunk/images/skyboxes/skybox3_rt.png (added) * data/trunk/images/skyboxes/skybox3_up.png (added) three new skyboxes with different levels of nebula, otherwise mostly ... Mon, 20 Dec 2010 22:09:06 GMT youngk [7782] * code/branches/ois_update/cmake/tools/FindALUT.cmake (modified) ois_update branch now compiles on all unixes again. Made a minor booboo. Sun, 19 Dec 2010 20:48:30 GMT scheusso [7781] * code/branches/network5/src/orxonox/controllers/NewHumanController.cc (modified) fix: NHC doesn't aim (and shoot) at own spaceship and objects to ... Sun, 19 Dec 2010 20:41:57 GMT scheusso [7780] * code/branches/network5/src/libraries/network/Client.h (modified) * code/branches/network5/src/libraries/network/Connection.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/Server.h (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) * code/branches/network5/src/orxonox/gametypes/Gametype.cc (modified) some fixes reactivating acking and gamestate diffing Sun, 19 Dec 2010 18:37:18 GMT konrad [7779] * code/branches/presentation/data/gui/layouts/AudioMenu.layout (modified) * code/branches/presentation/data/gui/layouts/CreditsMenu.layout (modified) * code/branches/presentation/data/gui/layouts/GraphicsMenu.layout (modified) * code/branches/presentation/data/gui/scripts/GraphicsMenu.lua (modified) Final changes to menu Sun, 19 Dec 2010 13:29:44 GMT scheusso [7778] * code/branches/network5/src/orxonox/PlayerManager.cc (modified) * code/branches/network5/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/network5/src/orxonox/worldentities/pawns/Spectator.cc (modified) removing some debug output i forgot in the last commit further ... Sun, 19 Dec 2010 13:27:06 GMT scheusso [7777] * code/branches/network5/src/libraries/network/CMakeLists.txt (modified) * code/branches/network5/src/libraries/network/Client.cc (modified) * code/branches/network5/src/libraries/network/Client.h (modified) * code/branches/network5/src/libraries/network/ClientConnection.h (modified) * code/branches/network5/src/libraries/network/ClientInformation.cc (modified) * code/branches/network5/src/libraries/network/ClientInformation.h (modified) * code/branches/network5/src/libraries/network/Connection.cc (modified) * code/branches/network5/src/libraries/network/Connection.h (modified) * code/branches/network5/src/libraries/network/FunctionCallManager.cc (modified) * code/branches/network5/src/libraries/network/FunctionCallManager.h (modified) * code/branches/network5/src/libraries/network/GamestateClient.cc (modified) * code/branches/network5/src/libraries/network/GamestateClient.h (modified) * code/branches/network5/src/libraries/network/GamestateHandler.cc (modified) * code/branches/network5/src/libraries/network/GamestateHandler.h (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.h (modified) * code/branches/network5/src/libraries/network/Host.cc (modified) * code/branches/network5/src/libraries/network/Host.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/Server.h (modified) * code/branches/network5/src/libraries/network/packet/Acknowledgement.cc (modified) * code/branches/network5/src/libraries/network/packet/Acknowledgement.h (modified) * code/branches/network5/src/libraries/network/packet/Chat.cc (modified) * code/branches/network5/src/libraries/network/packet/Chat.h (modified) * code/branches/network5/src/libraries/network/packet/ClassID.cc (modified) * code/branches/network5/src/libraries/network/packet/ClassID.h (modified) * code/branches/network5/src/libraries/network/packet/DeleteObjects.cc (modified) * code/branches/network5/src/libraries/network/packet/DeleteObjects.h (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.cc (modified) * code/branches/network5/src/libraries/network/packet/FunctionCalls.h (modified) * code/branches/network5/src/libraries/network/packet/FunctionIDs.cc (modified) * code/branches/network5/src/libraries/network/packet/FunctionIDs.h (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.cc (modified) * code/branches/network5/src/libraries/network/packet/Gamestate.h (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.h (modified) * code/branches/network5/src/libraries/network/packet/Welcome.cc (modified) * code/branches/network5/src/libraries/network/packet/Welcome.h (modified) * code/branches/network5/src/orxonox/PlayerManager.cc (modified) * code/branches/network5/src/orxonox/gametypes/Gametype.cc (modified) * code/branches/network5/src/orxonox/infos/HumanPlayer.cc (modified) * code/branches/network5/src/orxonox/worldentities/pawns/Spectator.cc (modified) some (^^) structural changes some functional changes ... Fri, 17 Dec 2010 19:26:35 GMT scheusso [7776] * code/branches/network5/src/libraries/util/SignalHandler.cc (modified) this should fix problems on linux versions other than ubuntu 10.10 Fri, 17 Dec 2010 13:22:00 GMT scheusso [7775] * code/branches/network5/src/libraries/util/SignalHandler.cc (modified) this should reenable the SignalHandler's backtrace for more ... Fri, 17 Dec 2010 10:49:08 GMT scheusso [7774] * code/branches/network5/src/libraries/network/ClientConnection.cc (modified) * code/branches/network5/src/libraries/network/Connection.cc (modified) * code/branches/network5/src/libraries/network/Connection.h (modified) * code/branches/network5/src/libraries/network/ServerConnection.cc (modified) some comments enable enet packet compression Fri, 17 Dec 2010 10:09:14 GMT scheusso [7773] * code/branches/network5/src/libraries/network/ClientConnection.cc (modified) * code/branches/network5/src/libraries/network/GamestateManager.cc (modified) * code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/ServerConnection.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) small fix (ensure correct termination of communicationThread) Fri, 17 Dec 2010 09:41:24 GMT scheusso [7772] * code/branches/network5/src/libraries/network/Client.cc (modified) * code/branches/network5/src/libraries/network/Client.h (modified) * code/branches/network5/src/libraries/network/ClientConnection.cc (modified) * code/branches/network5/src/libraries/network/ClientConnection.h (modified) * code/branches/network5/src/libraries/network/Connection.cc (modified) * code/branches/network5/src/libraries/network/Connection.h (modified) * code/branches/network5/src/libraries/network/Host.cc (modified) * code/branches/network5/src/libraries/network/Host.h (modified) * code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified) * code/branches/network5/src/libraries/network/Server.cc (modified) * code/branches/network5/src/libraries/network/Server.h (modified) * code/branches/network5/src/libraries/network/ServerConnection.cc (modified) * code/branches/network5/src/libraries/network/ServerConnection.h (modified) * code/branches/network5/src/libraries/network/packet/Packet.cc (modified) * code/branches/network5/src/libraries/network/packet/Packet.h (modified) network is now multithreaded again further testing needed Thu, 16 Dec 2010 16:46:47 GMT youngk [7771] * code/branches/ois_update/src/libraries/core/Super.h (modified) Orxonox now properly loads resources on the Mac. It has become playable\!