#
# ChangeLog for code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc
#
# Generated by Trac 1.0.9
# May 19, 2024, 6:43:35 AM

Fri, 05 Jan 2018 23:15:25 GMT landauf [11700]
	* code/trunk (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified)
	* code/trunk/src/modules/pickup/PickupManager.cc (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.cc (modified)

	merged the remaining commits of HUD_HS16 branch back to trunk (except ...


Thu, 09 Mar 2017 13:50:27 GMT patricwi [11354]
	* code/trunk (modified)
	* code/trunk/data/levels/pickups.oxw (modified)
	* code/trunk/data/overlays/HUDPickupTemplate.oxo (copied)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (modified)

	merged updated HUD branch to trunk


Thu, 09 Mar 2017 13:46:20 GMT patricwi [11353]
	* code/trunk (modified)
	* code/trunk/README (modified)
	* code/trunk/data/defaultConfig/keybindings.ini (modified)
	* code/trunk/data/gui/scripts/KeyBindMenu.lua (modified)
	* code/trunk/data/overlays/HUDTemplates3.oxo (modified)
	* code/trunk/data/overlays/HUDTemplatesFPS.oxo (modified)
	* code/trunk/src/modules/overlays/OverlaysPrereqs.h (modified)
	* code/trunk/src/modules/overlays/hud/CMakeLists.txt (modified)
	* code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDPickupItem.h (copied)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (copied)
	* code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (copied)
	* 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/items/SpeedPickup.h (modified)
	* code/trunk/src/orxonox/CMakeLists.txt (modified)
	* code/trunk/src/orxonox/controllers/HumanController.h (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/trunk/src/orxonox/gamestates/GSLevel.h (modified)
	* code/trunk/src/orxonox/interfaces/Pickupable.h (modified)

	merged HUD branch to trunk


Mon, 12 Dec 2016 15:20:50 GMT patricwi [11336]
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc (modified)
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.h (modified)
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc (modified)
	* code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.h (modified)
	* code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc (modified)
	* code/branches/HUD_HS16/src/modules/pickup/PickupManager.h (modified)
	* code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.cc (modified)
	* code/branches/HUD_HS16/src/orxonox/gamestates/GSLevel.h (modified)

	finished version of HUD and PickupSystem. crash bug remaining