#
# ChangeLog for code/branches/presentation3
#
# Generated by Trac 1.0.9
# May 17, 2024, 10:17:52 PM

Wed, 09 Jun 2010 22:55:47 GMT rgrieder [7136]
	* code/branches/presentation3/src/libraries/tools/ToolsPrereqs.h (modified)
	* code/branches/presentation3/src/modules/designtools/DesignToolsPrereqs.h (modified)
	* code/branches/presentation3/src/modules/objects/ObjectsPrereqs.h (modified)
	* code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation3/src/modules/pong/PongPrereqs.h (modified)
	* code/branches/presentation3/src/modules/questsystem/QuestsystemPrereqs.h (modified)
	* code/branches/presentation3/src/modules/weapons/WeaponsPrereqs.h (modified)

	Some libraries/modules were still using ORXONOX_STATIC_BUILD, which ...


Wed, 09 Jun 2010 22:04:41 GMT rgrieder [7135]
	* code/branches/presentation3/cmake/TargetUtilities.cmake (modified)
	* code/branches/presentation3/src/external/ceguilua/CMakeLists.txt (modified)
	* code/branches/presentation3/src/external/ogreceguirenderer/CMakeLists.txt (modified)
	* code/branches/presentation3/src/external/ois/CMakeLists.txt (modified)
	* code/branches/presentation3/src/external/tolua/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/core/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/network/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/tools/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/util/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/designtools/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/objects/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/overlays/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/pickup/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/pong/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/questsystem/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/weapons/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/CMakeLists.txt (modified)

	Automatically handle DEFINE_SYMBOL for our own libraries.
	Also ...


Wed, 09 Jun 2010 21:51:42 GMT rgrieder [7134]
	* code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/CEGUILua.h (modified)
	* code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.0/ceguilua/changes_orxonox.diff (modified)
	* code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h (modified)
	* code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.1/ceguilua/changes_orxonox.diff (modified)
	* code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/CEGUILua.h (modified)
	* code/branches/presentation3/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff (modified)

	CEGUILua should use its own macros for static builds.


Wed, 09 Jun 2010 21:45:03 GMT rgrieder [7133]
	* code/branches/presentation3/src/external/ogreceguirenderer/OgreCEGUIRenderer.h (modified)
	* code/branches/presentation3/src/external/ogreceguirenderer/changes_orxonox.diff (modified)

	Ogre CEGUI renderer should use its own macros for static builds.


Wed, 09 Jun 2010 21:19:14 GMT rgrieder [7132]
	* code/branches/presentation3/cmake/TargetUtilities.cmake (modified)

	Bugfix in TargetUtilities.cmake: Always provide _taget_name_upper, ...


Wed, 09 Jun 2010 20:08:52 GMT adrfried [7131]
	* code/branches/presentation3/cmake/TargetUtilities.cmake (modified)

	don't add version information do executables


Wed, 09 Jun 2010 19:57:04 GMT adrfried [7130]
	* code/branches/presentation3/cmake/TargetUtilities.cmake (modified)

	install executables even when compiling with static


Wed, 09 Jun 2010 19:46:26 GMT rgrieder [7129]
	* code/branches/presentation3/data/gui/layouts/MiscConfigMenu.layout (modified)
	* code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua (modified)
	* code/branches/presentation3/data/gui/scripts/ChatBox.lua (modified)
	* code/branches/presentation3/data/gui/scripts/HUDSheet.lua (modified)
	* code/branches/presentation3/data/gui/scripts/MenuSheet.lua (modified)
	* code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/branches/presentation3/data/levels/Fight in our Back.oxw (modified)
	* code/branches/presentation3/data/levels/The Time Machine.oxw (modified)
	* code/branches/presentation3/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation3/data/levels/includes/weaponsettings_swallow.oxi (modified)
	* code/branches/presentation3/data/levels/screenshot.oxw (modified)
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified)
	* code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/branches/presentation3/data/levels/templates/spaceship_swallow.oxt (modified)
	* code/branches/presentation3/data/particle/fog.particle (modified)
	* code/branches/presentation3/data/particle/rocketfire2.particle (modified)
	* code/branches/presentation3/data/particle/simplerocketfire.particle (modified)
	* code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified)
	* code/branches/presentation3/src/modules/designtools/CreateStars.h (modified)
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified)
	* code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.h (modified)
	* code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.h (modified)
	* code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.h (modified)
	* code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.h (modified)
	* code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.h (modified)
	* code/branches/presentation3/src/modules/pickup/Pickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/Pickup.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupRepresentation.h (modified)
	* code/branches/presentation3/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h (modified)
	* code/branches/presentation3/src/modules/weapons/RocketController.cc (modified)
	* code/branches/presentation3/src/modules/weapons/RocketController.h (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified)
	* code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h (modified)
	* code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified)
	* code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.cc (modified)
	* code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.h (modified)
	* code/branches/presentation3/src/orxonox/sound/SoundStreamer.cc (modified)
	* code/branches/presentation3/src/orxonox/sound/SoundStreamer.h (modified)

	svn:eol-style "native" for all text-based files.


