« back to all changes in this revision
Viewing changes to data/tribes/immovables/berry_bushes/blueberry/small/idle_3.png
- Committer: GunChleoc
- Date: 2018-03-27 13:49:43 UTC
- mfrom: (8494.1.138 _widelands_dev_widelands_trunk)
- Revision ID: fios@foramnagaidhlig.net-20180327134943-4byj2mzm1110jqfx
Merged trunk.
- files added:
- cmake/codecheck/rules/translations_printf
- data/campaigns/emp04.wmf
- data/campaigns/emp04.wmf/binary
- data/campaigns/emp04.wmf/pics
- data/campaigns/emp04.wmf/scripting
- data/campaigns/emp04.wmf/scripting/tribes
- data/campaigns/fri01.wmf
- data/campaigns/fri01.wmf/binary
- data/campaigns/fri01.wmf/pics
- data/campaigns/fri01.wmf/scripting
- data/campaigns/fri02.wmf
- data/campaigns/fri02.wmf/binary
- data/campaigns/fri02.wmf/pics
- data/campaigns/fri02.wmf/scripting
- data/campaigns/fri02.wmf/scripting/tribes
- data/tribes/buildings/militarysites/frisians
- data/tribes/buildings/militarysites/frisians/fortress
- data/tribes/buildings/militarysites/frisians/outpost
- data/tribes/buildings/militarysites/frisians/sentinel
- data/tribes/buildings/militarysites/frisians/tower
- data/tribes/buildings/militarysites/frisians/wooden_tower
- data/tribes/buildings/militarysites/frisians/wooden_tower_high
- data/tribes/buildings/productionsites/frisians
- data/tribes/buildings/productionsites/frisians/aqua_farm
- data/tribes/buildings/productionsites/frisians/armor_smithy_large
- data/tribes/buildings/productionsites/frisians/armor_smithy_small
- data/tribes/buildings/productionsites/frisians/bakery
- data/tribes/buildings/productionsites/frisians/barracks
- data/tribes/buildings/productionsites/frisians/beekeepers_house
- data/tribes/buildings/productionsites/frisians/berry_farm
- data/tribes/buildings/productionsites/frisians/blacksmithy
- data/tribes/buildings/productionsites/frisians/brewery
- data/tribes/buildings/productionsites/frisians/brick_kiln
- data/tribes/buildings/productionsites/frisians/charcoal_kiln
- data/tribes/buildings/productionsites/frisians/clay_pit
- data/tribes/buildings/productionsites/frisians/coalmine
- data/tribes/buildings/productionsites/frisians/coalmine_deep
- data/tribes/buildings/productionsites/frisians/collectors_house
- data/tribes/buildings/productionsites/frisians/drinking_hall
- data/tribes/buildings/productionsites/frisians/farm
- data/tribes/buildings/productionsites/frisians/fishers_house
- data/tribes/buildings/productionsites/frisians/foresters_house
- data/tribes/buildings/productionsites/frisians/furnace
- data/tribes/buildings/productionsites/frisians/goldmine
- data/tribes/buildings/productionsites/frisians/goldmine_deep
- data/tribes/buildings/productionsites/frisians/honey_bread_bakery
- data/tribes/buildings/productionsites/frisians/hunters_house
- data/tribes/buildings/productionsites/frisians/ironmine
- data/tribes/buildings/productionsites/frisians/ironmine_deep
- data/tribes/buildings/productionsites/frisians/mead_brewery
- data/tribes/buildings/productionsites/frisians/quarry
- data/tribes/buildings/productionsites/frisians/recycling_center
- data/tribes/buildings/productionsites/frisians/reed_farm
- data/tribes/buildings/productionsites/frisians/reindeer_farm
- data/tribes/buildings/productionsites/frisians/rockmine
- data/tribes/buildings/productionsites/frisians/rockmine_deep
- data/tribes/buildings/productionsites/frisians/scouts_house
- data/tribes/buildings/productionsites/frisians/sewing_room
- data/tribes/buildings/productionsites/frisians/shipyard
- data/tribes/buildings/productionsites/frisians/smokery
- data/tribes/buildings/productionsites/frisians/tailors_shop
- data/tribes/buildings/productionsites/frisians/tavern
- data/tribes/buildings/productionsites/frisians/weaving_mill
- data/tribes/buildings/productionsites/frisians/well
- data/tribes/buildings/productionsites/frisians/woodcutters_house
- data/tribes/buildings/trainingsites/frisians
- data/tribes/buildings/trainingsites/frisians/training_arena
- data/tribes/buildings/trainingsites/frisians/training_camp
- data/tribes/buildings/warehouses/frisians
- data/tribes/buildings/warehouses/frisians/headquarters
- data/tribes/buildings/warehouses/frisians/port
- data/tribes/buildings/warehouses/frisians/warehouse
- data/tribes/images/frisians
- data/tribes/immovables/barleyfield_harvested
- data/tribes/immovables/barleyfield_medium
- data/tribes/immovables/barleyfield_ripe
- data/tribes/immovables/barleyfield_small
- data/tribes/immovables/barleyfield_tiny
- data/tribes/immovables/berry_bushes
- data/tribes/immovables/berry_bushes/blueberry
- data/tribes/immovables/berry_bushes/blueberry/medium
- data/tribes/immovables/berry_bushes/blueberry/ripe
- data/tribes/immovables/berry_bushes/blueberry/small
- data/tribes/immovables/berry_bushes/blueberry/tiny
- data/tribes/immovables/berry_bushes/currant_black
- data/tribes/immovables/berry_bushes/currant_black/medium
- data/tribes/immovables/berry_bushes/currant_black/ripe
- data/tribes/immovables/berry_bushes/currant_black/small
- data/tribes/immovables/berry_bushes/currant_black/tiny
- data/tribes/immovables/berry_bushes/currant_red
- data/tribes/immovables/berry_bushes/currant_red/medium
- data/tribes/immovables/berry_bushes/currant_red/ripe
- data/tribes/immovables/berry_bushes/currant_red/small
- data/tribes/immovables/berry_bushes/currant_red/tiny
- data/tribes/immovables/berry_bushes/desert_hackberry
- data/tribes/immovables/berry_bushes/desert_hackberry/medium
- data/tribes/immovables/berry_bushes/desert_hackberry/ripe
- data/tribes/immovables/berry_bushes/desert_hackberry/small
- data/tribes/immovables/berry_bushes/desert_hackberry/tiny
- data/tribes/immovables/berry_bushes/raspberry
- data/tribes/immovables/berry_bushes/raspberry/medium
- data/tribes/immovables/berry_bushes/raspberry/ripe
- data/tribes/immovables/berry_bushes/raspberry/small
- data/tribes/immovables/berry_bushes/raspberry/tiny
- data/tribes/immovables/berry_bushes/sea_buckthorn
- data/tribes/immovables/berry_bushes/sea_buckthorn/medium
- data/tribes/immovables/berry_bushes/sea_buckthorn/ripe
- data/tribes/immovables/berry_bushes/sea_buckthorn/small
- data/tribes/immovables/berry_bushes/sea_buckthorn/tiny
- data/tribes/immovables/berry_bushes/strawberry
- data/tribes/immovables/berry_bushes/strawberry/medium
- data/tribes/immovables/berry_bushes/strawberry/ripe
- data/tribes/immovables/berry_bushes/strawberry/small
- data/tribes/immovables/berry_bushes/strawberry/tiny
- data/tribes/immovables/pond_dry
- data/tribes/immovables/pond_growing
- data/tribes/immovables/pond_mature
- data/tribes/immovables/shipconstruction_frisians
- data/tribes/scripting/starting_conditions/frisians
- data/tribes/ships/frisians
- data/tribes/wares/barley
- data/tribes/wares/bread_frisians
- data/tribes/wares/brick
- data/tribes/wares/clay
- data/tribes/wares/fruit
- data/tribes/wares/fur
- data/tribes/wares/fur_garment
- data/tribes/wares/fur_garment_golden
- data/tribes/wares/fur_garment_old
- data/tribes/wares/fur_garment_studded
- data/tribes/wares/helmet_golden
- data/tribes/wares/honey
- data/tribes/wares/honey_bread
- data/tribes/wares/mead
- data/tribes/wares/needles
- data/tribes/wares/scrap_iron
- data/tribes/wares/scrap_metal_mixed
- data/tribes/wares/sword_curved
- data/tribes/wares/sword_double
- data/tribes/wares/sword_long
- data/tribes/wares/sword_short
- data/tribes/workers/frisians
- data/tribes/workers/frisians/baker
- data/tribes/workers/frisians/baker_master
- data/tribes/workers/frisians/beekeeper
- data/tribes/workers/frisians/berry_farmer
- data/tribes/workers/frisians/blacksmith
- data/tribes/workers/frisians/blacksmith_master
- data/tribes/workers/frisians/brewer
- data/tribes/workers/frisians/brewer_master
- data/tribes/workers/frisians/brickmaker
- data/tribes/workers/frisians/builder
- data/tribes/workers/frisians/carrier
- data/tribes/workers/frisians/charcoal_burner
- data/tribes/workers/frisians/farmer
- data/tribes/workers/frisians/fisher
- data/tribes/workers/frisians/forester
- data/tribes/workers/frisians/fruit_collector
- data/tribes/workers/frisians/geologist
- data/tribes/workers/frisians/hunter
- data/tribes/workers/frisians/landlady
- data/tribes/workers/frisians/miner
- data/tribes/workers/frisians/miner_master
- data/tribes/workers/frisians/reed_farmer
- data/tribes/workers/frisians/reindeer
- data/tribes/workers/frisians/reindeer_breeder
- data/tribes/workers/frisians/scout
- data/tribes/workers/frisians/seamstress
- data/tribes/workers/frisians/seamstress_master
- data/tribes/workers/frisians/shipwright
- data/tribes/workers/frisians/smelter
- data/tribes/workers/frisians/smoker
- data/tribes/workers/frisians/soldier
- data/tribes/workers/frisians/stonemason
- data/tribes/workers/frisians/trainer
- data/tribes/workers/frisians/woodcutter
- po/scenario_emp04.wmf
- po/scenario_fri01.wmf
- po/scenario_fri02.wmf
- test/maps/two_ponds.wmf
- test/maps/two_ponds.wmf/binary
- test/maps/two_ponds.wmf/scripting
- test/scripting
- files removed:
- data/campaigns/dummy.wmf/binary/building
- data/campaigns/dummy.wmf/player
- data/campaigns/dummy.wmf/player/1
- data/campaigns/dummy.wmf/player/1/binary
- data/campaigns/dummy.wmf/player/1/view
- files renamed:
- data/images/wui/fieldaction/menu_tab_buildroad.png => data/images/wui/fieldaction/menu_build_way.png
- data/images/wui/fieldaction/menu_build_way.png => data/images/wui/fieldaction/menu_tab_buildroad.png
- data/maps/Crossing_the_Horizon.wmf/ => data/maps/Crossing_the_Horizon_v2.wmf/
- data/scripting/format_scenario.lua => data/scripting/richtext_scenarios.lua
- doc/sphinx/source/images/fancymsg.png => doc/sphinx/source/images/wlrichtext.png
- files modified:
- .travis.sh
added
removed
data/tribes/immovables/berry_bushes/blueberry/small/idle_3.png
