Merge lp://staging/~widelands-dev/widelands/bug-794407-soldier-stats into lp://staging/widelands
Proposed by
GunChleoc
| Status: | Work in progress | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~widelands-dev/widelands/bug-794407-soldier-stats | ||||||||
| Merge into: | lp://staging/widelands | ||||||||
| Diff against target: |
1629 lines (+365/-340) 40 files modified
data/tribes/scripting/help/controls.lua (+2/-0) src/economy/flag.cc (+1/-1) src/economy/flag.h (+2/-2) src/economy/portdock.h (+6/-2) src/economy/road.h (+6/-2) src/editor/editorinteractive.cc (+2/-11) src/logic/map_objects/CMakeLists.txt (+1/-1) src/logic/map_objects/bob.cc (+1/-1) src/logic/map_objects/bob.h (+2/-2) src/logic/map_objects/draw_text.h (+0/-44) src/logic/map_objects/immovable.cc (+5/-5) src/logic/map_objects/immovable.h (+5/-5) src/logic/map_objects/info_to_draw.h (+34/-0) src/logic/map_objects/map_object.cc (+11/-6) src/logic/map_objects/map_object.h (+2/-2) src/logic/map_objects/tribes/building.cc (+5/-7) src/logic/map_objects/tribes/building.h (+2/-2) src/logic/map_objects/tribes/constructionsite.cc (+2/-2) src/logic/map_objects/tribes/constructionsite.h (+1/-1) src/logic/map_objects/tribes/dismantlesite.cc (+2/-2) src/logic/map_objects/tribes/dismantlesite.h (+1/-1) src/logic/map_objects/tribes/productionsite.cc (+24/-10) src/logic/map_objects/tribes/ship.cc (+4/-4) src/logic/map_objects/tribes/ship.h (+1/-1) src/logic/map_objects/tribes/soldier.cc (+111/-101) src/logic/map_objects/tribes/soldier.h (+6/-5) src/logic/map_objects/tribes/worker.cc (+1/-1) src/logic/map_objects/tribes/worker.h (+1/-1) src/network/gameclient.cc (+3/-4) src/network/gamehost.cc (+2/-3) src/wui/attack_box.cc (+1/-1) src/wui/interactive_base.cc (+18/-8) src/wui/interactive_base.h (+6/-4) src/wui/interactive_gamebase.cc (+47/-12) src/wui/interactive_gamebase.h (+8/-7) src/wui/interactive_player.cc (+20/-43) src/wui/interactive_player.h (+2/-2) src/wui/interactive_spectator.cc (+9/-27) src/wui/interactive_spectator.h (+4/-3) src/wui/soldierlist.cc (+4/-4) |
||||||||
| To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/bug-794407-soldier-stats | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Widelands Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Improve soldier level graphics and chat menu code
- Improve visibility of health bar graphs
- Add toggle for soldier level/health bar graphics
- Indicate in building statistics whether workers are on their way
- Small refactoring for chat menu code
To post a comment you must log in.
Revision history for this message
| bunnybot (widelandsofficial) wrote | # |
Revision history for this message
| bunnybot (widelandsofficial) wrote | # |
Revision history for this message
| GunChleoc (gunchleoc) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Continuous integration builds have changed state:
Travis build 5354. State: failed. Details: https:/
Appveyor build 5124. State: success. Details: https:/