SuccessChanges

Summary

  1. 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 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 (diff).
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupItem.cc (diff)src/modules/overlays/hud/HUDPickupItem.cc
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.cc (diff)src/modules/overlays/hud/HUDPickupSystem.cc
The file was modified/code/trunk/src/modules/overlays/hud/HUDPickupSystem.h (diff)src/modules/overlays/hud/HUDPickupSystem.h
The file was modified/code/trunk/src/modules/pickup/PickupManager.cc (diff)src/modules/pickup/PickupManager.cc
The file was modified/code/trunk/src/orxonox/interfaces/Pickupable.cc (diff)src/orxonox/interfaces/Pickupable.cc