#
# ChangeLog for code/branches/presentation2/data
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 12:01:53 PM

Mon, 07 Dec 2009 21:06:30 GMT dafrick [6268]
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)

	Added more Keybindings to the KeyBinMenu and the displayed names of ...


Mon, 07 Dec 2009 20:45:39 GMT dafrick [6266]
	* code/branches/presentation2/data/gui/layouts/InfoPopup.layout (added)
	* code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/DecisionPopup.lua (modified)
	* code/branches/presentation2/data/gui/scripts/GUITools.lua (modified)
	* code/branches/presentation2/data/gui/scripts/InfoPopup.lua (added)
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified)

	KeyBindMenu is working now. (Apart from some minor faults)
	Found ...


Sun, 06 Dec 2009 21:48:39 GMT cmueri [6262]
	* code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified)

	Fullscreen and resolution changes are now available in the menu.


Sun, 06 Dec 2009 19:16:04 GMT scheusso [6259]
	* code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/presentation2/src/libraries/core/PathConfig.h (modified)

	menu automatically reads ogre config path


Sun, 06 Dec 2009 19:06:14 GMT cmueri [6258]
	* code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (modified)

	The fullscreen button is now available, but you have to change the ...


Sun, 06 Dec 2009 17:15:28 GMT decapitb [6257]
	* code/branches/presentation2/data/levels/presentationHS09b.oxw (added)
	* code/branches/presentation2/data/particle/Steam.particle (modified)

	new level presentationHS09b with asteroid field fog and most ...


Sun, 06 Dec 2009 14:21:13 GMT decapitb [6252]
	* code/branches/presentation2/data/levels/presentationHS09.oxw (added)
	* code/branches/presentation2/data/particle/Steam.particle (added)

	Fog and asteroid Tests in Level presentationHS09


Sat, 05 Dec 2009 20:33:56 GMT cmueri [6251]
	* code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified)

	The menu is now able to switch between normal and derive mouse input.


Fri, 04 Dec 2009 18:10:30 GMT youngk [6248]
	* code/branches/presentation2/data/levels/sound.oxw (modified)

	Adjusted Sound level to play with Cross-Fading


Thu, 03 Dec 2009 23:44:31 GMT scheusso [6239]
	* code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified)

	setting bDeriveMouseInput_ now possible from withing the mouse ...


Thu, 03 Dec 2009 23:20:57 GMT cmueri [6238]
	* code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (modified)

	The mouse controls menu has some new buttons and the sensitivity ...


Thu, 03 Dec 2009 19:48:25 GMT cmueri [6235]
	* code/branches/presentation2/data/gui/layouts/ControlsMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/ControlsMenu.lua (modified)

	Small bug in audio menu fixed.


Thu, 03 Dec 2009 19:10:07 GMT cmueri [6233]
	* code/branches/presentation2/data/gui/layouts/AudioMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/SettingsMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/AudioMenu.lua (modified)

	The audio menu and all its functions are now enabled.


Thu, 03 Dec 2009 17:10:03 GMT cdaniel [6230]
	* code/branches/presentation2/data/particle/rocketfire.particle (modified)

	modified rocketfire.particle


Thu, 03 Dec 2009 10:26:04 GMT scheusso [6224]
	* code/branches/presentation2/data/gui/layouts/KeyBindMenu.layout (added)
	* code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua (added)

	adding keybind menu files


Wed, 02 Dec 2009 21:13:13 GMT dafrick [6217]
	* code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (modified)
	* code/branches/presentation2/data/gui/layouts/InGameMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/presentation2/data/gui/scripts/InGameMenu.lua (modified)

	Improved GUI. (Especially IngameMenu)


Wed, 02 Dec 2009 20:59:27 GMT scheusso [6215]
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)

	fix in GUI system


Wed, 02 Dec 2009 19:41:44 GMT scheusso [6214]
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/presentation2/src/libraries/core/GUIManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/Game.cc (modified)
	* code/branches/presentation2/src/libraries/core/Game.h (modified)
	* code/branches/presentation2/src/libraries/core/IOConsole.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinder.cc (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinder.h (modified)
	* code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h (modified)

	a small fix in IOConsole
	some changes in GUI-system and preparation ...


Wed, 02 Dec 2009 17:46:20 GMT wirthmi [6210]
	* code/branches/presentation2/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified)

	Buggy version!


