![[Jenkins]](/jenkins/static/d90b65e2/images/jenkins-header-logo-v2.svg){kind=logo}
Changes
Summary
- [HUD_HS16] updated HUDPickupSystem also in HUDTemplatesFPS.oxo
- fixed two bugs in PickupInventory.lua: - the update function had a messed up logic regarding the use-button in the detail window (condition was partially inverted) - updating the event subscription of the use-button in the detail-window doesn't seem to work - probably CEGUI doesn't like updating/changing/overriding an event while begin IN a mouse-click-event already. moving the logic to the Use/Unuse-function instead seems to work.
- [HUD_HS16] removed unused function
- [HUD_HS16] fixed issue that the hud shows pickups of ALL players/bots instead of just the own spaceship. fixed this by comparing objectIDs note: network calls currently support only 5 arguments, so I removed representationObjectId which doesn't seem to be used (neither in C++ nor in Lua)
- fixed nullptr access when two pawns trigger a pickup-spawner at the same time (for the second pawn in the list, the pickup is already nullptr -> crash)
- [HUD_HS16] pickups are now always shown in hud, but much smaller. removed HUDPickupTemplate.oxo
- [HUD_HS16] removed HUDPickupItem as it is not really necessary (it's just an ogre overlay). also fixed several memory-leaks and some issues with positioning and visibility of the pickup items
| Change Type | Path in Repository | Path in Workspace |
|---|---|---|
 | /code/trunk/data/overlays/HUDTemplatesFPS.oxo | data/overlays/HUDTemplatesFPS.oxo |
| Change Type | Path in Repository | Path in Workspace |
| /code/trunk/data/gui/scripts/PickupInventory.lua | data/gui/scripts/PickupInventory.lua |
| Change Type | Path in Repository | Path in Workspace |
| /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/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/modules/pickup/PickupManager.h | src/modules/pickup/PickupManager.h |
| /code/trunk/src/modules/pickup/PickupPrereqs.h | src/modules/pickup/PickupPrereqs.h |
| /code/trunk/src/orxonox/controllers/ActionpointController.h | src/orxonox/controllers/ActionpointController.h |
| Change Type | Path in Repository | Path in Workspace |
| /code/trunk/src/modules/pickup/PickupSpawner.cc | src/modules/pickup/PickupSpawner.cc |
| Change Type | Path in Repository | Path in Workspace |
| /code/trunk/data/levels/pickups.oxw | data/levels/pickups.oxw |
 | /code/trunk/data/overlays/HUDPickupTemplate.oxo | data/overlays/HUDPickupTemplate.oxo |
| /code/trunk/data/overlays/HUDTemplates3.oxo | data/overlays/HUDTemplates3.oxo |
| Change Type | Path in Repository | Path in Workspace |
| /code/trunk/data/overlays/HUDPickupTemplate.oxo | data/overlays/HUDPickupTemplate.oxo |
| /code/trunk/data/overlays/HUDTemplates3.oxo | data/overlays/HUDTemplates3.oxo |
| /code/trunk/src/modules/overlays/OverlaysPrereqs.h | src/modules/overlays/OverlaysPrereqs.h |
| /code/trunk/src/modules/overlays/hud/CMakeLists.txt | src/modules/overlays/hud/CMakeLists.txt |
| /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 |