Context Navigation

← Previous Change
Next Change →

ReplenishingMunition.cc

Timestamp:

Dec 9, 2015, 2:45:58 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and fabiens branch. Had to modify hoverHUD and invaderHUD, because the text of the healthbar wasn't correctly displayed and the weapon settings of the hovership.

Location:

code/branches/presentationHS15

Files:

: 1 edited
: 1 copied

. (modified) (1 prop)
src/orxonox/weaponsystem/ReplenishingMunition.cc (copied) (copied from code/branches/fabienHS15/src/orxonox/weaponsystem/ReplenishingMunition.cc)

code/branches/presentationHS15
- Property svn:mergeinfo changed
  /code/branches/fabienHS15 (added) merged: 10685,10688,10692,10713-10715,10721,10724,10739,10746,10791,10794-10795,10814,10842,10878

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats:

Unified Diff
Zip Archive