« back to all changes in this revision
Viewing changes to data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_2.png
- Committer: GunChleoc
- Date: 2019-04-25 06:55:09 UTC
- mfrom: (8729.1.350 _widelands_dev_widelands_trunk)
- Revision ID: fios@foramnagaidhlig.net-20190425065509-8ucj22s53w06ss4n
Merged trunk.
- files added:
- data/images/ui_fsmenu/easy.png
- files removed:
- data/images/wui/overlays/workarea1.png
- files renamed:
- data/campaigns/campaigns.conf => data/campaigns/campaigns.lua
- data/campaigns/tutorials.conf => data/campaigns/tutorials.lua
- data/images/ui_fsmenu/hard.png => data/images/ui_fsmenu/challenging.png
- data/images/ui_fsmenu/challenging.png => data/images/ui_fsmenu/hard.png
- data/images/ui_fsmenu/easy.png => data/images/ui_fsmenu/medium.png
- data/images/wui/overlays/workarea123.png => data/images/wui/buildings/toggle_workarea.png
- data/tribes/buildings/productionsites/barbarians/shipyard/working_00.png => data/tribes/buildings/productionsites/barbarians/shipyard/working_1_00.png
- data/tribes/buildings/productionsites/barbarians/shipyard/working_00_pc.png => data/tribes/buildings/productionsites/barbarians/shipyard/working_1_00_pc.png
- data/tribes/buildings/warehouses/barbarians/warehouse/idle_00.png => data/tribes/buildings/warehouses/barbarians/warehouse/idle_1_00.png
- data/tribes/buildings/warehouses/barbarians/warehouse/idle_00_pc.png => data/tribes/buildings/warehouses/barbarians/warehouse/idle_1_00_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_00.png => data/tribes/workers/barbarians/recruit/walk_e_1_00.png
- data/tribes/workers/barbarians/recruit/walk_e_00_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_00_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_01.png => data/tribes/workers/barbarians/recruit/walk_e_1_01.png
- data/tribes/workers/barbarians/recruit/walk_e_01_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_01_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_02.png => data/tribes/workers/barbarians/recruit/walk_e_1_02.png
- data/tribes/workers/barbarians/recruit/walk_e_02_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_02_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_03.png => data/tribes/workers/barbarians/recruit/walk_e_1_03.png
- data/tribes/workers/barbarians/recruit/walk_e_03_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_03_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_04.png => data/tribes/workers/barbarians/recruit/walk_e_1_04.png
- data/tribes/workers/barbarians/recruit/walk_e_04_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_04_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_05.png => data/tribes/workers/barbarians/recruit/walk_e_1_05.png
- data/tribes/workers/barbarians/recruit/walk_e_05_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_05_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_06.png => data/tribes/workers/barbarians/recruit/walk_e_1_06.png
- data/tribes/workers/barbarians/recruit/walk_e_06_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_06_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_07.png => data/tribes/workers/barbarians/recruit/walk_e_1_07.png
- data/tribes/workers/barbarians/recruit/walk_e_07_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_07_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_08.png => data/tribes/workers/barbarians/recruit/walk_e_1_08.png
- data/tribes/workers/barbarians/recruit/walk_e_08_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_08_pc.png
- data/tribes/workers/barbarians/recruit/walk_e_09.png => data/tribes/workers/barbarians/recruit/walk_e_1_09.png
- data/tribes/workers/barbarians/recruit/walk_e_09_pc.png => data/tribes/workers/barbarians/recruit/walk_e_1_09_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_00.png => data/tribes/workers/barbarians/recruit/walk_ne_1_00.png
- data/tribes/workers/barbarians/recruit/walk_ne_00_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_00_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_01.png => data/tribes/workers/barbarians/recruit/walk_ne_1_01.png
- data/tribes/workers/barbarians/recruit/walk_ne_01_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_01_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_02.png => data/tribes/workers/barbarians/recruit/walk_ne_1_02.png
- data/tribes/workers/barbarians/recruit/walk_ne_02_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_02_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_03.png => data/tribes/workers/barbarians/recruit/walk_ne_1_03.png
- data/tribes/workers/barbarians/recruit/walk_ne_03_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_03_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_04.png => data/tribes/workers/barbarians/recruit/walk_ne_1_04.png
- data/tribes/workers/barbarians/recruit/walk_ne_04_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_04_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_05.png => data/tribes/workers/barbarians/recruit/walk_ne_1_05.png
- data/tribes/workers/barbarians/recruit/walk_ne_05_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_05_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_06.png => data/tribes/workers/barbarians/recruit/walk_ne_1_06.png
- data/tribes/workers/barbarians/recruit/walk_ne_06_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_06_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_07.png => data/tribes/workers/barbarians/recruit/walk_ne_1_07.png
- data/tribes/workers/barbarians/recruit/walk_ne_07_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_07_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_08.png => data/tribes/workers/barbarians/recruit/walk_ne_1_08.png
- data/tribes/workers/barbarians/recruit/walk_ne_08_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_08_pc.png
- data/tribes/workers/barbarians/recruit/walk_ne_09.png => data/tribes/workers/barbarians/recruit/walk_ne_1_09.png
- data/tribes/workers/barbarians/recruit/walk_ne_09_pc.png => data/tribes/workers/barbarians/recruit/walk_ne_1_09_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_00.png => data/tribes/workers/barbarians/recruit/walk_nw_1_00.png
- data/tribes/workers/barbarians/recruit/walk_nw_00_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_00_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_01.png => data/tribes/workers/barbarians/recruit/walk_nw_1_01.png
- data/tribes/workers/barbarians/recruit/walk_nw_01_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_01_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_02.png => data/tribes/workers/barbarians/recruit/walk_nw_1_02.png
- data/tribes/workers/barbarians/recruit/walk_nw_02_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_02_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_03.png => data/tribes/workers/barbarians/recruit/walk_nw_1_03.png
- data/tribes/workers/barbarians/recruit/walk_nw_03_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_03_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_04.png => data/tribes/workers/barbarians/recruit/walk_nw_1_04.png
- data/tribes/workers/barbarians/recruit/walk_nw_04_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_04_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_05.png => data/tribes/workers/barbarians/recruit/walk_nw_1_05.png
- data/tribes/workers/barbarians/recruit/walk_nw_05_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_05_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_06.png => data/tribes/workers/barbarians/recruit/walk_nw_1_06.png
- data/tribes/workers/barbarians/recruit/walk_nw_06_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_06_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_07.png => data/tribes/workers/barbarians/recruit/walk_nw_1_07.png
- data/tribes/workers/barbarians/recruit/walk_nw_07_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_07_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_08.png => data/tribes/workers/barbarians/recruit/walk_nw_1_08.png
- data/tribes/workers/barbarians/recruit/walk_nw_08_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_08_pc.png
- data/tribes/workers/barbarians/recruit/walk_nw_09.png => data/tribes/workers/barbarians/recruit/walk_nw_1_09.png
- data/tribes/workers/barbarians/recruit/walk_nw_09_pc.png => data/tribes/workers/barbarians/recruit/walk_nw_1_09_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_00.png => data/tribes/workers/barbarians/recruit/walk_se_1_00.png
- data/tribes/workers/barbarians/recruit/walk_se_00_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_00_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_01.png => data/tribes/workers/barbarians/recruit/walk_se_1_01.png
- data/tribes/workers/barbarians/recruit/walk_se_01_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_01_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_02.png => data/tribes/workers/barbarians/recruit/walk_se_1_02.png
- data/tribes/workers/barbarians/recruit/walk_se_02_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_02_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_03.png => data/tribes/workers/barbarians/recruit/walk_se_1_03.png
- data/tribes/workers/barbarians/recruit/walk_se_03_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_03_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_04.png => data/tribes/workers/barbarians/recruit/walk_se_1_04.png
- data/tribes/workers/barbarians/recruit/walk_se_04_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_04_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_05.png => data/tribes/workers/barbarians/recruit/walk_se_1_05.png
- data/tribes/workers/barbarians/recruit/walk_se_05_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_05_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_06.png => data/tribes/workers/barbarians/recruit/walk_se_1_06.png
- data/tribes/workers/barbarians/recruit/walk_se_06_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_06_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_07.png => data/tribes/workers/barbarians/recruit/walk_se_1_07.png
- data/tribes/workers/barbarians/recruit/walk_se_07_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_07_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_08.png => data/tribes/workers/barbarians/recruit/walk_se_1_08.png
- data/tribes/workers/barbarians/recruit/walk_se_08_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_08_pc.png
- data/tribes/workers/barbarians/recruit/walk_se_09.png => data/tribes/workers/barbarians/recruit/walk_se_1_09.png
- data/tribes/workers/barbarians/recruit/walk_se_09_pc.png => data/tribes/workers/barbarians/recruit/walk_se_1_09_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_00.png => data/tribes/workers/barbarians/recruit/walk_sw_1_00.png
- data/tribes/workers/barbarians/recruit/walk_sw_00_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_00_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_01.png => data/tribes/workers/barbarians/recruit/walk_sw_1_01.png
- data/tribes/workers/barbarians/recruit/walk_sw_01_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_01_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_02.png => data/tribes/workers/barbarians/recruit/walk_sw_1_02.png
- data/tribes/workers/barbarians/recruit/walk_sw_02_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_02_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_03.png => data/tribes/workers/barbarians/recruit/walk_sw_1_03.png
- data/tribes/workers/barbarians/recruit/walk_sw_03_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_03_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_04.png => data/tribes/workers/barbarians/recruit/walk_sw_1_04.png
- data/tribes/workers/barbarians/recruit/walk_sw_04_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_04_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_05.png => data/tribes/workers/barbarians/recruit/walk_sw_1_05.png
- data/tribes/workers/barbarians/recruit/walk_sw_05_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_05_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_06.png => data/tribes/workers/barbarians/recruit/walk_sw_1_06.png
- data/tribes/workers/barbarians/recruit/walk_sw_06_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_06_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_07.png => data/tribes/workers/barbarians/recruit/walk_sw_1_07.png
- data/tribes/workers/barbarians/recruit/walk_sw_07_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_07_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_08.png => data/tribes/workers/barbarians/recruit/walk_sw_1_08.png
- data/tribes/workers/barbarians/recruit/walk_sw_08_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_08_pc.png
- data/tribes/workers/barbarians/recruit/walk_sw_09.png => data/tribes/workers/barbarians/recruit/walk_sw_1_09.png
- data/tribes/workers/barbarians/recruit/walk_sw_09_pc.png => data/tribes/workers/barbarians/recruit/walk_sw_1_09_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_00.png => data/tribes/workers/barbarians/recruit/walk_w_1_00.png
- data/tribes/workers/barbarians/recruit/walk_w_00_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_00_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_01.png => data/tribes/workers/barbarians/recruit/walk_w_1_01.png
- data/tribes/workers/barbarians/recruit/walk_w_01_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_01_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_02.png => data/tribes/workers/barbarians/recruit/walk_w_1_02.png
- data/tribes/workers/barbarians/recruit/walk_w_02_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_02_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_03.png => data/tribes/workers/barbarians/recruit/walk_w_1_03.png
- data/tribes/workers/barbarians/recruit/walk_w_03_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_03_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_04.png => data/tribes/workers/barbarians/recruit/walk_w_1_04.png
- data/tribes/workers/barbarians/recruit/walk_w_04_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_04_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_05.png => data/tribes/workers/barbarians/recruit/walk_w_1_05.png
- data/tribes/workers/barbarians/recruit/walk_w_05_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_05_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_06.png => data/tribes/workers/barbarians/recruit/walk_w_1_06.png
- data/tribes/workers/barbarians/recruit/walk_w_06_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_06_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_07.png => data/tribes/workers/barbarians/recruit/walk_w_1_07.png
- data/tribes/workers/barbarians/recruit/walk_w_07_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_07_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_08.png => data/tribes/workers/barbarians/recruit/walk_w_1_08.png
- data/tribes/workers/barbarians/recruit/walk_w_08_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_08_pc.png
- data/tribes/workers/barbarians/recruit/walk_w_09.png => data/tribes/workers/barbarians/recruit/walk_w_1_09.png
- data/tribes/workers/barbarians/recruit/walk_w_09_pc.png => data/tribes/workers/barbarians/recruit/walk_w_1_09_pc.png
- src/logic/campaign_visibility.cc => src/ui_fsmenu/campaigns.cc
- src/logic/campaign_visibility.h => src/ui_fsmenu/campaigns.h
- files modified:
- CMakeLists.txt
added
removed
data/tribes/immovables/berry_bushes/currant_black/tiny/idle_2_2.png
