#
# ChangeLog for code/trunk/src/modules/pickup/PickupManager.cc
#
# Generated by Trac 1.0.9
# May 27, 2024, 8:52:20 PM

Mon, 19 Apr 2010 07:37:18 GMT rgrieder [6752]
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)

	Fixed PickupManager::getPawn() method against NULL pointers. ...


Fri, 16 Apr 2010 12:50:16 GMT rgrieder [6746]
	* code/trunk (modified)
	* code/trunk/cmake/LibraryConfigTardis.cmake (modified)
	* code/trunk/data/gui/configs/Falagard.xsd (deleted)
	* code/trunk/data/gui/configs/Font.xsd (deleted)
	* code/trunk/data/gui/configs/GUILayout.xsd (deleted)
	* code/trunk/data/gui/configs/GUIScheme.xsd (deleted)
	* code/trunk/data/gui/configs/Imageset.xsd (deleted)
	* code/trunk/data/gui/layouts/AudioMenu.layout (modified)
	* code/trunk/data/gui/layouts/CompositorDemo.layout (deleted)
	* code/trunk/data/gui/layouts/Console.wnd (deleted)
	* code/trunk/data/gui/layouts/ControlsMenu.layout (modified)
	* code/trunk/data/gui/layouts/CreditsMenu.layout (modified)
	* code/trunk/data/gui/layouts/CrowdDemo.layout (deleted)
	* code/trunk/data/gui/layouts/DecisionPopup.layout (modified)
	* code/trunk/data/gui/layouts/Demo7Windows.layout (deleted)
	* code/trunk/data/gui/layouts/Demo8.layout (deleted)
	* code/trunk/data/gui/layouts/DragDropDemo.layout (deleted)
	* code/trunk/data/gui/layouts/FontDemo.layout (deleted)
	* code/trunk/data/gui/layouts/GameplayMenu.layout (modified)
	* code/trunk/data/gui/layouts/GraphicsMenu.layout (modified)
	* code/trunk/data/gui/layouts/InGameMenu.layout (modified)
	* code/trunk/data/gui/layouts/InGameTest.layout (modified)
	* code/trunk/data/gui/layouts/InfoPopup.layout (modified)
	* code/trunk/data/gui/layouts/InstancingDemo.layout (deleted)
	* code/trunk/data/gui/layouts/KeyBindMenu.layout (modified)
	* code/trunk/data/gui/layouts/MainMenu.layout (modified)
	* code/trunk/data/gui/layouts/MainMenuBackground.layout (modified)
	* code/trunk/data/gui/layouts/MouseControlsMenu.layout (modified)
	* code/trunk/data/gui/layouts/MultiplayerMenu.layout (modified)
	* code/trunk/data/gui/layouts/MultiplayerOptionsMenu.layout (modified)
	* code/trunk/data/gui/layouts/PickupInventory.layout (modified)
	* code/trunk/data/gui/layouts/QuestGUI.layout (modified)
	* code/trunk/data/gui/layouts/SettingsMenu.layout (modified)
	* code/trunk/data/gui/layouts/SingleplayerMenu.layout (modified)
	* code/trunk/data/gui/layouts/TabControlDemo.layout (deleted)
	* code/trunk/data/gui/layouts/TabPage.layout (deleted)
	* code/trunk/data/gui/layouts/TabPage1.layout (deleted)
	* code/trunk/data/gui/layouts/TabPage2.layout (deleted)
	* code/trunk/data/gui/layouts/TextDemo.layout (deleted)
	* code/trunk/data/gui/layouts/TreeDemoTaharez.layout (deleted)
	* code/trunk/data/gui/layouts/VanillaConsole.layout (deleted)
	* code/trunk/data/gui/layouts/VanillaWindows.layout (deleted)
	* code/trunk/data/gui/layouts/cegui8.layout (deleted)
	* code/trunk/data/gui/layouts/facial.layout (deleted)
	* code/trunk/data/gui/layouts/ogregui.layout (deleted)
	* code/trunk/data/gui/layouts/shadows.layout (deleted)
	* code/trunk/data/gui/schemes/Demo8.scheme (deleted)
	* code/trunk/data/gui/schemes/Looks.txt (copied)
	* code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/trunk/data/gui/schemes/SleekSpaceHUDWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/SleekSpaceLook.scheme (copied)
	* code/trunk/data/gui/schemes/SleekSpaceMenuWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/TaharezGreenHUDWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/TaharezGreenLook.scheme (copied)
	* code/trunk/data/gui/schemes/TaharezGreenMenuWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/TaharezHUDWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/TaharezLook.scheme (modified)
	* code/trunk/data/gui/schemes/TaharezLookSkin.scheme (deleted)
	* code/trunk/data/gui/schemes/TaharezLookWidgetAliases.scheme (deleted)
	* code/trunk/data/gui/schemes/TaharezLookWidgets.scheme (deleted)
	* code/trunk/data/gui/schemes/TaharezMenuWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/VanillaHUDWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/VanillaLook.scheme (copied)
	* code/trunk/data/gui/schemes/VanillaMenuWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/VanillaSkin.scheme (deleted)
	* code/trunk/data/gui/schemes/WindowsHUDWidgets.scheme (copied)
	* code/trunk/data/gui/schemes/WindowsLook.scheme (modified)
	* code/trunk/data/gui/schemes/WindowsLookWidgets.scheme (deleted)
	* code/trunk/data/gui/schemes/WindowsMenuWidgets.scheme (copied)
	* code/trunk/data/gui/scripts/AudioMenu.lua (modified)
	* code/trunk/data/gui/scripts/BasicGUI.lua (deleted)
	* code/trunk/data/gui/scripts/ControlsMenu.lua (modified)
	* code/trunk/data/gui/scripts/CreditsMenu.lua (modified)
	* code/trunk/data/gui/scripts/DecisionPopup.lua (modified)
	* code/trunk/data/gui/scripts/GUISheet.lua (copied)
	* code/trunk/data/gui/scripts/GUITools.lua (modified)
	* code/trunk/data/gui/scripts/GameplayMenu.lua (modified)
	* code/trunk/data/gui/scripts/GraphicsMenu.lua (modified)
	* code/trunk/data/gui/scripts/HUDSheet.lua (copied)
	* code/trunk/data/gui/scripts/InGameMenu.lua (modified)
	* code/trunk/data/gui/scripts/InfoPopup.lua (modified)
	* code/trunk/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/trunk/data/gui/scripts/MainMenu.lua (modified)
	* code/trunk/data/gui/scripts/MenuSheet.lua (copied)
	* code/trunk/data/gui/scripts/MouseControlsMenu.lua (modified)
	* code/trunk/data/gui/scripts/MultiplayerMenu.lua (modified)
	* code/trunk/data/gui/scripts/MultiplayerOptionsMenu.lua (modified)
	* code/trunk/data/gui/scripts/PickupInventory.lua (modified)
	* code/trunk/data/gui/scripts/QuestGUI.lua (modified)
	* code/trunk/data/gui/scripts/SettingsMenu.lua (modified)
	* code/trunk/data/gui/scripts/SheetManager.lua (copied)
	* code/trunk/data/gui/scripts/SingleplayerMenu.lua (modified)
	* code/trunk/data/lua/Debugger.lua (copied)
	* code/trunk/data/lua/LuaStateInit.lua (modified)
	* code/trunk/data/lua/Strict.lua (copied)
	* code/trunk/data/lua/Tools.lua (copied)
	* code/trunk/src/libraries/core/Core.cc (modified)
	* code/trunk/src/libraries/core/Core.h (modified)
	* code/trunk/src/libraries/core/GUIManager.cc (modified)
	* code/trunk/src/libraries/core/GUIManager.h (modified)
	* code/trunk/src/libraries/core/Game.h (modified)
	* code/trunk/src/libraries/core/IOConsole.cc (modified)
	* code/trunk/src/libraries/core/IOConsole.h (modified)
	* code/trunk/src/libraries/core/LuaState.cc (modified)
	* code/trunk/src/libraries/core/LuaState.h (modified)
	* code/trunk/src/libraries/core/Resource.cc (modified)
	* code/trunk/src/libraries/core/Resource.h (modified)
	* code/trunk/src/libraries/core/Template.cc (modified)
	* code/trunk/src/libraries/core/input/InputDevice.h (modified)
	* code/trunk/src/libraries/core/input/InputHandler.h (modified)
	* code/trunk/src/libraries/core/input/InputManager.cc (modified)
	* code/trunk/src/libraries/core/input/InputManager.h (modified)
	* code/trunk/src/libraries/core/input/InputPrereqs.h (modified)
	* code/trunk/src/libraries/core/input/InputState.cc (modified)
	* code/trunk/src/libraries/core/input/InputState.h (modified)
	* code/trunk/src/libraries/network/TrafficControl.h (modified)
	* code/trunk/src/libraries/util/Serialise.h (modified)
	* code/trunk/src/libraries/util/Singleton.h (modified)
	* code/trunk/src/libraries/util/TriBool.h (copied)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/questsystem/QuestGUI.cc (modified)
	* code/trunk/src/modules/questsystem/QuestGUINode.cc (modified)
	* code/trunk/src/orxonox/CameraManager.h (modified)
	* code/trunk/src/orxonox/Level.cc (modified)
	* code/trunk/src/orxonox/LevelManager.h (modified)
	* code/trunk/src/orxonox/PlayerManager.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSMainMenu.h (modified)
	* code/trunk/src/orxonox/overlays/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/overlays/GUISheet.cc (copied)
	* code/trunk/src/orxonox/overlays/GUISheet.h (copied)

	Merged gamestates2 branch back to trunk.
	This brings in some heavy ...


