lp:~weedfreak/widelands/Innkeeper_upgrade

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:widelands

hessenfarmer: Needs Information on 2018-01-25

TiborB: Approve on 2018-01-20

Diff: 1184 lines (+79/-14)

12 files modified

data/tribes/barbarians.lua (+1/-0)
data/tribes/buildings/productionsites/barbarians/big_inn/init.lua (+2/-1)
data/tribes/buildings/productionsites/barbarians/tavern/init.lua (+1/-1)
data/tribes/buildings/productionsites/empire/tavern/init.lua (+1/-1)
data/tribes/empire.lua (+1/-0)
data/tribes/init.lua (+2/-0)
data/tribes/workers/barbarians/innkeeper/init.lua (+1/-6)
data/tribes/workers/barbarians/taverner/helptexts.lua (+4/-0)
data/tribes/workers/barbarians/taverner/init.lua (+31/-0)
data/tribes/workers/empire/innkeeper/init.lua (+0/-5)
data/tribes/workers/empire/taverner/helptexts.lua (+4/-0)
data/tribes/workers/empire/taverner/init.lua (+31/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

8557. By R M on 2018-02-20

Merged with trunk

8556. By R M on 2018-01-15

Feature added: taverners

8555. By R M on 2018-01-14

Feature added: taverners

8554. By Wideland's Bunnybot <email address hidden> on 2018-01-10

Merged lp:~widelands-dev/widelands/bug-1738054-random-battle-animations:
Added missing call to get_rand_anim when a soldier is dying. Also, removed some code duplication and programming by exception.

8553. By GunChleoc on 2018-01-10

Fetched translations and updated catalogues.

8552. By Wideland's Bunnybot <email address hidden> on 2018-01-07

Merged lp:~widelands-dev/widelands/fh1-scenario-groundwork-emp1:
Started converting scenarios to new font renderer

- Story Message Box and Objectives now try to use the new font renderer before falling back to the old one.
- Added version of scenario formatting for the new renderer.
- Converted Empire Scenario 1 to new font renderer
- Atlantean campaign now uses the campaign_message_box function.

8551. By kaputtnik on 2018-01-06

modified fsel graphics and wui fieldaction graphics; fixes bug 1731523

8550. By Wideland's Bunnybot <email address hidden> on 2018-01-05

Merged lp:~widelands-dev/widelands/fh1-finish_help:
Converted the Tribal Encyclopedia to the new font renderer and added some tweaks:

- Added market building type
- Removed markup from some help texts
- Pulled out common function help_worker_experience

8549. By GunChleoc on 2018-01-04

Fetched translations and updated catalogues.

8548. By Wideland's Bunnybot <email address hidden> on 2017-12-31

Merged lp:~widelands-dev/widelands/fix-bug-1735980-related-problems:
Fix heap use after free bug, and avoid immovables ending up in wrong positions when pressing undo/redo in editor