Wed, 09 Jun 2010 19:44:41 GMT rgrieder [7128]
	* code/branches/presentation3/src/modules/questsystem/QuestNotification.h (modified)
	* code/branches/presentation3/src/modules/questsystem/notifications/NotificationOverlay.cc (modified)
	* code/branches/presentation3/src/modules/questsystem/notifications/NotificationOverlay.h (modified)

	Removed svn:executable property from source files.


Wed, 09 Jun 2010 19:32:58 GMT rgrieder [7127]
	* code/branches/presentation3/src/libraries/core/BaseObject.cc (modified)
	* code/branches/presentation3/src/libraries/core/BaseObject.h (modified)
	* code/branches/presentation3/src/libraries/core/Event.cc (modified)
	* code/branches/presentation3/src/libraries/core/EventIncludes.h (modified)
	* code/branches/presentation3/src/libraries/core/GUIManager.h (modified)
	* code/branches/presentation3/src/libraries/core/OrxonoxClass.h (modified)
	* code/branches/presentation3/src/libraries/core/Super.h (modified)
	* code/branches/presentation3/src/libraries/core/Template.cc (modified)
	* code/branches/presentation3/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/presentation3/src/libraries/util/Serialise.h (modified)
	* code/branches/presentation3/src/modules/designtools/CreateStars.h (modified)
	* code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h (modified)
	* code/branches/presentation3/src/modules/objects/Planet.cc (modified)
	* code/branches/presentation3/src/modules/objects/eventsystem/EventListener.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.h (modified)
	* code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.h (modified)
	* code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.h (modified)
	* code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.h (modified)
	* code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.cc (modified)
	* code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.h (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h (modified)
	* code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h (modified)
	* code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc (modified)
	* code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h (modified)
	* code/branches/presentation3/src/modules/pickup/DroppedPickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/DroppedPickup.h (modified)
	* code/branches/presentation3/src/modules/pickup/Pickup.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupCollection.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupCollection.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupRepresentation.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupSpawner.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupSpawner.h (modified)
	* code/branches/presentation3/src/modules/pickup/items/DronePickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/items/DronePickup.h (modified)
	* code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/items/HealthPickup.h (modified)
	* code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h (modified)
	* code/branches/presentation3/src/modules/pickup/items/MetaPickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/items/MetaPickup.h (modified)
	* code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/items/SpeedPickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/items/SpeedPickup.h (modified)
	* code/branches/presentation3/src/modules/questsystem/Quest.h (modified)
	* code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc (modified)
	* code/branches/presentation3/src/modules/questsystem/QuestItem.cc (modified)
	* code/branches/presentation3/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/presentation3/src/modules/questsystem/QuestNotification.cc (modified)
	* code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc (modified)
	* code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc (modified)
	* code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc (modified)
	* code/branches/presentation3/src/modules/weapons/RocketController.cc (modified)
	* code/branches/presentation3/src/modules/weapons/RocketController.h (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/presentation3/src/orxonox/ChatHistory.cc (modified)
	* code/branches/presentation3/src/orxonox/ChatHistory.h (modified)
	* code/branches/presentation3/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/presentation3/src/orxonox/ChatInputHandler.h (modified)
	* code/branches/presentation3/src/orxonox/Level.cc (modified)
	* code/branches/presentation3/src/orxonox/MoodManager.cc (modified)
	* code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation3/src/orxonox/Radar.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.h (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Gametype.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.h (modified)
	* code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h (modified)
	* code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.cc (modified)
	* code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.h (modified)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.h (modified)
	* code/branches/presentation3/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h (modified)

	Removed excess white space at the end of lines.


Wed, 09 Jun 2010 19:16:43 GMT rgrieder [7126]
	* code/branches/presentation3/src/libraries/util/Singleton.h (modified)

	Using <cstring> to define NULL: I have done so in different places.


Wed, 09 Jun 2010 15:34:23 GMT adrfried [7125]
	* code/branches/presentation3/src/libraries/util/Singleton.h (modified)
	* code/branches/presentation3/src/orxonox/overlays/GUISheet.cc (modified)

	fix includes for compiling without PCH


Mon, 07 Jun 2010 21:29:56 GMT rgrieder [7123]
	* code/branches/presentation3/cmake/TargetUtilities.cmake (modified)

	Added NO_VERSION switch for targets.


Mon, 07 Jun 2010 09:36:30 GMT scheusso [7122]
	* code/branches/presentation3/src/orxonox/gamestates/GSClient.cc (modified)

	changed commandline argument --ip to --dest in order to prevent ...


Sun, 06 Jun 2010 23:06:35 GMT youngk [7121]
	* code/branches/presentation3/src/orxonox/MoodManager.cc (modified)
	* code/branches/presentation3/src/orxonox/MoodManager.h (modified)

	Updated the MoodManager validation process to be more generic, ...


Sun, 06 Jun 2010 23:00:01 GMT adrfried [7120]
	* code/branches/presentation3/cmake/InstallConfig.cmake (modified)

	made install paths conform to FHS


Sat, 05 Jun 2010 00:23:22 GMT adrfried [7119]
	* code/branches/presentation3/data/CMakeLists.txt (modified)

	exclude some files in data_extern install


Fri, 04 Jun 2010 13:08:02 GMT adrfried [7118]
	* code/branches/presentation3/data/DataInstallScript.cmake (modified)

	honour DESTDIR environment variable


Thu, 03 Jun 2010 14:13:49 GMT scheusso [7113]
	* code/branches/presentation3/data/levels/presentation_pong.oxw (modified)

	fixed ambient sound in pong level


Thu, 03 Jun 2010 09:00:13 GMT rgrieder [7112]
	* code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc (modified)
	* code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h (modified)
	* code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/AnimatedModel.h (modified)

	Including Ogre.h slows down compilation time considerably. Use ...


Thu, 03 Jun 2010 08:51:10 GMT rgrieder [7111]
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)

	Fixed MSVC build: std::pow(float, double) results in overload ...


Thu, 03 Jun 2010 07:36:41 GMT scheusso [7110]
	* code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified)

	made pickupmanager network-friendly ;)


