Created by GunChleoc on 2017-08-16 and last modified on 2019-09-16
Get this branch:
bzr branch lp:~widelands-dev/widelands/make_pair
Members of Widelands Developers can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Widelands Developers

Recent revisions

8423. By GunChleoc on 2019-09-08

Merged trunk.

8422. By GunChleoc on 2018-02-27

Merged trunk.

8421. By GunChleoc on 2017-08-16

Replaced std::pair<x, y> with std::make_pair/auto.

8420. By Wideland's Bunnybot <email address hidden> on 2017-08-15

Merged lp:~widelands-dev/widelands/buildhelp_overlay:
Simplify FieldOverlayManager.

- Remove ability to put Overlays on Triangles (which was unused).
- Simplify some functions.
- Replace numeric overlay levels by an enum class.

8419. By Wideland's Bunnybot <email address hidden> on 2017-08-12

Merged lp:~widelands-dev/widelands/kill_edge_overlay:
Remove the ill named EdgeOverlayManager.

It only dealt with road previews while in road building mode. This data is now
passed into the GameRenderer directly instead of being side loaded through

- Replace Coords::ordering_functor through operator<.
- Fixed some warnings in ai headers that were disturbing while working.

8418. By Wideland's Bunnybot <email address hidden> on 2017-08-12

Merged lp:~widelands-dev/widelands/bug-986611-cppcheck-minimal:
Various small codestyle fixes flagged up by cppcheck.

8417. By Wideland's Bunnybot <email address hidden> on 2017-08-11

Merged lp:~widelands-dev/widelands/travis-osx:
Let travis build each commit on macos in addition to our linux builds.

Note that the regression test suite is only run for linux (couldn't get it to work on macos), though everything else builds and works as expected.

8416. By GunChleoc on 2017-08-11

Fetched translations and updated catalogues.

8415. By Wideland's Bunnybot <email address hidden> on 2017-08-09

Merged lp:~widelands-dev/widelands/doc_type_name:
Fixed and improved documentation for LuaMapObjectDescription::get_type_name. More cross-linking between map object classes and their description objects. Fixed some miscellaneous bugs in the LuaMap documentation.

8414. By Wideland's Bunnybot <email address hidden> on 2017-08-08

Merged lp:~widelands-dev/widelands/bug-1697242-fileview:
Fixed assert failure with sizes in FileViewPanel::layout() and TabPanel. Also, simplified the TabPanel constructor.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.