Thu, 15 Apr 2010 11:15:11 GMT dafrick [6728]
	* code/trunk/data/levels/pickup.oxw (modified)
	* code/trunk/src/modules/pickup/Pickup.h (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified)

	No more seg faults with pickups (at least that's what I hope. ;))


Tue, 13 Apr 2010 20:39:54 GMT dafrick [6725]
	* code/trunk/data/levels/includes/pickups.oxi (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.cc (modified)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified)

	Resolved bug, that caused orxonox to crash whenever a level with ...


Tue, 13 Apr 2010 08:16:10 GMT dafrick [6711]
	* code/trunk (modified)
	* code/trunk/data/gui/layouts/PickupInventory.layout (modified)
	* code/trunk/data/gui/schemes/OrxonoxGUIScheme.scheme (modified)
	* code/trunk/data/gui/scripts/InitialiseGUI.lua (modified)
	* code/trunk/data/gui/scripts/PickupInventory.lua (modified)
	* code/trunk/data/gui/scripts/QuestGUI.lua (modified)
	* code/trunk/data/levels/includes/pickups.oxi (modified)
	* code/trunk/data/levels/pickup.oxw (modified)
	* code/trunk/data/levels/templates/pickup_representation_templates.oxt (modified)
	* code/trunk/data/overlays/hudtemplates3.oxo (modified)
	* code/trunk/src/modules/pickup/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/items/Engine.h (modified)
	* code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h (modified)

	Merged pickup4 branch back to trunk.


Tue, 16 Mar 2010 20:35:11 GMT dafrick [6540]
	* code/trunk/src/modules/pickup/DroppedPickup.cc (modified)
	* code/trunk/src/modules/pickup/DroppedPickup.h (modified)
	* code/trunk/src/modules/pickup/Pickup.cc (modified)
	* code/trunk/src/modules/pickup/Pickup.h (modified)
	* code/trunk/src/modules/pickup/PickupCollection.cc (modified)
	* code/trunk/src/modules/pickup/PickupCollection.h (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/modules/pickup/PickupManager.h (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (modified)
	* code/trunk/src/modules/pickup/PickupSpawner.h (modified)
	* code/trunk/src/modules/pickup/items/HealthPickup.cc (modified)
	* code/trunk/src/modules/pickup/items/HealthPickup.h (modified)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.cc (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (modified)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.cc (modified)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Removed some TODO's. Finished up documenting pickup module.


Mon, 15 Mar 2010 14:27:09 GMT dafrick [6524]
	* code/trunk (modified)
	* code/trunk/data/levels/empty_level.oxw (modified)
	* code/trunk/data/levels/includes/pickups.oxi (copied)
	* code/trunk/data/levels/pickup.oxw (copied)
	* code/trunk/data/levels/templates/pickup_representation_templates.oxt (copied)
	* code/trunk/src/libraries/core/BaseObject.cc (modified)
	* code/trunk/src/libraries/core/BaseObject.h (modified)
	* code/trunk/src/libraries/core/GraphicsManager.cc (modified)
	* code/trunk/src/libraries/core/OrxonoxClass.h (modified)
	* code/trunk/src/libraries/core/Super.h (modified)
	* code/trunk/src/modules/CMakeLists.txt (modified)
	* code/trunk/src/modules/pickup (copied)
	* code/trunk/src/modules/pickup/CMakeLists.txt (copied)
	* code/trunk/src/modules/pickup/DroppedPickup.cc (copied)
	* code/trunk/src/modules/pickup/DroppedPickup.h (copied)
	* code/trunk/src/modules/pickup/Pickup.cc (copied)
	* code/trunk/src/modules/pickup/Pickup.h (copied)
	* code/trunk/src/modules/pickup/PickupCollection.cc (copied)
	* code/trunk/src/modules/pickup/PickupCollection.h (copied)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.cc (copied)
	* code/trunk/src/modules/pickup/PickupCollectionIdentifier.h (copied)
	* code/trunk/src/modules/pickup/PickupManager.cc (copied)
	* code/trunk/src/modules/pickup/PickupManager.h (copied)
	* code/trunk/src/modules/pickup/PickupPrecompiledHeaders.h (copied)
	* code/trunk/src/modules/pickup/PickupPrereqs.h (copied)
	* code/trunk/src/modules/pickup/PickupRepresentation.cc (copied)
	* code/trunk/src/modules/pickup/PickupRepresentation.h (copied)
	* code/trunk/src/modules/pickup/PickupSpawner.cc (copied)
	* code/trunk/src/modules/pickup/PickupSpawner.h (copied)
	* code/trunk/src/modules/pickup/items (copied)
	* code/trunk/src/modules/pickup/items/CMakeLists.txt (copied)
	* code/trunk/src/modules/pickup/items/HealthPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/HealthPickup.h (copied)
	* code/trunk/src/modules/pickup/items/MetaPickup.cc (copied)
	* code/trunk/src/modules/pickup/items/MetaPickup.h (copied)
	* code/trunk/src/modules/weapons/projectiles/Projectile.cc (modified)
	* code/trunk/src/modules/weapons/projectiles/Rocket.cc (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/OrxonoxPrereqs.h (modified)
	* code/trunk/src/orxonox/interfaces/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/interfaces/InterfaceCompilation.cc (modified)
	* code/trunk/src/orxonox/interfaces/PickupCarrier.h (copied)
	* code/trunk/src/orxonox/interfaces/Pickupable.cc (copied)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (copied)
	* code/trunk/src/orxonox/items/Engine.cc (modified)
	* code/trunk/src/orxonox/pickup/BaseItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/BaseItem.h (deleted)
	* code/trunk/src/orxonox/pickup/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/pickup/DroppedItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/DroppedItem.h (deleted)
	* code/trunk/src/orxonox/pickup/EquipmentItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/EquipmentItem.h (deleted)
	* code/trunk/src/orxonox/pickup/ModifierPickup.cc (deleted)
	* code/trunk/src/orxonox/pickup/ModifierPickup.h (deleted)
	* code/trunk/src/orxonox/pickup/ModifierType.h (deleted)
	* code/trunk/src/orxonox/pickup/PassiveItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/PassiveItem.h (deleted)
	* code/trunk/src/orxonox/pickup/PickupCollection.cc (deleted)
	* code/trunk/src/orxonox/pickup/PickupCollection.h (deleted)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.cc (copied)
	* code/trunk/src/orxonox/pickup/PickupIdentifier.h (copied)
	* code/trunk/src/orxonox/pickup/PickupInventory.cc (deleted)
	* code/trunk/src/orxonox/pickup/PickupInventory.h (deleted)
	* code/trunk/src/orxonox/pickup/PickupSpawner.cc (deleted)
	* code/trunk/src/orxonox/pickup/PickupSpawner.h (deleted)
	* code/trunk/src/orxonox/pickup/UsableItem.cc (deleted)
	* code/trunk/src/orxonox/pickup/UsableItem.h (deleted)
	* code/trunk/src/orxonox/pickup/items (deleted)
	* code/trunk/src/orxonox/worldentities/WorldEntity.cc (modified)
	* code/trunk/src/orxonox/worldentities/WorldEntity.h (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.cc (modified)
	* code/trunk/src/orxonox/worldentities/pawns/Pawn.h (modified)

	Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, ...


Sun, 07 Mar 2010 22:00:05 GMT dafrick [6484]
	* code/branches/pickup3/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc (modified)
	* code/branches/pickup3/src/modules/pickup/PickupSpawner.cc (modified)
	* code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc (modified)
	* code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc (modified)

	Cleanup and bug fixes.