#
# ChangeLog for code/branches/presentation3/src/libraries
#
# Generated by Trac 1.0.9
# Nov 25, 2024, 5:10:33 AM

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


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


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


Sun, 30 May 2010 11:37:33 GMT dafrick [7012]
	* code/branches/presentation3/data/gui/layouts/SettingsMenu.layout (modified)
	* code/branches/presentation3/data/gui/scripts/MiscConfigMenu.lua (modified)
	* code/branches/presentation3/src/libraries/core/GUIManager.cc (modified)
	* code/branches/presentation3/src/libraries/core/GUIManager.h (modified)

	Config values can now be changed in a menu.


Sat, 29 May 2010 19:33:33 GMT dafrick [7008]
	* code/branches/presentation3/data/levels/pickups.oxw (modified)
	* code/branches/presentation3/src/libraries/core/OrxonoxClass.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/items/HealthPickup.cc (modified)

	Fixed a bug in pickups that caused the clone method of Pickup.h not ...


Thu, 27 May 2010 20:44:10 GMT dafrick [6996]
	* code/branches/presentation3/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/branches/presentation3/data/gui/scripts/PickupInventory.lua (modified)
	* code/branches/presentation3/src/libraries/core/GUIManager.h (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/presentation3/src/modules/pickup/PickupManager.h (modified)
	* code/branches/presentation3/src/orxonox/gametypes/Gametype.cc (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/Rewardable.h (modified)

	Loads of changes.
	1) PickupInventory should now be working even for ...


Thu, 27 May 2010 20:31:25 GMT scheusso [6994]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/test_stars.oxw (copied)
	* code/branches/presentation3/data/particle/fog.particle (copied)
	* code/branches/presentation3/src/libraries/core/Core.cc (modified)
	* code/branches/presentation3/src/modules/CMakeLists.txt (modified)
	* code/branches/presentation3/src/modules/designtools (copied)
	* code/branches/presentation3/src/modules/designtools/CMakeLists.txt (copied)
	* code/branches/presentation3/src/modules/designtools/CreateStars.cc (copied)
	* code/branches/presentation3/src/modules/designtools/CreateStars.h (copied)
	* code/branches/presentation3/src/modules/designtools/DesignToolsPrereqs.h (copied)
	* code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc (copied)
	* code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h (copied)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc (modified)
	* code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h (modified)
	* code/branches/presentation3/src/orxonox/controllers/AIController.cc (modified)
	* code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h (modified)

	merged skybox2 branch to presentation merger branch


Sat, 22 May 2010 18:43:39 GMT scheusso [6964]
	* code/branches/presentation3/src/libraries/network/packet/ClassID.cc (modified)
	* code/branches/presentation3/src/libraries/network/synchronisable/Serialise.h (modified)
	* code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)

	fix in ClassID (thanks reto)
	fix in Rocket
	small improvements in ...


Fri, 21 May 2010 16:50:07 GMT scheusso [6961]
	* code/branches/presentation3/src/libraries/network/synchronisable/Serialise.h (modified)
	* code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.cc (modified)
	* code/branches/presentation3/src/orxonox/Level.cc (modified)
	* code/branches/presentation3/src/orxonox/Scene.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)
	* code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc (modified)

	fixed to make everything network-compliant again


Fri, 21 May 2010 16:49:29 GMT scheusso [6960]
	* code/branches/presentation3/src/libraries/network/packet/ClassID.cc (modified)

	can't imagine how this worked so long


Thu, 20 May 2010 14:35:48 GMT dafrick [6938]
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (modified)
	* code/branches/presentation3/src/libraries/core/Template.cc (modified)
	* code/branches/presentation3/src/libraries/core/Template.h (modified)

	Resolved issue with lod-template. Now, template inherit the ...


Thu, 20 May 2010 09:33:07 GMT scheusso [6928]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/defaultConfig/keybindings.ini (modified)
	* code/branches/presentation3/data/gui/layouts/ChatBox-inputonly.layout (copied)
	* code/branches/presentation3/data/gui/layouts/ChatBox.layout (copied)
	* code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua (copied)
	* code/branches/presentation3/data/gui/scripts/ChatBox.lua (copied)
	* code/branches/presentation3/src/libraries/network/ChatListener.cc (modified)
	* code/branches/presentation3/src/libraries/network/ChatListener.h (modified)
	* code/branches/presentation3/src/libraries/network/Host.h (modified)
	* code/branches/presentation3/src/libraries/network/packet/Chat.cc (modified)
	* code/branches/presentation3/src/libraries/network/packet/Chat.h (modified)
	* code/branches/presentation3/src/orxonox/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/ChatHistory.cc (copied)
	* code/branches/presentation3/src/orxonox/ChatHistory.h (copied)
	* code/branches/presentation3/src/orxonox/ChatInputHandler.cc (copied)
	* code/branches/presentation3/src/orxonox/ChatInputHandler.h (copied)
	* code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc (copied)
	* code/branches/presentation3/src/orxonox/graphics/CEGuiSample.h (copied)

	mergine chat2 into presentation merger branch


Thu, 20 May 2010 08:23:22 GMT scheusso [6926]
	* code/branches/presentation3 (modified)
	* code/branches/presentation3/data/levels/empty_level.oxw (modified)
	* code/branches/presentation3/data/levels/gametype_asteroids.oxw (modified)
	* code/branches/presentation3/data/levels/gametype_underattack.oxw (modified)
	* code/branches/presentation3/data/levels/presentationLOD.oxw (copied)
	* code/branches/presentation3/data/levels/presentationLODdif.oxw (copied)
	* code/branches/presentation3/data/levels/teambasematchlevel.oxw (modified)
	* code/branches/presentation3/data/levels/teamdeathmatch.oxw (modified)
	* code/branches/presentation3/data/levels/templates/lodinformation.oxt (copied)
	* code/branches/presentation3/src/libraries/core/BaseObject.cc (modified)
	* code/branches/presentation3/src/libraries/core/BaseObject.h (modified)
	* code/branches/presentation3/src/orxonox/Level.cc (modified)
	* code/branches/presentation3/src/orxonox/Level.h (modified)
	* code/branches/presentation3/src/orxonox/LevelManager.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/CMakeLists.txt (modified)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc (copied)
	* code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h (copied)
	* code/branches/presentation3/src/orxonox/graphics/Model.cc (modified)
	* code/branches/presentation3/src/orxonox/graphics/Model.h (modified)

	merging lod branch into presentation3 merger branch


Mon, 17 May 2010 13:31:49 GMT scheusso [6912]
	* code/branches/presentation3 (copied)

	creating new presentation merger branch


Thu, 06 May 2010 12:56:39 GMT dafrick [6859]
	* code/trunk/src/libraries/core/Event.cc (modified)
	* code/trunk/src/modules/objects/triggers/MultiTrigger.cc (modified)
	* code/trunk/src/modules/objects/triggers/MultiTrigger.h (modified)
	* code/trunk/src/modules/objects/triggers/MultiTriggerContainer.cc (modified)
	* code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified)

	Resolved a bug in MultiTriggerContainer that caused the ...