lp:~widelands-dev/widelands/amazons-coding-changes
Created by
Benedikt Straub
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- GunChleoc: Approve
- hessenfarmer: Approve (test)
-
Diff: 4790 lines (+888/-568)92 files modifieddata/world/terrains/init.lua (+64/-1)
src/ai/ai_help_structs.cc (+13/-13)
src/ai/ai_help_structs.h (+12/-12)
src/ai/defaultai.cc (+26/-26)
src/ai/defaultai_seafaring.cc (+1/-1)
src/ai/defaultai_warfare.cc (+2/-2)
src/editor/editorinteractive.cc (+8/-8)
src/editor/map_generator.cc (+2/-2)
src/editor/tools/decrease_height_tool.cc (+6/-9)
src/editor/tools/decrease_height_tool.h (+2/-4)
src/editor/tools/decrease_resources_tool.cc (+5/-6)
src/editor/tools/decrease_resources_tool.h (+2/-4)
src/editor/tools/delete_critter_tool.cc (+3/-6)
src/editor/tools/delete_critter_tool.h (+2/-4)
src/editor/tools/delete_immovable_tool.cc (+4/-7)
src/editor/tools/delete_immovable_tool.h (+2/-4)
src/editor/tools/draw_tool.cc (+4/-6)
src/editor/tools/draw_tool.h (+2/-4)
src/editor/tools/history.cc (+5/-6)
src/editor/tools/history.h (+2/-3)
src/editor/tools/increase_height_tool.cc (+5/-7)
src/editor/tools/increase_height_tool.h (+2/-4)
src/editor/tools/increase_resources_tool.cc (+5/-5)
src/editor/tools/increase_resources_tool.h (+2/-4)
src/editor/tools/info_tool.cc (+4/-4)
src/editor/tools/info_tool.h (+1/-2)
src/editor/tools/noise_height_tool.cc (+5/-7)
src/editor/tools/noise_height_tool.h (+2/-4)
src/editor/tools/place_critter_tool.cc (+7/-9)
src/editor/tools/place_critter_tool.h (+2/-4)
src/editor/tools/place_immovable_tool.cc (+5/-7)
src/editor/tools/place_immovable_tool.h (+2/-4)
src/editor/tools/resize_tool.cc (+9/-14)
src/editor/tools/resize_tool.h (+2/-4)
src/editor/tools/set_height_tool.cc (+6/-8)
src/editor/tools/set_height_tool.h (+2/-4)
src/editor/tools/set_origin_tool.cc (+2/-4)
src/editor/tools/set_origin_tool.h (+2/-4)
src/editor/tools/set_port_space_tool.cc (+12/-16)
src/editor/tools/set_port_space_tool.h (+4/-8)
src/editor/tools/set_resources_tool.cc (+6/-6)
src/editor/tools/set_resources_tool.h (+2/-4)
src/editor/tools/set_starting_pos_tool.cc (+1/-2)
src/editor/tools/set_starting_pos_tool.h (+1/-2)
src/editor/tools/set_terrain_tool.cc (+6/-8)
src/editor/tools/set_terrain_tool.h (+2/-4)
src/editor/tools/tool.h (+4/-9)
src/editor/ui_menus/main_menu_new_map.cc (+2/-2)
src/editor/ui_menus/main_menu_random_map.cc (+2/-2)
src/editor/ui_menus/main_menu_save_map.cc (+1/-1)
src/logic/editor_game_base.cc (+9/-7)
src/logic/editor_game_base.h (+3/-3)
src/logic/map.cc (+71/-69)
src/logic/map.h (+29/-29)
src/logic/map_objects/bob.cc (+2/-2)
src/logic/map_objects/findnode.cc (+28/-11)
src/logic/map_objects/findnode.h (+19/-12)
src/logic/map_objects/immovable.cc (+2/-2)
src/logic/map_objects/tribes/building.cc (+74/-5)
src/logic/map_objects/tribes/building.h (+13/-4)
src/logic/map_objects/tribes/constructionsite.cc (+23/-11)
src/logic/map_objects/tribes/dismantlesite.cc (+37/-9)
src/logic/map_objects/tribes/dismantlesite.h (+3/-1)
src/logic/map_objects/tribes/militarysite.cc (+3/-3)
src/logic/map_objects/tribes/production_program.cc (+3/-3)
src/logic/map_objects/tribes/ship.cc (+5/-5)
src/logic/map_objects/tribes/soldier.cc (+7/-7)
src/logic/map_objects/tribes/warehouse.cc (+1/-1)
src/logic/map_objects/tribes/worker.cc (+64/-13)
src/logic/map_objects/tribes/worker.h (+2/-0)
src/logic/map_objects/tribes/worker_program.cc (+34/-2)
src/logic/map_objects/tribes/worker_program.h (+1/-0)
src/logic/map_objects/world/terrain_description.cc (+14/-0)
src/logic/map_objects/world/terrain_description.h (+4/-0)
src/logic/map_objects/world/world.cc (+20/-0)
src/logic/map_objects/world/world.h (+3/-0)
src/logic/player.cc (+45/-22)
src/logic/player.h (+4/-4)
src/logic/playercommand.cc (+1/-1)
src/map_io/map_bob_packet.cc (+1/-1)
src/map_io/map_building_packet.cc (+1/-1)
src/map_io/map_buildingdata_packet.cc (+18/-8)
src/map_io/map_port_spaces_packet.cc (+1/-1)
src/map_io/s2map.cc (+8/-8)
src/map_io/s2map.h (+1/-1)
src/map_io/widelands_map_loader.cc (+1/-1)
src/scripting/lua_bases.cc (+1/-1)
src/scripting/lua_map.cc (+7/-9)
src/wui/fieldaction.cc (+46/-16)
src/wui/game_debug_ui.cc (+1/-1)
src/wui/interactive_gamebase.cc (+2/-2)
src/wui/watchwindow.cc (+1/-1)
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