Wed, 02 Dec 2009 16:52:23 GMT cmueri [6209]
	* code/branches/presentation2/data/gui/layouts/NewAudioMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/NewControlsMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/NewCreditsMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/NewGameplayMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/NewGraphicsMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/NewMainMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/NewMouseControlsMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/NewMultiplayerMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/NewSettingsMenu.layout (deleted)
	* code/branches/presentation2/data/gui/layouts/NewSingleplayerMenu.layout (deleted)
	* code/branches/presentation2/data/gui/scripts/NewAudioMenu.lua (deleted)
	* code/branches/presentation2/data/gui/scripts/NewControlsMenu.lua (deleted)
	* code/branches/presentation2/data/gui/scripts/NewCreditsMenu.lua (deleted)
	* code/branches/presentation2/data/gui/scripts/NewGameplayMenu.lua (deleted)
	* code/branches/presentation2/data/gui/scripts/NewGraphicsMenu.lua (deleted)
	* code/branches/presentation2/data/gui/scripts/NewMainMenu.lua (deleted)
	* code/branches/presentation2/data/gui/scripts/NewMouseControlsMenu.lua (deleted)
	* code/branches/presentation2/data/gui/scripts/NewMultiplayerMenu.lua (deleted)
	* code/branches/presentation2/data/gui/scripts/NewSettingsMenu.lua (deleted)
	* code/branches/presentation2/data/gui/scripts/NewSingleplayerMenu.lua (deleted)

	Unused menu files have been deleted.


Wed, 02 Dec 2009 16:40:13 GMT youngk [6207]
	* code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified)

	Speed dependent pitching of the sounds works now for engine states: ...


Wed, 02 Dec 2009 16:25:42 GMT cmueri [6206]
	* code/branches/presentation2/data/gui/layouts/AudioMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/ControlsMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/CreditsMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/GameplayMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/GraphicsMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/KeyboardControlsMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MouseControlsMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/MultiplayerMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/MultiplayerOptionsMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/SettingsMenu.layout (added)
	* code/branches/presentation2/data/gui/layouts/SingleplayerMenu.layout (added)
	* code/branches/presentation2/data/gui/scripts/AudioMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/ControlsMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/CreditsMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/GameplayMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/GraphicsMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/KeyboardControlsMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/MultiplayerOptionsMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/SettingsMenu.lua (added)
	* code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua (added)

	The new menus (but not all functions of the menu) are now available.


Wed, 02 Dec 2009 15:52:42 GMT youngk [6202]
	* code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified)

	Implemented speed dependent audio pitch. BUG: pitching doesn't ...


Wed, 02 Dec 2009 15:39:26 GMT cdaniel [6201]
	* code/branches/presentation2/data/defaultConfig/keybindings.ini (modified)

	default Key for launching the Rocket is now "T".


Wed, 02 Dec 2009 14:12:29 GMT scheusso [6199]
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentation2/src/orxonox/controllers/HumanController.h (modified)

	hide controller overlay when in gui mode


Wed, 02 Dec 2009 08:06:19 GMT rgrieder [6191]
	* code/branches/presentation2/data/levels/sound.oxw (modified)
	* code/branches/presentation2/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/graphics/Camera.cc (modified)

	Moved sound listener to the active camera and fixed the ambient ...


Tue, 01 Dec 2009 17:48:51 GMT rgrieder [6187]
	* code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc (modified)
	* code/branches/presentation2/src/orxonox/items/MultiStateEngine.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/presentation2/src/orxonox/worldentities/EffectContainer.cc (added)
	* code/branches/presentation2/src/orxonox/worldentities/EffectContainer.h (added)

	Added better engine effects: you can still add any WorldEntity to the ...


