Changes
Summary
- 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 (diff) | . | |
/code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (diff) | src/modules/overlays/hud/HUDPickupItem.cc | |
/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/PickupManager.cc (diff) | src/modules/pickup/PickupManager.cc | |
/code/trunk/src/orxonox/interfaces/Pickupable.cc (diff) | src/orxonox/interfaces/Pickupable.cc |