Thu, 03 Jun 2010 07:34:13 GMT scheusso [7109]
	* code/branches/presentation3/data/gui/scripts/MainMenu.lua (modified)
	* code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified)

	radarVisibility gets respected now
	hide mainmenu when loading a game


Thu, 03 Jun 2010 02:48:57 GMT landauf [7108]
	* code/branches/presentation3/data/levels/includes/weaponsettings_swallow.oxi (modified)

	added rockets to the weapons of the swallow ship


Thu, 03 Jun 2010 02:43:42 GMT landauf [7107]
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.h (modified)

	fixed various cases where master/slave pointers weren't synchronized ...


Thu, 03 Jun 2010 00:29:41 GMT landauf [7106]
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)

	fixed a crash: if the player dies, the AI shouldn't follow him
	anymore


Thu, 03 Jun 2010 00:24:14 GMT scheusso [7105]
	* code/branches/presentation3/src/libraries/core/BaseObject.cc (modified)
	* code/branches/presentation3/src/libraries/core/BaseObject.h (modified)
	* code/branches/presentation3/src/libraries/core/Template.h (modified)
	* code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h (modified)
	* code/branches/presentation3/src/libraries/util/Serialise.h (modified)
	* code/branches/presentation3/src/orxonox/Level.cc (modified)
	* code/branches/presentation3/src/orxonox/Level.h (modified)
	* code/branches/presentation3/src/orxonox/Test.cc (modified)
	* code/branches/presentation3/src/orxonox/Test.h (modified)

	std::set<T> is now synchronisable
	this was neccessary to synchronise ...


Thu, 03 Jun 2010 00:21:26 GMT scheusso [7104]
	* code/branches/presentation3/src/modules/objects/Planet.cc (modified)

	made planet synchronisable


Thu, 03 Jun 2010 00:20:28 GMT scheusso [7103]
	* code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (modified)
	* code/branches/presentation3/data/levels/includes/CuboidSpaceStation.lua (modified)

	fixed case-sensitivity issues


