Revision
11704
by Fabian Landau:
[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 | data/defaultConfig/keybindings.ini |
 | /code/trunk/data/gui/scripts/KeyBindMenu.lua | data/gui/scripts/KeyBindMenu.lua |
 | /code/trunk/src/modules/overlays/CMakeLists.txt | src/modules/overlays/CMakeLists.txt |
 | /code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc | src/modules/overlays/hud/HUDPickupSystem.cc |
 | /code/trunk/src/modules/overlays/hud/HUDPickupSystem.h | src/modules/overlays/hud/HUDPickupSystem.h |
 | /code/trunk/src/modules/pickup/CMakeLists.txt | src/modules/pickup/CMakeLists.txt |
 | /code/trunk/src/modules/pickup/PickupManager.cc | src/modules/pickup/PickupManager.cc |
 | /code/trunk/src/modules/pickup/PickupManager.h | src/modules/pickup/PickupManager.h |
 | /code/trunk/src/orxonox/CMakeLists.txt | src/orxonox/CMakeLists.txt |
 | /code/trunk/src/orxonox/interfaces/Pickupable.h | src/orxonox/interfaces/Pickupable.h |
Revision
11703
by Fabian Landau:
[HUD_HS16] fixed bug with the position of the hud pickup items |
Change Type | Path in Repository | Path in Workspace |
---|
 | /code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc | src/modules/overlays/hud/HUDPickupSystem.cc |
|
Change Type | Path in Repository | Path in Workspace |
---|
 | /code/trunk/src/modules/overlays/hud/HUDPickupItem.cc | src/modules/overlays/hud/HUDPickupItem.cc |
 | /code/trunk/src/modules/overlays/hud/HUDPickupItem.h | src/modules/overlays/hud/HUDPickupItem.h |
 | /code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc | src/modules/overlays/hud/HUDPickupSystem.cc |
 | /code/trunk/src/modules/overlays/hud/HUDPickupSystem.h | src/modules/overlays/hud/HUDPickupSystem.h |
|
Change Type | Path in Repository | Path in Workspace |
---|
 | /code/trunk/src/modules/overlays/hud/HUDPickupItem.cc | src/modules/overlays/hud/HUDPickupItem.cc |
 | /code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc | src/modules/overlays/hud/HUDPickupSystem.cc |
 | /code/trunk/src/modules/pickup/PickupManager.cc | src/modules/pickup/PickupManager.cc |
 | /code/trunk/src/orxonox/interfaces/Pickupable.cc | src/orxonox/interfaces/Pickupable.cc |
Revision
11700
by Fabian Landau:
merged the remaining commits of HUD_HS16 branch back to trunk (except commit r11392 which added DDDialogue that seems to be just a test) |
Change Type | Path in Repository | Path in Workspace |
---|
 | /code/trunk | . |
 | /code/trunk/src/modules/overlays/hud/HUDPickupItem.cc | src/modules/overlays/hud/HUDPickupItem.cc |
 | /code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc | src/modules/overlays/hud/HUDPickupSystem.cc |
 | /code/trunk/src/modules/overlays/hud/HUDPickupSystem.h | src/modules/overlays/hud/HUDPickupSystem.h |
 | /code/trunk/src/modules/pickup/PickupManager.cc | src/modules/pickup/PickupManager.cc |
 | /code/trunk/src/orxonox/interfaces/Pickupable.cc | src/orxonox/interfaces/Pickupable.cc |