lp:~widelands-dev/widelands/bug-1332627
Created by
GunChleoc
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- SirVer: Needs Fixing
-
Diff: 1173 lines (+164/-79) (has conflicts)39 files modifiedcmake/codecheck/rules/do_not_use_BOOST_noncopyable (+18/-0)
src/ai/ai_hints.h (+7/-1)
src/ai/computer_player.h (+2/-3)
src/base/macros.h (+6/-0)
src/base/scoped_timer.h (+4/-2)
src/economy/economy.h (+3/-2)
src/economy/itransport_cost_calculator.h (+4/-3)
src/editor/tools/editor_tool.h (+4/-3)
src/graphic/animation.cc (+3/-1)
src/graphic/animation.h (+4/-1)
src/graphic/font_handler1.h (+6/-4)
src/graphic/image.h (+5/-2)
src/graphic/image_cache.h (+3/-1)
src/graphic/render/gamerenderer.h (+3/-1)
src/graphic/surface.h (+5/-3)
src/graphic/surface_cache.h (+5/-1)
src/io/filesystem/filesystem.h (+0/-1)
src/io/streamread.h (+4/-3)
src/io/streamwrite.h (+3/-3)
src/logic/cookie_priority_queue.h (+4/-2)
src/logic/editor_game_base.h (+2/-3)
src/logic/expedition_bootstrap.h (+3/-3)
src/logic/immovable_program.h (+5/-2)
src/logic/instances.h (+8/-4)
src/logic/message_queue.h (+4/-3)
src/logic/player.h (+5/-2)
src/logic/production_program.h (+5/-2)
src/logic/terrain_affinity.h (+4/-3)
src/logic/tribe.h (+4/-1)
src/logic/world/editor_category.h (+3/-2)
src/logic/world/resource_description.h (+4/-3)
src/logic/world/terrain_description.h (+4/-3)
src/logic/world/world.h (+4/-1)
src/map_io/one_world_legacy_lookup_table.h (+5/-2)
src/map_io/s2map.cc (+3/-1)
src/map_io/s2map.h (+1/-0)
src/profile/profile.h (+3/-3)
src/ui_basic/panel.h (+4/-2)
src/ui_basic/unique_window.h (+0/-2)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:widelands