Merge tag '1.11.0' into 1.11

This commit is contained in:
Sergii Pylypenko
2021-04-01 21:19:42 +03:00
115 changed files with 2677 additions and 1103 deletions
+13 -6
View File
@@ -26,17 +26,21 @@ enum GenerateLandscapeWidgets {
WID_GL_GENERATE_BUTTON, ///< 'Generate' button.
WID_GL_MAX_HEIGHTLEVEL_DOWN, ///< Decrease max. heightlevel
WID_GL_MAX_HEIGHTLEVEL_TEXT, ///< Max. heightlevel
WID_GL_MAX_HEIGHTLEVEL_UP, ///< Increase max. heightlevel
WID_GL_HEIGHTMAP_HEIGHT_DOWN, ///< Decrease heightmap highest mountain
WID_GL_HEIGHTMAP_HEIGHT_TEXT, ///< Max. heightmap highest mountain
WID_GL_HEIGHTMAP_HEIGHT_UP, ///< Increase max. heightmap highest mountain
WID_GL_START_DATE_DOWN, ///< Decrease start year.
WID_GL_START_DATE_TEXT, ///< Start year.
WID_GL_START_DATE_UP, ///< Increase start year.
WID_GL_SNOW_LEVEL_DOWN, ///< Decrease snow level.
WID_GL_SNOW_LEVEL_TEXT, ///< Snow level.
WID_GL_SNOW_LEVEL_UP, ///< Increase snow level.
WID_GL_SNOW_COVERAGE_DOWN, ///< Decrease snow coverage.
WID_GL_SNOW_COVERAGE_TEXT, ///< Snow coverage.
WID_GL_SNOW_COVERAGE_UP, ///< Increase snow coverage.
WID_GL_DESERT_COVERAGE_DOWN, ///< Decrease desert coverage.
WID_GL_DESERT_COVERAGE_TEXT, ///< Desert coverage.
WID_GL_DESERT_COVERAGE_UP, ///< Increase desert coverage.
WID_GL_LANDSCAPE_PULLDOWN, ///< Dropdown 'Land generator'.
@@ -55,6 +59,9 @@ enum GenerateLandscapeWidgets {
WID_GL_WATER_NE, ///< NE 'Water'/'Freeform'.
WID_GL_WATER_SE, ///< SE 'Water'/'Freeform'.
WID_GL_WATER_SW, ///< SW 'Water'/'Freeform'.
WID_GL_CLIMATE_SEL_LABEL, ///< NWID_SELECTION for snow or desert coverage label
WID_GL_CLIMATE_SEL_SELECTOR, ///< NWID_SELECTION for snow or desert coverage selector
};
/** Widgets of the #CreateScenarioWindow class. */