UnstableChanges

Summary

  1. [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
  2. [HUD_HS16] fixed bug with the position of the hud pickup items
  3. [HUD_HS16] removed a lot of unused stuff
  4. [HUD_HS16] removed debug output
  5. merged the remaining commits of HUD_HS16 branch back to trunk (except commit r11392 which added DDDialogue that seems to be just a test)
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 TypePath in RepositoryPath in Workspace
The file was modified/code/trunk/data/defaultConfig/keybindings.inidata/defaultConfig/keybindings.ini
The file was modified/code/trunk/data/gui/scripts/KeyBindMenu.luadata/gui/scripts/KeyBindMenu.lua
The file was modified/code/trunk/src/modules/overlays/CMakeLists.txtsrc/modules/overlays/CMakeLists.txt
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.ccsrc/modules/overlays/hud/HUDPickupSystem.cc
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.hsrc/modules/overlays/hud/HUDPickupSystem.h
The file was modified/code/trunk/src/modules/pickup/CMakeLists.txtsrc/modules/pickup/CMakeLists.txt
The file was modified/code/trunk/src/modules/pickup/PickupManager.ccsrc/modules/pickup/PickupManager.cc
The file was modified/code/trunk/src/modules/pickup/PickupManager.hsrc/modules/pickup/PickupManager.h
The file was modified/code/trunk/src/orxonox/CMakeLists.txtsrc/orxonox/CMakeLists.txt
The file was modified/code/trunk/src/orxonox/interfaces/Pickupable.hsrc/orxonox/interfaces/Pickupable.h
Revision 11703 by Fabian Landau:
[HUD_HS16] fixed bug with the position of the hud pickup items
Change TypePath in RepositoryPath in Workspace
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.ccsrc/modules/overlays/hud/HUDPickupSystem.cc
Revision 11702 by Fabian Landau:
[HUD_HS16] removed a lot of unused stuff
Change TypePath in RepositoryPath in Workspace
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupItem.ccsrc/modules/overlays/hud/HUDPickupItem.cc
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupItem.hsrc/modules/overlays/hud/HUDPickupItem.h
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.ccsrc/modules/overlays/hud/HUDPickupSystem.cc
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.hsrc/modules/overlays/hud/HUDPickupSystem.h
Revision 11701 by Fabian Landau:
[HUD_HS16] removed debug output
Change TypePath in RepositoryPath in Workspace
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupItem.ccsrc/modules/overlays/hud/HUDPickupItem.cc
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.ccsrc/modules/overlays/hud/HUDPickupSystem.cc
The file was modified/code/trunk/src/modules/pickup/PickupManager.ccsrc/modules/pickup/PickupManager.cc
The file was modified/code/trunk/src/orxonox/interfaces/Pickupable.ccsrc/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 TypePath in RepositoryPath in Workspace
The file was modified/code/trunk.
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupItem.ccsrc/modules/overlays/hud/HUDPickupItem.cc
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.ccsrc/modules/overlays/hud/HUDPickupSystem.cc
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.hsrc/modules/overlays/hud/HUDPickupSystem.h
The file was modified/code/trunk/src/modules/pickup/PickupManager.ccsrc/modules/pickup/PickupManager.cc
The file was modified/code/trunk/src/orxonox/interfaces/Pickupable.ccsrc/orxonox/interfaces/Pickupable.cc