#
# ChangeLog for code/branches
#
# Generated by Trac 1.0.9
# Nov 22, 2024, 2:29:31 PM

Sun, 27 Feb 2011 02:11:42 GMT rgrieder [7978]
	* code/branches/usability/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified)
	* code/branches/usability/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/branches/usability/src/modules/objects/triggers/DistanceTrigger.h (modified)
	* code/branches/usability/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/branches/usability/src/modules/questsystem/effects/AddQuestHint.cc (modified)
	* code/branches/usability/src/modules/questsystem/effects/ChangeQuestStatus.cc (modified)
	* code/branches/usability/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/usability/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/usability/src/orxonox/gamestates/GSMainMenu.h (modified)

	Increased code readability by replacing some BLANKSTRING with plain ...


Sun, 27 Feb 2011 00:32:30 GMT rgrieder [7977]
	* code/branches/kicklib/src/libraries/network/NetworkPrecompiledHeaders.h (modified)

	Fixed windows includes again, hopefully for the last time...


Sun, 27 Feb 2011 00:05:59 GMT landauf [7976]
	* code/branches/usability/src/libraries/tools/Shader.cc (modified)
	* code/branches/usability/src/libraries/tools/Shader.h (modified)
	* code/branches/usability/src/orxonox/items/Engine.cc (modified)

	rewrote parameter changing implementation of Shader
	added documentation


Sat, 26 Feb 2011 20:53:23 GMT rgrieder [7975]
	* code/branches/kicklib/src/external/enet/win32.c (modified)

	Fixed ENet build on msvc 8.


Sat, 26 Feb 2011 20:51:23 GMT rgrieder [7974]
	* code/branches/kicklib/src/modules/pickup/PickupCollection.h (modified)

	Fixed gcc3.4 warning.


Sat, 26 Feb 2011 20:12:59 GMT rgrieder [7973]
	* code/branches/kicklib/src/libraries/core/GUIManager.cc (modified)

	Fix for "error in error handling" when a Lua error occurs.
	Untested ...


Sat, 26 Feb 2011 19:50:06 GMT landauf [7972]
	* code/branches/usability/src/libraries/tools/Shader.cc (modified)
	* code/branches/usability/src/libraries/tools/Shader.h (modified)
	* code/branches/usability/src/orxonox/graphics/GlobalShader.cc (modified)
	* code/branches/usability/src/orxonox/graphics/GlobalShader.h (modified)

	slight rework of the Shader class:
	 - correctly loads and ...