Thu, 03 Jun 2010 00:04:42 GMT landauf [7102]
	* code/branches/presentation3/data/levels/presentationFS10.oxw (modified)

	drone-pirate shouldn't join the formation


Wed, 02 Jun 2010 23:31:40 GMT decapitb [7101]
	* code/branches/presentation3/data/levels/presentationFS10.oxw (modified)

	dave's new spaceship is the controllable ship in demo now


Wed, 02 Jun 2010 23:22:09 GMT decapitb [7099]
	* code/branches/presentation3/data/levels/presentationFS10.oxw (modified)

	formationFlight demo added


Wed, 02 Jun 2010 23:03:28 GMT landauf [7098]
	* code/branches/presentation3/src/orxonox/graphics/Camera.cc (modified)

	fixed a bug which caused a black screen after pressing pause and a ...


Wed, 02 Jun 2010 22:39:55 GMT landauf [7097]
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.h (modified)

	trying to activate formationflight also for xml enemies


Wed, 02 Jun 2010 21:30:11 GMT dafrick [7096]
	* code/branches/presentation3/data/levels/presentationFS10.oxw (modified)
	* code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc (modified)

	Some more attempts regarding pickups.
	Also removed and reodered ...


Wed, 02 Jun 2010 21:18:00 GMT gnadler [7095]
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/presentation3/src/orxonox/weaponsystem/WeaponMode.cc (modified)
	* code/branches/presentation3/src/orxonox/weaponsystem/WeaponMode.h (modified)

	added a launching sound to the rocket.
	Added an additional sound-set ...


Wed, 02 Jun 2010 21:16:20 GMT dafrick [7094]
	* code/branches/presentation3/src/modules/pickup/PickupCollection.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/Pickupable.h (modified)

	(Hopefully) fix in pickups.


Wed, 02 Jun 2010 20:45:14 GMT landauf [7093]
	* code/branches/presentation3/src/orxonox/controllers/DroneController.cc (modified)

	Fixed strange movements of the Drone while shooting. Also the drone ...


Wed, 02 Jun 2010 20:10:44 GMT scheusso [7092]
	* code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua (modified)

	adding fire 3 to keybind menu


Wed, 02 Jun 2010 19:55:49 GMT dafrick [7091]
	* code/branches/presentation3/data/levels/fps_test.oxw (modified)

	Removed some things that were thought to be commented but actually ...


Wed, 02 Jun 2010 19:44:22 GMT dafrick [7090]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)

	Merged ppspickups4 branch.


Wed, 02 Jun 2010 19:12:36 GMT dafrick [7089]
	* code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (modified)

	Relieved the level of some tabs.


Wed, 02 Jun 2010 19:10:51 GMT dafrick [7088]
	* code/branches/presentation3/data/levels/The Time Machine.oxw (modified)

	Got TimeMachine working, also the two teams have different team ...


Wed, 02 Jun 2010 17:51:14 GMT landauf [7087]
	* code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified)

	quick fix in HUDNavigation: If a Pawn becomes invisible and gets ...


Wed, 02 Jun 2010 16:47:57 GMT landauf [7086]
	* code/branches/presentation3/src/modules/pickup/PickupSpawner.cc (modified)

	Fixed a bug in PickupSpawner.

	When one Pawn picked up the last ...


Wed, 02 Jun 2010 16:09:31 GMT dafrick [7085]
	* code/branches/presentation3/data/levels/Fight in our Back.oxw (modified)

	Fixed and cleaned level.


Wed, 02 Jun 2010 15:08:18 GMT stmathia [7084]
	* code/branches/presentation3/data/levels/Fight in our Back.oxw (modified)
	* code/branches/presentation3/data/levels/The Time Machine.oxw (modified)

	Fight in our Back: removed superfluous billboards
	The Time Machine: ...


