widelands

Merge lp://staging/~widelands-dev/widelands/hotspot_fixes into lp://staging/widelands

  1. hotspot_fixes
  2. Merge into trunk
Proposed by kaputtnik
Status: Merged
Merged at revision: 8215
Proposed branch: lp://staging/~widelands-dev/widelands/hotspot_fixes
Merge into: lp://staging/widelands
Diff against target: 40 lines (+5/-3)
3 files modified
data/tribes/buildings/militarysites/atlanteans/tower/init.lua (+1/-1)
data/tribes/buildings/militarysites/atlanteans/tower_high/init.lua (+1/-1)
src/wui/field_overlay_manager.cc (+3/-1)
To merge this branch: bzr merge lp://staging/~widelands-dev/widelands/hotspot_fixes
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+312896@code.staging.launchpad.net

Commit message

Revert the changes introduced with bzr 8205 causing the hotspot of the flag in buildhelp get centered.

Additionally adapted the hotspot of atlantean tower and hightower.

Description of the change

Revert the changes introduced with bzr 8205 causing the hotspot of the flag in buildhelp get centered.

Additionally adapted the hotspot of atlantean tower and hightower.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

Code LGTM, just 1 nit. Not tested.

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 1744. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/182609661.
Appveyor build 1584. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_hotspot_fixes-1584.

Revision history for this message
kaputtnik (franku) wrote :

I think is good to go.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: