#
# ChangeLog for code/branches/mergeFS18/src/orxonox/Scene.cc
#
# Generated by Trac 1.0.9
# May 9, 2024, 11:55:17 AM

Wed, 10 Oct 2018 09:13:30 GMT merholzl [12026]
	* code/branches/mergeFS18 (copied)

	new merge branch to cequi 0.8 and ogre 1.9


Tue, 20 Feb 2018 23:03:52 GMT landauf [11795]
	* code/branches/cegui0.8_ogre1.9 (modified)
	* code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake (modified)
	* code/branches/cegui0.8_ogre1.9/cmake/tools/FindOGRE.cmake (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/configs/CEGUIConfig.xsd (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox-inputonly.layout (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox.layout (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/layouts/GUILayout.xsd (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/schemes/GUIScheme.xsd (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/DockingDialog.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUISheet.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/GameplayMenu.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/HostMenu.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/SheetManager.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/ShipSelectionMenu.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/gui/scripts/UndockingDialog.lua (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/asteroidField.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/dockingToASpaceStation.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/dynamicMatch.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/earth.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/expeditionSector.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/kecks.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/levelTry.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/planets.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/presentation09.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/presentationFS11.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/presentationHS09.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/presentationHS12.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/shadertest.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/shuttleAttack.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/shuttleRetaliation.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/data/levels/testSwallow.oxw (modified)
	* code/branches/cegui0.8_ogre1.9/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.h (modified)
	* code/branches/cegui0.8_ogre1.9/src/libraries/util/DisplayStringConversions.h (modified)
	* code/branches/cegui0.8_ogre1.9/src/libraries/util/OgreForwardRefs.h (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/hover/FlagHUD.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.h (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/FadeoutText.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/OverlayText.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.h (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.h (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.h (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.h (modified)
	* code/branches/cegui0.8_ogre1.9/src/modules/overlays/stats/Stats.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/CMakeLists.txt (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/RenderQueueListener.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/Scene.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/chat/ChatInputHandler.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/AnimatedModel.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Camera.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.h (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/branches/cegui0.8_ogre1.9/src/orxonox/worldentities/WorldEntity.cc (modified)

	merged ogre1.9 (including cegui0.8) into new branch