Sat, 26 Feb 2011 19:13:15 GMT rgrieder [7971]
	* code/branches/kicklib/data/gui/scripts/GUITools.lua (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.cc (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.h (modified)

	Fixed GUITools.lua for good: both CECGUI 0.6 and 0.7 seem to work. At ...


Sat, 26 Feb 2011 18:38:59 GMT dafrick [7970]
	* code/branches/usability/src/modules/questsystem/QuestItem.cc (modified)
	* code/branches/usability/src/modules/questsystem/QuestManager.cc (modified)

	Fixing stupid bug in QuestManager, its really strange that it worked ...


Sat, 26 Feb 2011 18:02:21 GMT rgrieder [7969]
	* code/branches/kicklib/data/tcl/init.tcl (modified)

	Reverted part of unintentional commit from revision 7964.


Sat, 26 Feb 2011 16:23:49 GMT rgrieder [7968]
	* code/branches/kicklib/src/libraries/core/GUIManager.cc (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.h (modified)

	Starting an Orxonox macro with CEGUI is probably not such a good ...


Sat, 26 Feb 2011 16:12:43 GMT rgrieder [7967]
	* code/branches/kicklib/src/libraries/core/GUIManager.cc (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.h (modified)

	Cleaned up macro monstrosities in GUIManager and fixed some typos.


Sat, 26 Feb 2011 16:00:17 GMT landauf [7966]
	* code/branches/usability/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/usability/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/usability/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/usability/src/libraries/core/ViewportEventListener.cc (added)
	* code/branches/usability/src/libraries/core/ViewportEventListener.h (added)
	* code/branches/usability/src/libraries/tools/Shader.cc (modified)
	* code/branches/usability/src/libraries/tools/Shader.h (modified)
	* code/branches/usability/src/orxonox/CameraManager.cc (modified)
	* code/branches/usability/src/orxonox/CameraManager.h (modified)
	* code/branches/usability/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/usability/src/orxonox/graphics/Camera.cc (modified)

	some changes related to camera switching:
	 - added ...


Sat, 26 Feb 2011 10:06:36 GMT dafrick [7965]
	* code/branches/kicklib/data/gui/scripts/GUITools.lua (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.h (modified)

	getStaticTextWindowHeight() working again for CEGUI < 0.7


Sat, 26 Feb 2011 05:46:36 GMT rgrieder [7964]
	* code/branches/kicklib/data/gui/scripts/GUITools.lua (modified)
	* code/branches/kicklib/data/tcl/init.tcl (modified)

	Trying to port last bit of our Lua code to CEGUI 0.7.
	But the piece ...


Sat, 26 Feb 2011 05:44:25 GMT rgrieder [7963]
	* code/branches/usability/src/libraries/core/Loader.cc (modified)
	* code/branches/usability/src/libraries/core/Loader.h (modified)
	* code/branches/usability/src/orxonox/LevelManager.cc (modified)

	Added "replaceLuaTags" function to the Loader. That allows to load ...


Sat, 26 Feb 2011 05:40:44 GMT rgrieder [7962]
	* code/branches/usability/data/levels/FPSTest.oxw (modified)
	* code/branches/usability/data/levels/asteroids.oxw (modified)
	* code/branches/usability/data/levels/dynamicMatch.oxw (modified)
	* code/branches/usability/data/levels/fightInOurBack.oxw (modified)
	* code/branches/usability/data/levels/lastManStanding.oxw (modified)
	* code/branches/usability/data/levels/presentation09.oxw (modified)
	* code/branches/usability/data/levels/presentation09b.oxw (modified)
	* code/branches/usability/data/levels/presentationDM.oxw (modified)
	* code/branches/usability/data/levels/presentationHS09.oxw (modified)
	* code/branches/usability/data/levels/presentationHS09b.oxw (modified)
	* code/branches/usability/data/levels/teamBaseMatch.oxw (modified)
	* code/branches/usability/data/levels/testSwallow.oxw (modified)
	* code/branches/usability/data/levels/underAttack.oxw (modified)

	Added some meaningless quotation marks. Does not make a difference at ...


Fri, 25 Feb 2011 04:02:13 GMT rgrieder [7961]
	* code/branches/kicklib/data/gui/scripts/GUITools.lua (modified)
	* code/branches/kicklib/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/kicklib/data/gui/scripts/NotificationLayer.lua (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.cc (modified)

	Restored compatibility of our Lua code with CEGUI:
	Some functions ...


Fri, 25 Feb 2011 02:07:17 GMT rgrieder [7960]
	* code/branches/kicklib/cmake/tools/FindCEGUI.cmake (modified)
	* code/branches/kicklib/src/CMakeLists.txt (modified)
	* code/branches/kicklib/src/external/CMakeLists.txt (modified)
	* code/branches/kicklib/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/kicklib/src/libraries/core/CorePrereqs.h (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.cc (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.h (modified)
	* code/branches/kicklib/src/libraries/util/Exception.cc (modified)

	Applied C++ code changes to compile Orxonox with CEGUI 0.7 (does not ...


Fri, 25 Feb 2011 02:06:23 GMT rgrieder [7959]
	* code/branches/kicklib/cmake/PackageConfig.cmake (modified)

	Separate dependency package versioning for msvc and mingw.


Thu, 24 Feb 2011 15:15:06 GMT rgrieder [7957]
	* code/branches/kicklib/src/libraries/core/GUIManager.cc (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.h (modified)

	Changed destruction handling in GUIManager:
	Use a ScopeGuard that ...


Thu, 24 Feb 2011 06:40:07 GMT rgrieder [7956]
	* code/branches/kicklib/cmake/LibraryConfig.cmake (modified)
	* code/branches/kicklib/src/CMakeLists.txt (modified)
	* code/branches/kicklib/src/external/enet/win32.c (modified)
	* code/branches/kicklib/src/external/enet/win32.h (modified)

	Merged revisions 7954 and 7955 from trunk to kicklib to fix the ...


Thu, 24 Feb 2011 05:22:10 GMT rgrieder [7953]
	* code/branches/kicklib/src/libraries/network/NetworkPrecompiledHeaders.h (modified)

	Important erge from trunk:
	Fixed MSCV include order problem with ...


Thu, 24 Feb 2011 02:51:06 GMT rgrieder [7951]
	* code/branches/kicklib/cmake/tools/FindLua5.1.cmake (modified)

	Bugfix for FindLua5.1.cmake


Tue, 22 Feb 2011 03:12:00 GMT rgrieder [7950]
	* code/branches/kicklib/INSTALL (modified)

	ENet not any more required.


Mon, 21 Feb 2011 05:16:24 GMT rgrieder [7948]
	* code/branches/kicklib/INSTALL (modified)
	* code/branches/kicklib/cmake/LibraryConfig.cmake (modified)
	* code/branches/kicklib/src/external/ogreceguirenderer/OgreCEGUIRenderer.cpp (modified)
	* code/branches/kicklib/src/external/ogreceguirenderer/VERSION (modified)
	* code/branches/kicklib/src/external/ogreceguirenderer/changes_orxonox.diff (modified)
	* code/branches/kicklib/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/kicklib/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/kicklib/src/libraries/core/GraphicsManager.h (modified)
	* code/branches/kicklib/src/libraries/core/MemoryArchive.cc (deleted)
	* code/branches/kicklib/src/libraries/core/MemoryArchive.h (deleted)
	* code/branches/kicklib/src/libraries/tools/Mesh.cc (modified)

	Dropped support for OGRE v1.4 and removed the remaining workarounds.


Mon, 21 Feb 2011 03:35:28 GMT rgrieder [7947]
	* code/branches/kicklib/INSTALL (modified)
	* code/branches/kicklib/cmake/LibraryConfig.cmake (modified)
	* code/branches/kicklib/src/libraries/util/Exception.cc (modified)

	Dropping support for CEGUI v0.5 as v0.6 has been available for three ...


Mon, 21 Feb 2011 02:47:54 GMT rgrieder [7946]
	* code/branches/kicklib/bin/vld.ini.in (modified)
	* code/branches/kicklib/doc/api/doxy.config.in (modified)

	Little fixes.


Mon, 21 Feb 2011 02:47:29 GMT rgrieder [7945]
	* code/branches/kicklib/src/libraries/core/LuaState.cc (modified)
	* code/branches/kicklib/src/libraries/core/LuaState.h (modified)

	Removed workarounds for Lua 5.0 in LuaState class.


Mon, 21 Feb 2011 02:47:04 GMT rgrieder [7944]
	* code/branches/kicklib/cmake/LibraryConfig.cmake (modified)
	* code/branches/kicklib/cmake/LibraryConfigTardis.cmake (modified)
	* code/branches/kicklib/cmake/PackageConfig.cmake (modified)
	* code/branches/kicklib/cmake/tools/FindLua5.1.cmake (moved)
	* code/branches/kicklib/src/CMakeLists.txt (modified)
	* code/branches/kicklib/src/external/tolua/CMakeLists.txt (modified)
	* code/branches/kicklib/src/external/tolua/all-5.0.lua (deleted)
	* code/branches/kicklib/src/libraries/core/CMakeLists.txt (modified)

	Renamed Lua library to "Lua5.1" because that's also what the official ...


Mon, 21 Feb 2011 01:42:49 GMT rgrieder [7943]
	* code/branches/kicklib/cmake/LibraryConfig.cmake (modified)

	Dropped support for Lua 5.0 in favour of v5.1. It also seems that all ...


Mon, 21 Feb 2011 01:37:56 GMT rgrieder [7942]
	* code/branches/kicklib/src/libraries/core/input/KeyBinder.cc (modified)

	Fixed GCC warning (unsigned/signed mismatch).


Sun, 20 Feb 2011 21:49:06 GMT rgrieder [7941]
	* code/branches/kicklib/cmake/LibraryConfig.cmake (modified)
	* code/branches/kicklib/cmake/tools/FindCEGUI.cmake (modified)
	* code/branches/kicklib/src/CMakeLists.txt (modified)
	* code/branches/kicklib/src/SpecialConfig.h.in (modified)
	* code/branches/kicklib/src/external/CMakeLists.txt (modified)
	* code/branches/kicklib/src/external/ceguilua (deleted)
	* code/branches/kicklib/src/external/tolua/CMakeLists.txt (modified)
	* code/branches/kicklib/src/external/tolua/README_ORXONOX (added)
	* code/branches/kicklib/src/external/tolua/VERSION (modified)
	* code/branches/kicklib/src/external/tolua/changes_orxonox.diff (modified)
	* code/branches/kicklib/src/external/tolua/lua/package.lua (modified)
	* code/branches/kicklib/src/external/tolua/tolua++.h (deleted)
	* code/branches/kicklib/src/external/tolua/tolua_event.c (deleted)
	* code/branches/kicklib/src/external/tolua/tolua_event.h (deleted)
	* code/branches/kicklib/src/external/tolua/tolua_is.c (deleted)
	* code/branches/kicklib/src/external/tolua/tolua_map.c (deleted)
	* code/branches/kicklib/src/external/tolua/tolua_push.c (deleted)
	* code/branches/kicklib/src/external/tolua/tolua_to.c (deleted)
	* code/branches/kicklib/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/kicklib/src/libraries/core/GUIManager.cc (modified)
	* code/branches/kicklib/src/libraries/core/LuaState.cc (modified)
	* code/branches/kicklib/src/orxonox/CMakeLists.txt (modified)

	Kicked CEGUILua from our repository and adjusted the build system ...


Sun, 20 Feb 2011 20:15:08 GMT rgrieder [7940]
	* code/branches/kicklib (copied)

	New branch with plans to remove CEGUILua and OgreCEGUIRenderer from ...


Sun, 20 Feb 2011 19:46:54 GMT rgrieder [7939]
	* code/branches/usability/src/libraries/core/GUIManager.cc (modified)

	Lua header not required in GUIManager.


Sun, 20 Feb 2011 18:24:04 GMT rgrieder [7938]
	* code/branches/usability/src/libraries/core/OrxonoxClass.h (modified)
	* code/branches/usability/src/libraries/core/WeakPtr.h (modified)
	* code/branches/usability/src/libraries/tools/ResourceLocation.cc (modified)

	Fixed mingw 3 build and removed a warning due to non-virtual
	destructors.


Sun, 20 Feb 2011 16:45:04 GMT landauf [7936]
	* code/branches/usability/src/orxonox/worldentities/WorldEntity.cc (modified)

	trying to fix a crash


Sun, 20 Feb 2011 16:29:02 GMT landauf [7935]
	* code/branches/usability/data/gui/scripts/InGameMenu.lua (modified)
	* code/branches/usability/data/overlays/debug.oxo (modified)
	* code/branches/usability/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/usability/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/usability/src/modules/overlays/hud/PauseNotice.cc (added)
	* code/branches/usability/src/modules/overlays/hud/PauseNotice.h (added)
	* code/branches/usability/src/orxonox/gamestates/GSRoot.cc (modified)
	* code/branches/usability/src/orxonox/gamestates/GSRoot.h (modified)

	- opening the ingame menu pauses the game, closing the ingame menu ...


Sun, 20 Feb 2011 16:08:36 GMT rgrieder [7934]
	* code/branches/mac_osx/src/external/ois/CMakeLists.txt (modified)
	* code/branches/mac_osx/src/external/ois/VERSION (modified)

	Correct OIS version in two other places.


Sun, 20 Feb 2011 16:03:47 GMT rgrieder [7933]
	* code/branches/mac_osx/src/external/ois/OISPrereqs.h (modified)

	Using the official v1.3 branch for OIS instead of the trunk for ...


Sun, 20 Feb 2011 15:53:43 GMT bknecht [7932]
	* code/branches/hudimprovements/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBar.h (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.cc (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.h (modified)
	* code/branches/hudimprovements/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/hudimprovements/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/hudimprovements/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	The boost bar is now flashing red when the boost is cooling down. ...


Sun, 20 Feb 2011 15:40:19 GMT scheusso [7931]
	* code/branches/network6/src/libraries/core/ThreadWin.cc (modified)

	fix for windows


Sun, 20 Feb 2011 14:28:18 GMT landauf [7930]
	* code/branches/usability/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/usability/src/orxonox/controllers/HumanController.h (modified)

	- fixed crash when calling toggleGodMode command without controllable ...


Sun, 20 Feb 2011 14:11:30 GMT landauf [7929]
	* code/branches/usability/src/orxonox/sound/AmbientSound.cc (modified)

	forgot to call RegisterObject() for AmbientSound - music now again ...


Sun, 20 Feb 2011 11:42:28 GMT landauf [7928]
	* code/branches/usability/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/ControlsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/CreditsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/DecisionPopup.lua (modified)
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/HostMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/InGameMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MouseControlsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SettingsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)
	* code/branches/usability/data/gui/scripts/SingleplayerMenu.lua (modified)

	more improvements for keyboard control of menus:
	 - added ...


Sun, 20 Feb 2011 02:31:35 GMT landauf [7927]
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/NotificationLayer.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)

	renamed afterHide()/onAfterHide() as quit()/onQuit() as this seems to ...


Sun, 20 Feb 2011 02:24:55 GMT landauf [7926]
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)

	greatly improved keyboard controlled navigation in menus with sparse ...


Sun, 20 Feb 2011 00:22:25 GMT landauf [7925]
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)

	if a menu sheet was opened with the keyboard, preselect the first
	button


Sun, 20 Feb 2011 00:10:38 GMT landauf [7924]
	* code/branches/usability/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MouseControlsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SettingsMenu.lua (modified)

	- the "back" button of MultiplayerMenu and SettingsMenu now fills the ...


Sun, 20 Feb 2011 00:02:51 GMT bknecht [7923]
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.cc (modified)

	Turns out that permanentBoost probably is used for something else ...


Sat, 19 Feb 2011 23:47:57 GMT landauf [7922]
	* code/branches/usability/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/ControlsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/CreditsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/DecisionPopup.lua (modified)
	* code/branches/usability/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/usability/data/gui/scripts/GUITools.lua (modified)
	* code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/HostMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/InGameMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/NotificationLayer.lua (modified)
	* code/branches/usability/data/gui/scripts/SettingsMenu.lua (modified)
	* code/branches/usability/data/gui/scripts/SheetManager.lua (modified)
	* code/branches/usability/data/gui/scripts/SingleplayerMenu.lua (modified)

	implemented new keyboard control of menu buttons with these new ...


Sat, 19 Feb 2011 23:33:06 GMT bknecht [7920]
	* code/branches/hudimprovements/data/overlays/HUDTemplates3.oxo (modified)
	* code/branches/hudimprovements/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.cc (added)
	* code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.h (added)
	* code/branches/hudimprovements/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	added HUDBoostBar, an additional bar in the HUD to determine ...


Sat, 19 Feb 2011 20:56:53 GMT bknecht [7919]
	* code/branches/hudimprovements (copied)

	new branch to visualize some new features for the player


Sat, 19 Feb 2011 16:05:08 GMT landauf [7916]
	* code/branches/usability/data/gui/configs/CEGUIConfig.xsd (modified)
	* code/branches/usability/data/gui/schemes/GUIScheme.xsd (modified)
	* code/branches/usability/data/gui/schemes/OrxonoxLook.scheme (modified)
	* code/branches/usability/data/gui/schemes/TaharezGreenLook.scheme (modified)
	* code/branches/usability/data/gui/schemes/TaharezLook.scheme (modified)
	* code/branches/usability/data/gui/scripts/MultiplayerMenu.lua (modified)

	replaced tabs with spaces in files where they were used mixed


Sat, 19 Feb 2011 15:38:44 GMT landauf [7915]
	* code/branches/usability (copied)

	creating usability branch to work on features which are more than ...


Wed, 16 Feb 2011 10:17:30 GMT scheusso [7903]
	* code/branches/lastmanstanding3/data/levels/lastManStanding.oxw (modified)
	* code/branches/lastmanstanding3/data/levels/lastTeamStanding.oxw (copied)
	* code/branches/lastmanstanding3/data/overlays/lastManStandingHUD.oxo (modified)
	* code/branches/lastmanstanding3/data/overlays/lastTeamStandingHUD.oxo (added)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.h (modified)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.cc (added)
	* code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.h (copied)
	* code/branches/lastmanstanding3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/lastmanstanding3/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/branches/lastmanstanding3/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.cc (added)
	* code/branches/lastmanstanding3/src/orxonox/gametypes/LastTeamStanding.h (added)

	Merge branch 'jo-test' into lms3


Wed, 16 Feb 2011 09:14:04 GMT scheusso [7902]
	* code/branches/lastmanstanding3 (copied)

	creating new lastmanstanding branch


Tue, 15 Feb 2011 14:38:54 GMT jo [7901]
	* code/branches/lastmanstanding2/data/levels/lastManStanding.oxw (modified)
	* code/branches/lastmanstanding2/data/levels/lastTeamStanding.oxw (modified)
	* code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (modified)
	* code/branches/lastmanstanding2/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/branches/lastmanstanding2/src/modules/overlays/hud/GametypeStatus.h (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/Gametype.h (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)

	Finally working as intended.


Tue, 15 Feb 2011 13:34:09 GMT scheusso [7900]
	* code/branches/network6/src/libraries/core/Thread.cc (modified)
	* code/branches/network6/src/libraries/core/ThreadWin.cc (added)
	* code/branches/network6/src/libraries/network/Connection.cc (modified)

	castrating Thread.cc for windows because of high cpu usage


Tue, 15 Feb 2011 10:41:02 GMT jo [7899]
	* code/branches/lastmanstanding2/data/levels/lastManStanding.oxw (modified)
	* code/branches/lastmanstanding2/data/overlays/lastManStandingHUD.oxo (modified)
	* code/branches/lastmanstanding2/data/overlays/lastTeamStandingHUD.oxo (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)

	Level polishing.


Tue, 15 Feb 2011 10:37:15 GMT scheusso [7898]
	* code/branches/network6/src/libraries/network/Connection.cc (modified)
	* code/branches/network6/src/libraries/network/ServerConnection.cc (modified)
	* code/branches/network6/src/libraries/network/packet/Gamestate.cc (modified)

	trying to fix some uninitialised value warnings from valgrind
	remove ...


Mon, 14 Feb 2011 23:15:43 GMT jo [7897]
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (modified)

	Problem with the destruction of the vector eachTeamsPlayers - ...


Mon, 14 Feb 2011 22:02:58 GMT dafrick [7894]
	* code/branches/tutoriallevel/data/gui/scripts/NotificationLayer.lua (modified)
	* code/branches/tutoriallevel/src/libraries/core/GUIManager.cc (modified)
	* code/branches/tutoriallevel/src/libraries/core/GUIManager.h (modified)
	* code/branches/tutoriallevel/src/modules/notifications/NotificationManager.cc (modified)
	* code/branches/tutoriallevel/src/modules/notifications/NotificationManager.h (modified)
	* code/branches/tutoriallevel/src/modules/notifications/NotificationQueue.cc (modified)
	* code/branches/tutoriallevel/src/modules/notifications/NotificationQueue.h (modified)

	Some extension of NotificationQueue, font size and color can now be ...


Mon, 14 Feb 2011 21:59:22 GMT jo [7893]
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (modified)

	still problem with vector to fix


Mon, 14 Feb 2011 19:29:14 GMT jo [7890]
	* code/branches/lastmanstanding2/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.cc (modified)
	* code/branches/lastmanstanding2/src/orxonox/gametypes/LastTeamStanding.h (modified)

	trying to find a bug


Mon, 14 Feb 2011 08:00:48 GMT scheusso [7882]
	* code/branches/network6/src/libraries/network/Client.cc (modified)
	* code/branches/network6/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network6/src/libraries/network/Server.cc (modified)

	improving gamestate processing and generation


Mon, 14 Feb 2011 07:58:47 GMT scheusso [7881]
	* code/branches/network6/src/libraries/network/Connection.cc (modified)

	fixing possible malloc/delete problem


Sun, 13 Feb 2011 20:34:22 GMT scheusso [7878]
	* code/branches/network6/src/libraries/network/Client.cc (modified)
	* 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/GamestateHandler.h (modified)
	* code/branches/network6/src/libraries/network/GamestateManager.cc (modified)
	* code/branches/network6/src/libraries/network/GamestateManager.h (modified)
	* code/branches/network6/src/libraries/network/Server.cc (modified)
	* code/branches/network6/src/libraries/network/ServerConnection.cc (modified)

	-some cleaning up
	-fixing disconnect behaviour
	-trying to find a bug


Sun, 13 Feb 2011 13:29:30 GMT scheusso [7875]
	* code/branches/network6/src/libraries/network/WANDiscovery.cc (modified)

	using master.orxonox.net as new url for our masterserver


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 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:01 GMT bknecht [7864]
	* code/branches/menuanimations2 (copied)

	creating new branch to work on menu animations


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.


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 12:54:30 GMT rgrieder [7812]
	* code/branches/ipv6 (deleted)

	Removed merged branch.


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 ...