Wed, 02 Jun 2010 00:38:14 GMT landauf [7083]
	* code/branches/presentation3/data/levels/Fight in our Back.oxw (modified)
	* code/branches/presentation3/data/levels/The Time Machine.oxw (modified)
	* code/branches/presentation3/data/levels/fps_test.oxw (modified)
	* code/branches/presentation3/data/levels/pickups.oxw (modified)
	* code/branches/presentation3/data/levels/presentation.oxw (modified)
	* code/branches/presentation3/data/levels/presentation09.oxw (modified)
	* code/branches/presentation3/data/levels/presentation09b.oxw (modified)
	* code/branches/presentation3/data/levels/presentationHS09.oxw (modified)
	* code/branches/presentation3/data/levels/presentationHS09b.oxw (modified)
	* code/branches/presentation3/data/levels/presentation_FS10.oxw (modified)
	* code/branches/presentation3/data/levels/presentation_FS10_ed.oxw (modified)
	* code/branches/presentation3/data/levels/presentation_dm.oxw (modified)
	* code/branches/presentation3/data/levels/presentation_pong.oxw (modified)
	* code/branches/presentation3/data/levels/test_stars.oxw (modified)
	* code/branches/presentation3/data/levels/tutorial.oxw (modified)
	* code/branches/presentation3/data/levels/waypoints.oxw (modified)

	added lod-template where necessary


Wed, 02 Jun 2010 00:26:25 GMT landauf [7082]
	* code/branches/presentation3/src/orxonox/controllers/DroneController.cc (modified)

	fixed a potential bug in DroneController


Wed, 02 Jun 2010 00:18:19 GMT landauf [7081]
	* code/branches/presentation3/data/levels/templates/fps.oxt (modified)

	removed "fpshud" template name in FpsPlayer, since there's no such ...


Wed, 02 Jun 2010 00:16:11 GMT landauf [7080]
	* code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified)

	fixed bug in FpsPlayer, weaponNode wasn't destroyed. this fixes a ...


Tue, 01 Jun 2010 23:58:37 GMT landauf [7079]
	* code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc (modified)

	fixed a bug in NewHumanController - Ogre::any_cast can fail after ...


Tue, 01 Jun 2010 23:53:41 GMT landauf [7078]
	* code/branches/presentation3/src/orxonox/weaponsystem/WeaponSystem.cc (modified)

	fixed a bug in WeaponSystem which lead to a crash in combination with ...


Tue, 01 Jun 2010 23:52:21 GMT landauf [7077]
	* code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.cc (modified)

	delete -> destroy()


Tue, 01 Jun 2010 22:39:46 GMT landauf [7076]
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h (modified)

	removed some tabs in Dynamicmatch and ScreenshotManager