Mon, 30 Nov 2009 22:50:17 GMT dafrick [6186]
	* code/branches/presentation2/data/gui/scripts/NewAudioMenu.lua (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.h (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.h (modified)

	Some cleanup in SoundManager and related classes. Overrall volume ...


Sun, 29 Nov 2009 12:36:12 GMT dafrick [6176]
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation2/data/gui/scripts/NewMultiplayerMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/NewSingleplayerMenu.lua (modified)

	Made NewMultiplayerMenu and NewSingleplayerMenu work. Also added ...


Thu, 26 Nov 2009 19:10:52 GMT landauf [6168]
	* code/branches/presentation2/data/particle/rocketfire.particle (modified)

	tweaked rocketfire a little


Wed, 25 Nov 2009 17:04:10 GMT scheusso [6153]
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc (modified)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified)

	some fixes in weapon system / weapons
	fabian: projectiles also spawn ...


Wed, 25 Nov 2009 15:52:37 GMT scheusso [6150]
	* code/branches/presentation2 (modified)
	* code/branches/presentation2/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation2/data/gui/layouts/DecisionPopup.layout (copied)
	* code/branches/presentation2/data/gui/layouts/InGameMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/MainMenu.layout (modified)
	* code/branches/presentation2/data/gui/layouts/MainMenuBackground.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewAudioMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewControlsMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewCreditsMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewGameplayMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewGraphicsMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewMainMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewMouseControlsMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewMultiplayerMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewSettingsMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/NewSingleplayerMenu.layout (copied)
	* code/branches/presentation2/data/gui/layouts/QuestGUI.layout (modified)
	* code/branches/presentation2/data/gui/scripts/DecisionPopup.lua (copied)
	* code/branches/presentation2/data/gui/scripts/GUITools.lua (copied)
	* code/branches/presentation2/data/gui/scripts/InGameMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/branches/presentation2/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/presentation2/data/gui/scripts/NewAudioMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/NewControlsMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/NewCreditsMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/NewGameplayMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/NewGraphicsMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/NewMainMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/NewMouseControlsMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/NewMultiplayerMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/NewSettingsMenu.lua (copied)
	* code/branches/presentation2/data/gui/scripts/NewSingleplayerMenu.lua (copied)
	* code/branches/presentation2/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/presentation2/src/libraries/core/GUIManager.cc (modified)
	* code/branches/presentation2/src/libraries/core/GUIManager.h (modified)
	* code/branches/presentation2/src/libraries/core/Game.cc (modified)
	* code/branches/presentation2/src/libraries/core/Game.h (modified)
	* code/branches/presentation2/src/libraries/core/GameState.cc (modified)
	* code/branches/presentation2/src/libraries/core/LuaState.cc (modified)
	* code/branches/presentation2/src/libraries/core/LuaState.h (modified)
	* code/branches/presentation2/src/libraries/core/input/InputManager.h (modified)
	* code/branches/presentation2/src/modules/overlays/GUIOverlay.cc (modified)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSGraphics.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSGraphics.h (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSLevel.h (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/presentation2/src/orxonox/pickup/PickupInventory.cc (modified)
	* code/branches/presentation2/src/orxonox/pickup/PickupSpawner.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h (modified)

	merged menu branch to presentation2 branch with some additional fixes ...


Wed, 25 Nov 2009 15:20:05 GMT wirthmi [6149]
	* code/branches/presentation2/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation2/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified)

	Introduced new feature: permanent speed


Wed, 25 Nov 2009 13:58:24 GMT youngk [6147]
	* code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified)

	Corrected a small typo concerning the looping of sounds


Sun, 22 Nov 2009 15:25:02 GMT rgrieder [6120]
	* code/branches/presentation2/cmake/PrecompiledHeaderFiles.cmake (modified)
	* code/branches/presentation2/cmake/SourceFileUtilities.cmake (modified)
	* code/branches/presentation2/data/overlays/stats.oxo (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified)

	Found some tabs


Sun, 22 Nov 2009 15:10:06 GMT rgrieder [6119]
	* code/branches/presentation2/bin/dedicatedClient.bat.in (modified)
	* code/branches/presentation2/bin/dedicatedClient.in (modified)
	* code/branches/presentation2/data/levels/events.oxw (modified)
	* code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi (modified)
	* code/branches/presentation2/data/levels/questsystem2.oxw (modified)
	* code/branches/presentation2/data/levels/sound.oxw (modified)
	* code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt (modified)
	* code/branches/presentation2/data/levels/test_ghost.oxw (modified)
	* code/branches/presentation2/data/particle/bigexplosion.particle (modified)
	* code/branches/presentation2/data/particle/explosion4.particle (modified)
	* code/branches/presentation2/data/particle/laser.particle (modified)
	* code/branches/presentation2/data/particle/load.particle (modified)
	* code/branches/presentation2/data/particle/particlecanon.particle (modified)
	* code/branches/presentation2/data/particle/rocketfire.particle (modified)
	* code/branches/presentation2/data/particle/smoke.particle (modified)
	* code/branches/presentation2/data/particle/tes3.particle (modified)
	* code/branches/presentation2/doc/api/main.dox (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (modified)
	* code/branches/presentation2/src/orxonox/MoodManager.cc (modified)
	* code/branches/presentation2/src/orxonox/MoodManager.h (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (modified)

	svn:eol-style "native" should be set for all text files.


Sun, 22 Nov 2009 15:01:16 GMT rgrieder [6117]
	* code/branches/presentation2 (modified)
	* code/branches/presentation2/data/levels/sound.oxw (copied)
	* code/branches/presentation2/data/levels/templates/spaceship_assff.oxt (modified)
	* code/branches/presentation2/src/libraries/core/XMLPort.h (modified)
	* code/branches/presentation2/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentation2/src/orxonox/MoodManager.cc (copied)
	* code/branches/presentation2/src/orxonox/MoodManager.h (copied)
	* code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.h (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/AmbientSound.h (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/BaseSound.h (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/SoundManager.h (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.cc (modified)
	* code/branches/presentation2/src/orxonox/sound/WorldSound.h (modified)

	Merged sound3 branch to presentation2.


Fri, 20 Nov 2009 20:31:54 GMT scheusso [6110]
	* code/branches/presentation2/data/particle/bigexplosion.particle (copied)

	merging 6109 from particles2 to presentation2


Fri, 20 Nov 2009 19:15:25 GMT scheusso [6108]
	* code/branches/presentation2 (modified)
	* code/branches/presentation2/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation2/src/libraries/core/input/InputManager.cc (modified)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/HsW01.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/presentation2/src/orxonox/controllers/Controller.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/Controller.h (modified)
	* code/branches/presentation2/src/orxonox/controllers/HumanController.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/HumanController.h (modified)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc (copied)
	* code/branches/presentation2/src/orxonox/controllers/NewHumanController.h (copied)
	* code/branches/presentation2/src/orxonox/graphics/Camera.cc (modified)
	* code/branches/presentation2/src/orxonox/graphics/Camera.h (modified)
	* code/branches/presentation2/src/orxonox/infos/HumanPlayer.cc (modified)
	* code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/WorldEntity.h (modified)

	merged steering branch to presentation2 branch


Fri, 20 Nov 2009 16:20:11 GMT rgrieder [6107]
	* code/branches/presentation2 (modified)
	* code/branches/presentation2/data/levels/empty_level.oxw (modified)
	* code/branches/presentation2/data/levels/includes/weaponsettings3.oxi (modified)
	* code/branches/presentation2/data/particle/explosion4.particle (copied)
	* code/branches/presentation2/data/particle/laser.particle (copied)
	* code/branches/presentation2/data/particle/load.particle (copied)
	* code/branches/presentation2/data/particle/particlecanon.particle (copied)
	* code/branches/presentation2/data/particle/rocketfire.particle (copied)
	* code/branches/presentation2/data/particle/smoke.particle (copied)
	* code/branches/presentation2/data/particle/tes3.particle (copied)
	* code/branches/presentation2/src/modules/weapons/projectiles/CMakeLists.txt (modified)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc (copied)
	* code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h (copied)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/CMakeLists.txt (modified)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc (copied)
	* code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.h (copied)
	* code/branches/presentation2/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation2/src/orxonox/Scene.cc (modified)
	* code/branches/presentation2/src/orxonox/controllers/Controller.h (modified)
	* code/branches/presentation2/src/orxonox/infos/PlayerInfo.cc (modified)
	* code/branches/presentation2/src/orxonox/infos/PlayerInfo.h (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponPack.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponPack.h (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponSystem.cc (modified)
	* code/branches/presentation2/src/orxonox/weaponsystem/WeaponSystem.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Spectator.cc (modified)
	* code/branches/presentation2/src/orxonox/worldentities/pawns/Spectator.h (modified)

	Merged particles2 branch to presentation2.


Fri, 20 Nov 2009 16:13:48 GMT rgrieder [6106]
	* code/branches/presentation2 (copied)

	Created merger branch for the HS09 presentation.


Fri, 23 Oct 2009 11:17:42 GMT dave [5989]
	* code/trunk/data/levels/includes/weaponsettings_ghost.oxi (added)
	* code/trunk/data/levels/templates/spaceship_ghost.oxt (modified)
	* code/trunk/data/levels/test_ghost.oxw (modified)

	ghost weapons added