lp:~widelands-dev/widelands/fix_resource_overlay
Created by
SirVer
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- GunChleoc: Approve
- kaputtnik (community): Approve (correct functionality)
-
Diff: 2964 lines (+639/-590)60 files modifiedsrc/editor/CMakeLists.txt (+2/-1)
src/editor/editorinteractive.cc (+150/-101)
src/editor/editorinteractive.h (+82/-60)
src/editor/map_generator.cc (+1/-2)
src/editor/tools/editor_action_args.h (+1/-1)
src/editor/tools/editor_decrease_resources_tool.cc (+3/-4)
src/editor/tools/editor_delete_bob_tool.cc (+1/-1)
src/editor/tools/editor_delete_immovable_tool.cc (+1/-1)
src/editor/tools/editor_history.cc (+0/-9)
src/editor/tools/editor_history.h (+1/-8)
src/editor/tools/editor_increase_resources_tool.cc (+2/-3)
src/editor/tools/editor_set_origin_tool.cc (+6/-6)
src/editor/tools/editor_set_port_space_tool.cc (+2/-2)
src/editor/tools/editor_set_resources_tool.cc (+4/-38)
src/editor/tools/editor_set_resources_tool.h (+0/-11)
src/editor/tools/editor_tool.h (+1/-1)
src/editor/tools/editor_tool_action.h (+1/-1)
src/editor/ui_menus/editor_main_menu.h (+1/-1)
src/editor/ui_menus/editor_main_menu_load_map.cc (+1/-3)
src/editor/ui_menus/editor_main_menu_map_options.h (+1/-1)
src/editor/ui_menus/editor_main_menu_new_map.cc (+1/-5)
src/editor/ui_menus/editor_main_menu_new_map.h (+1/-1)
src/editor/ui_menus/editor_main_menu_random_map.cc (+1/-6)
src/editor/ui_menus/editor_main_menu_random_map.h (+1/-1)
src/editor/ui_menus/editor_player_menu.cc (+6/-6)
src/editor/ui_menus/editor_player_menu.h (+1/-1)
src/editor/ui_menus/editor_tool_change_height_options_menu.h (+1/-1)
src/editor/ui_menus/editor_tool_change_resources_options_menu.cc (+2/-2)
src/editor/ui_menus/editor_tool_change_resources_options_menu.h (+1/-1)
src/editor/ui_menus/editor_tool_menu.cc (+34/-34)
src/editor/ui_menus/editor_tool_menu.h (+1/-1)
src/editor/ui_menus/editor_tool_noise_height_options_menu.h (+1/-1)
src/editor/ui_menus/editor_tool_options_menu.cc (+1/-1)
src/editor/ui_menus/editor_tool_place_immovable_options_menu.h (+1/-1)
src/editor/ui_menus/editor_tool_set_terrain_options_menu.h (+1/-1)
src/editor/ui_menus/editor_toolsize_menu.cc (+1/-1)
src/editor/ui_menus/editor_toolsize_menu.h (+1/-1)
src/logic/field.h (+1/-9)
src/logic/map.cc (+55/-19)
src/logic/map.h (+24/-6)
src/logic/map_objects/tribes/production_program.cc (+1/-2)
src/logic/map_objects/tribes/worker.cc (+2/-4)
src/logic/player.cc (+3/-3)
src/logic/player.h (+2/-1)
src/map_io/map_resources_packet.cc (+3/-2)
src/map_io/s2map.cc (+11/-11)
src/notifications/note_ids.h (+2/-1)
src/scripting/lua_map.cc (+14/-11)
src/ui_basic/panel.h (+2/-1)
src/wui/field_overlay_manager.cc (+6/-0)
src/wui/field_overlay_manager.h (+4/-0)
src/wui/fieldaction.cc (+3/-4)
src/wui/interactive_base.cc (+116/-124)
src/wui/interactive_base.h (+35/-35)
src/wui/interactive_gamebase.cc (+4/-4)
src/wui/interactive_gamebase.h (+1/-1)
src/wui/interactive_player.cc (+13/-13)
src/wui/interactive_spectator.cc (+12/-12)
test/maps/lua_testsuite.wmf/scripting/efield.lua (+1/-1)
test/maps/lua_testsuite.wmf/scripting/gfield.lua (+7/-6)
Related source package recipes
Related bugs
| Bug #977980: Fish and mountain ressources cannot be removed when they are on grass | Medium | Fix Released |
|
| Bug #1521736: editor does not clean up memory (?) when loading another map | Undecided | Fix Released |
|
| Bug #1534209: Crash: "Set origin" add resources to uncommon terrain | Undecided | Fix Released |
|
Related blueprints
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