Tue, 01 Jun 2010 22:27:03 GMT landauf [7075]
	* code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.h (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h (modified)

	removed some tabs and adjusted formatting in some fps related files


Tue, 01 Jun 2010 22:02:50 GMT landauf [7073]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/cmake/LibraryConfig.cmake (modified)
	* code/branches/presentation3/data/levels/fps_test.oxw (copied)
	* code/branches/presentation3/data/levels/includes/weaponsettings_fps.oxi (copied)
	* code/branches/presentation3/data/levels/presentation_FS10.oxw (copied)
	* code/branches/presentation3/data/levels/presentation_FS10_ed.oxw (copied)
	* code/branches/presentation3/data/levels/templates/fps.oxt (copied)
	* code/branches/presentation3/data/overlays/hudtamplates_fps.oxo (copied)
	* code/branches/presentation3/src/libraries/tools/CMakeLists.txt (modified)
	* code/branches/presentation3/src/libraries/tools/bsp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/CMakeLists.txt (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/DemoApp.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/DemoApp.hpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/ExampleApplication.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/ExampleFrameListener.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/OgreFramework.hpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/OgreGpuCommandBufferFlush.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_Bezier.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.cpp (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_BspVertex.h (copied)
	* code/branches/presentation3/src/libraries/tools/bsp/Q3Map_misc.h (copied)
	* code/branches/presentation3/src/orxonox/controllers/NewHumanController.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.cc (copied)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/FpsPlayer.h (copied)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h (modified)

	merged fps branch to presentation3


Tue, 01 Jun 2010 19:28:28 GMT dafrick [7072]
	* code/branches/presentation3/data/gui/scripts/GUITools.lua (modified)
	* code/branches/presentation3/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/presentation3/data/gui/scripts/QuestGUI.lua (modified)
	* code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (modified)
	* code/branches/presentation3/data/levels/pickups.oxw (modified)
	* code/branches/presentation3/src/libraries/core/GUIManager.h (modified)
	* code/branches/presentation3/src/modules/questsystem/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/questsystem/Quest.h (modified)
	* code/branches/presentation3/src/modules/questsystem/QuestGUI.cc (deleted)
	* code/branches/presentation3/src/modules/questsystem/QuestGUI.h (deleted)
	* code/branches/presentation3/src/modules/questsystem/QuestGUINode.cc (deleted)
	* code/branches/presentation3/src/modules/questsystem/QuestGUINode.h (deleted)
	* code/branches/presentation3/src/modules/questsystem/QuestHint.h (modified)
	* code/branches/presentation3/src/modules/questsystem/QuestManager.cc (modified)
	* code/branches/presentation3/src/modules/questsystem/QuestManager.h (modified)
	* code/branches/presentation3/src/modules/questsystem/QuestsystemPrereqs.h (modified)
	* code/branches/presentation3/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/infos/PlayerInfo.h (modified)

	Made the QuestGUI completely lua based in an attempt to remove a ...


Mon, 31 May 2010 21:18:29 GMT decapitb [7069]
	* code/branches/presentation3/data/levels/includes/weaponsettings_swallow.oxi (added)
	* code/branches/presentation3/data/levels/templates/spaceship_swallow.oxt (added)

	basic template and weaponsettings for swallow spaceship


Mon, 31 May 2010 16:18:50 GMT solex [7066]
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.h (modified)

	formationflight final commit before presentation (probably...)


Mon, 31 May 2010 16:06:51 GMT scheusso [7065]
	* code/branches/presentation3/data/levels/screenshot.oxw (added)

	small testlevel for the presentation screenshot


Mon, 31 May 2010 16:06:03 GMT scheusso [7064]
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)

	fixed a bug in ArtificialController::sameTeam


Mon, 31 May 2010 15:21:40 GMT jo [7063]
	* code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h (modified)

	stable version without the ghost-spaceship


Mon, 31 May 2010 14:55:05 GMT jo [7062]
	* code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h (modified)
	* code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/presentation3/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/GametypeMessageListener.h (modified)

	coloured messages, different spaceships in one level, with bug


Mon, 31 May 2010 14:44:51 GMT dafrick [7061]
	* code/branches/presentation3/data/levels/Level(Deathmatch).oxw (deleted)
	* code/branches/presentation3/data/levels/Level(UnderAttack).oxw (deleted)
	* code/branches/presentation3/data/levels/empty_level.oxw (modified)
	* code/branches/presentation3/data/levels/mylevel.oxw (deleted)
	* code/branches/presentation3/data/levels/old/presentationLOD.oxw (moved)
	* code/branches/presentation3/data/levels/quest_test.oxw (deleted)
	* code/branches/presentation3/data/levels/test_ghost.oxw (deleted)

	Cleaning up some levels.


Mon, 31 May 2010 14:44:02 GMT gasserlu [7060]
	* code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.h (modified)

	drone shootingRange implemented


Mon, 31 May 2010 14:21:56 GMT stmathia [7058]
	* code/branches/presentation3/data/levels/Fight in our Back.oxw (added)
	* code/branches/presentation3/data/levels/The Time Machine.oxw (added)
	* code/branches/presentation3/data/levels/empty_level.oxw (modified)

	empty_level:erased unnecessary code
	Fight in our Back: added quests ...


Mon, 31 May 2010 14:19:14 GMT scheusso [7056]
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	adjusted speed of rocket


Mon, 31 May 2010 14:03:06 GMT kolibri7 [7054]
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)

	* slightly changed the algorithm for computing the distvalues for lod ...


Mon, 31 May 2010 13:33:14 GMT scheusso [7051]
	* code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h (modified)

	HUDNavigation overlays are coloured now


Mon, 31 May 2010 13:17:25 GMT sfluecki [7050]
	* code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc (modified)
	* code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h (modified)

	Added a ConfigValue to limit the amount of marked entities


Mon, 31 May 2010 13:08:51 GMT smerkli [7049]
	* code/branches/presentation3/src/orxonox/ChatInputHandler.cc (modified)

	some comments made, no code changes.


Mon, 31 May 2010 13:01:59 GMT kolibri7 [7048]
	* code/branches/presentation3/data/levels/presentationLOD.oxw (modified)
	* code/branches/presentation3/data/levels/presentationLODdif.oxw (deleted)

	*deleted old lod levels
	*changed presentationLOD.oxw for better view ...


Mon, 31 May 2010 12:30:17 GMT kolibri7 [7047]
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)

	* modified the formula for computation of distances for lod


Mon, 31 May 2010 12:20:12 GMT scheusso [7046]
	* code/branches/presentation3/data/levels/presentationFS10.oxw (moved)

	using lod templates in this level
	renamed the filename


