Viewing all changes in revision 8145.
- Committer: GunChleoc
- Date: 2016-11-18 07:11:51 UTC
- mfrom: (8127.1.54 _widelands_dev_widelands_trunk)
- Revision ID: fios@foramnagaidhlig.net-20161118071151-91jkh5u0e98qa6pw
Merged trunk.
- files added:
- cmake/codecheck/rules/do_not_use__cxx11
- data/sound/barbarians/taverns
- data/sound/empire/taverns
- data/tribes/buildings/productionsites/atlanteans/barracks
- data/tribes/buildings/productionsites/barbarians/barracks
- data/tribes/buildings/productionsites/empire/barracks
- files removed:
- cmake/codecheck/rules/missing_space_after_access_type_symbol
- data/sound/taverns
- files renamed:
- data/images/players/genstats_enable_plr_08.png => data/images/players/genstats_player.png
- data/images/players/editor_player_08_starting_pos.png => data/images/players/player_position.png
- data/images/players/fsel_editor_set_player_08_pos.png => data/images/players/player_position_menu.png
- data/images/ui_fsmenu/ui_fsmenu.jpg => data/images/ui_fsmenu/background.png
- src/base/point.cc => src/base/vector.cc
- src/wui/vector.h => src/base/vector.h
- files modified:
- .travis.yml
expand all
collapse all
added
removed
data/images/loadscreens/progress.png
data/images/logos/wl-logo-64.png
data/images/players/editor_player_01_starting_pos.png
data/images/players/editor_player_02_starting_pos.png
data/images/players/editor_player_03_starting_pos.png
data/images/players/editor_player_04_starting_pos.png
data/images/players/editor_player_05_starting_pos.png
data/images/players/editor_player_06_starting_pos.png
data/images/players/editor_player_07_starting_pos.png
data/images/players/fsel_editor_set_player_01_pos.png
data/images/players/fsel_editor_set_player_02_pos.png
data/images/players/fsel_editor_set_player_03_pos.png
data/images/players/fsel_editor_set_player_04_pos.png
data/images/players/fsel_editor_set_player_05_pos.png
data/images/players/fsel_editor_set_player_06_pos.png
data/images/players/fsel_editor_set_player_07_pos.png
data/images/players/genstats_enable_plr_01.png
data/images/players/genstats_enable_plr_02.png
data/images/players/genstats_enable_plr_03.png
data/images/players/genstats_enable_plr_04.png
data/images/players/genstats_enable_plr_05.png
data/images/players/genstats_enable_plr_06.png
data/images/players/genstats_enable_plr_07.png
data/images/players/genstats_player_pc.png
data/images/players/player_position_menu_pc.png
data/images/players/player_position_pc.png
data/images/ui_basic/scrollbar_background.png
data/images/ui_fsmenu/background.png
data/images/ui_fsmenu/bottom.png
data/images/ui_fsmenu/bottom_left.png
data/images/ui_fsmenu/bottom_right.png
data/images/ui_fsmenu/center.png
data/images/ui_fsmenu/choosemapmenu.jpg
data/images/ui_fsmenu/internetmenu.jpg
data/images/ui_fsmenu/launch_mpg_menu.jpg
data/images/ui_fsmenu/left.png
data/images/ui_fsmenu/main_title.png
data/images/ui_fsmenu/mainmenu.jpg
data/images/ui_fsmenu/right.png
data/images/ui_fsmenu/top.png
data/images/ui_fsmenu/top_left.png
data/images/ui_fsmenu/top_right.png
data/images/wui/menus/menu_reset_zoom.png
data/tribes/buildings/productionsites/atlanteans/barracks/idle_00.png
data/tribes/buildings/productionsites/atlanteans/barracks/idle_00_pc.png
data/tribes/buildings/productionsites/atlanteans/barracks/menu.png
data/tribes/buildings/productionsites/barbarians/barracks/idle_00.png
data/tribes/buildings/productionsites/barbarians/barracks/menu.png
data/tribes/buildings/productionsites/empire/barracks/idle_00.png
data/tribes/buildings/productionsites/empire/barracks/menu.png
