![[Jenkins]](/jenkins/static/d90b65e2/images/jenkins-header-logo-v2.svg){kind=logo}
Changes
Summary
- [HUD_HS16] fixed wrong dependency between overlays and pickup module: pickup should NOT depend on overlays; instead overlays should use pickup. also reverted all changes from HUD_HS16 in PickupManager for several reasons: - calling HUDPickupSystem is not necessary anymore due to the fixed dependencies - adding a console command is not necessary because there is already a full GUI for this purpose (press F4) - limiting the number of pickups to 10 is a bad idea because PickupManager manages pickups for ALL players in the game
| Change Type | Path in Repository | Path in Workspace |
|---|---|---|
 | /code/trunk/data/defaultConfig/keybindings.ini (diff) | data/defaultConfig/keybindings.ini |
| /code/trunk/data/gui/scripts/KeyBindMenu.lua (diff) | data/gui/scripts/KeyBindMenu.lua |
| /code/trunk/src/modules/overlays/CMakeLists.txt (diff) | src/modules/overlays/CMakeLists.txt |
| /code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (diff) | src/modules/overlays/hud/HUDPickupSystem.cc |
| /code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (diff) | src/modules/overlays/hud/HUDPickupSystem.h |
| /code/trunk/src/modules/pickup/CMakeLists.txt (diff) | src/modules/pickup/CMakeLists.txt |
| /code/trunk/src/modules/pickup/PickupManager.cc (diff) | src/modules/pickup/PickupManager.cc |
| /code/trunk/src/modules/pickup/PickupManager.h (diff) | src/modules/pickup/PickupManager.h |
| /code/trunk/src/orxonox/CMakeLists.txt (diff) | src/orxonox/CMakeLists.txt |
| /code/trunk/src/orxonox/interfaces/Pickupable.h (diff) | src/orxonox/interfaces/Pickupable.h |