Mon, 31 May 2010 12:10:35 GMT scheusso [7045]
	* code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h (modified)
	* code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc (modified)

	RadarViewable need a worldentity* when constructing
	i really thought ...


Mon, 31 May 2010 12:07:31 GMT scheusso [7044]
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified)

	fixed build


Mon, 31 May 2010 12:02:39 GMT smerkli [7043]
	* code/branches/presentation3/src/orxonox/ChatInputHandler.cc (modified)
	* code/branches/presentation3/src/orxonox/ChatInputHandler.h (modified)




Mon, 31 May 2010 11:41:26 GMT dafrick [7042]
	* code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentation3/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/branches/presentation3/data/levels/PresentationFS10.oxw (modified)

	Updates in presentation level.


Mon, 31 May 2010 11:30:58 GMT rgrieder [7041]
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified)

	ScreenshotManager working now, though there might be a memory leak in ...


Mon, 31 May 2010 10:06:55 GMT gnadler [7040]
	* code/branches/presentation3/data/defaultConfig/keybindings.ini (modified)

	changed Rocket-keybindings:
	T (as before for the original ...


Mon, 31 May 2010 07:33:09 GMT rgrieder [7039]
	* code/branches/presentation3/src/libraries/network/ChatListener.h (modified)
	* code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified)
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc (modified)
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified)
	* code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc (modified)
	* code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h (modified)
	* code/branches/presentation3/src/modules/weapons/RocketController.h (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation3/src/orxonox/Level.h (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.h (modified)

	Removed some tabs.


Mon, 31 May 2010 07:24:33 GMT dafrick [7038]
	* code/branches/presentation3/data/levels/includes/pickups.oxi (modified)
	* code/branches/presentation3/data/levels/pickups.oxw (modified)
	* code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/branches/presentation3/src/modules/pickup/PickupSpawner.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.cc (modified)

	Updated pickups level and template and include file to properly ...


Mon, 31 May 2010 07:21:07 GMT rgrieder [7037]
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)

	Using C++ includes (limits.h --> climits).


Mon, 31 May 2010 07:02:48 GMT scheusso [7036]
	* code/branches/presentation3/data/levels/Level(Deathmatch).oxw (modified)
	* code/branches/presentation3/data/levels/Level(UnderAttack).oxw (modified)
	* code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (modified)
	* code/branches/presentation3/data/levels/events.oxw (modified)
	* code/branches/presentation3/data/levels/mylevel.oxw (modified)
	* code/branches/presentation3/data/levels/pickups.oxw (modified)
	* code/branches/presentation3/data/levels/presentation.oxw (modified)
	* code/branches/presentation3/data/levels/presentation09.oxw (modified)
	* code/branches/presentation3/data/levels/presentation09b.oxw (modified)
	* code/branches/presentation3/data/levels/presentationHS09.oxw (modified)
	* code/branches/presentation3/data/levels/presentationHS09b.oxw (modified)
	* code/branches/presentation3/data/levels/presentationLOD.oxw (modified)
	* code/branches/presentation3/data/levels/presentationLODdif.oxw (modified)
	* code/branches/presentation3/data/levels/presentation_dm.oxw (modified)
	* code/branches/presentation3/data/levels/presentation_pong.oxw (modified)
	* code/branches/presentation3/data/levels/princessaeryn.oxw (modified)
	* code/branches/presentation3/data/levels/quest_test.oxw (modified)
	* code/branches/presentation3/data/levels/sound.oxw (modified)
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified)
	* code/branches/presentation3/data/levels/test_ghost.oxw (modified)
	* code/branches/presentation3/data/levels/test_stars.oxw (modified)
	* code/branches/presentation3/data/levels/tutorial.oxw (modified)
	* code/branches/presentation3/data/levels/waypoints.oxw (modified)
	* code/branches/presentation3/src/orxonox/Level.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.h (modified)

	some changes regarding lod:
	- added lodtemplate in different levels ...


Mon, 31 May 2010 05:43:51 GMT dafrick [7035]
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.cc (modified)

	Added include in ArtificialController to make it work under linux. ...


