Merge branch 'save_ext' into jgrpp

# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2017-04-01 01:14:28 +01:00
81 changed files with 473 additions and 140 deletions

View File

@@ -139,6 +139,7 @@ struct GUISettings {
bool departure_show_all_stops; ///< whether to show stops regardless of loading/unloading done at them
bool departure_merge_identical; ///< whether to merge identical departures
bool left_mouse_btn_scrolling; ///< left mouse button scroll
bool right_mouse_wnd_close; ///< close window with right click
bool pause_on_newgame; ///< whether to start new games paused or not
bool enable_signal_gui; ///< show the signal GUI when the signal button is pressed
Year coloured_news_year; ///< when does newspaper become coloured?