Mon, 31 May 2010 03:31:50 GMT landauf [7034]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/pickups.oxw (modified)
	* code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/branches/presentation3/data/levels/templates/spaceship_pirate.oxt (modified)
	* code/branches/presentation3/src/modules/pickup/PickupPrereqs.h (modified)
	* code/branches/presentation3/src/modules/pickup/items/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/pickup/items/DronePickup.cc (copied)
	* code/branches/presentation3/src/modules/pickup/items/DronePickup.h (copied)
	* code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.cc (copied)
	* code/branches/presentation3/src/orxonox/controllers/DroneController.h (copied)
	* code/branches/presentation3/src/orxonox/controllers/WaypointPatrolController.cc (modified)
	* code/branches/presentation3/src/orxonox/controllers/WaypointPatrolController.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/branches/presentation3/src/orxonox/worldentities/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.cc (copied)
	* code/branches/presentation3/src/orxonox/worldentities/Drone.h (copied)

	merged ai branch to presentation3


Mon, 31 May 2010 02:52:31 GMT landauf [7032]
	* code/branches/presentation3/data/levels/Level(Deathmatch).oxw (modified)
	* code/branches/presentation3/data/levels/Level(UnderAttack).oxw (modified)
	* code/branches/presentation3/data/levels/PresentationFS10.oxw (modified)
	* code/branches/presentation3/data/levels/Quest_PirateAttack.oxw (modified)
	* code/branches/presentation3/data/levels/mylevel.oxw (modified)
	* code/branches/presentation3/data/levels/pickups.oxw (modified)
	* code/branches/presentation3/data/levels/quest_test.oxw (modified)
	* code/branches/presentation3/data/levels/test_stars.oxw (modified)

	eol-style native


Mon, 31 May 2010 02:42:57 GMT landauf [7031]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/gametype_dynamicmatch.oxw (copied)
	* code/branches/presentation3/data/overlays/dynamicmatchhud.oxo (copied)
	* code/branches/presentation3/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/branches/presentation3/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.cc (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h (copied)
	* code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc (modified)
	* code/branches/presentation3/src/orxonox/gametypes/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (copied)
	* code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.h (copied)
	* code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc (modified)
	* code/branches/presentation3/src/orxonox/infos/GametypeInfo.h (modified)
	* code/branches/presentation3/src/orxonox/interfaces/GametypeMessageListener.h (modified)

	merged dynamicmatch to presentation3


Mon, 31 May 2010 02:22:29 GMT landauf [7030]
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)

	removed mergeinfo


Sun, 30 May 2010 20:21:41 GMT rgrieder [7028]
	* code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified)
	* code/branches/presentation3/src/modules/designtools/CreateStars.h (modified)

	Fixed M_PI problem (not C++).
	Note: For the future, we should define ...


Sun, 30 May 2010 18:22:19 GMT decapitb [7027]
	* code/branches/presentation3/data/levels/PresentationFS10.oxw (added)
	* code/branches/presentation3/src/orxonox/graphics/AnimatedModel.cc (modified)

	got to work on that level...
	minor cosmetic changes to AnimatedModel.cc


Sun, 30 May 2010 15:40:21 GMT dafrick [7025]
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified)

	Some cleanup.


Sun, 30 May 2010 14:46:17 GMT scheusso [7024]
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)

	accidentially disabled lod


Sun, 30 May 2010 14:36:43 GMT dafrick [7023]
	* code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/presentation3/src/orxonox/gametypes/TeamDeathmatch.cc (modified)

	Made gametype_asteroids level easier to play and erased some debug ...


Sun, 30 May 2010 14:09:45 GMT scheusso [7022]
	* code/branches/presentation3/src/modules/designtools/CreateStars.cc (modified)
	* code/branches/presentation3/src/modules/designtools/ScreenshotManager.h (modified)

	fixed some includes


Sun, 30 May 2010 13:57:05 GMT gnadler [7021]
	* code/branches/presentation3/src/modules/weapons/RocketController.cc (modified)
	* code/branches/presentation3/src/modules/weapons/RocketController.h (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	documentation & formatting commit


Sun, 30 May 2010 13:46:08 GMT scheusso [7020]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)

	some enhancements to lod (can be disabled now in the lodinformation ...


Sun, 30 May 2010 13:44:22 GMT scheusso [7019]
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)

	some network related fixes


Sun, 30 May 2010 13:19:49 GMT scheusso [7018]
	* code/branches/presentation3/data/levels/tutorial.oxw (modified)
	* code/branches/presentation3/data/particle/simplerocketfire.particle (copied)
	* code/branches/presentation3/src/modules/weapons/RocketController.cc (modified)
	* code/branches/presentation3/src/modules/weapons/RocketController.h (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (modified)
	* code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)

	merged rocket2 branch back into presentation3 branch