From 64a2c6dbbf4c525424618e9defdd58ad8cb7869b Mon Sep 17 00:00:00 2001 From: filux Date: Mon, 6 Mar 2017 19:27:58 +0100 Subject: [PATCH] missing button came back --- data/glest_game | 2 +- docs/CHANGELOG.txt | 8 ++++---- source/glest_game/menu/menu_state_options_graphics.cpp | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/data/glest_game b/data/glest_game index 97ff93a42..211a8f2ea 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 97ff93a42f80b319209297d10698a71a03f34ae9 +Subproject commit 211a8f2ea23a6334b7a817a5960b5e87809fc8bb diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index f71e2beda..0401b9887 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -12,9 +12,9 @@ v3.13.0 - much better error handling and messages especially for modders and xml-related problems - fix unwanted double event for some keys ( like alt+enter ) - map filter option for game setup on headless server -- option to select/command multiple buildings of same type. ( uniform-selection ) +- option to select/command multiple buildings of same type ( uniform-selection ) - major cross platform OOS fix which especially showed up quite often when playing without - fog of war. + fog of war - you must proof basic game knowledge before you can play online by winning a special scenario - less visible parts of black squares while rendering cliffs - possibility to let units spawn units on death @@ -32,12 +32,12 @@ v3.12.0 v3.11.1 - no more false clicks when commanding via mini map - map editor has a more useful and powerful map height randomizer -- map editor saves all maps with .mgm ending by default. +- map editor saves all maps with .mgm ending by default - fixed map editor ( several linux distributions had trouble ) - for missing tilesets and techs optional download from mod center instead of server. (bugfix) - healthbar default set to "if needed" - nicer tilesets as defaults -- improved camera startposition on game start ( main building in center ). +- improved camera startposition on game start ( main building in center ) - attackBoosts: Ep + Hp regeneration is shown in description - MegaGlest can be build easier on MacOS ( sadly noone was willing to test ) diff --git a/source/glest_game/menu/menu_state_options_graphics.cpp b/source/glest_game/menu/menu_state_options_graphics.cpp index 5395a609f..fd2d50bcf 100644 --- a/source/glest_game/menu/menu_state_options_graphics.cpp +++ b/source/glest_game/menu/menu_state_options_graphics.cpp @@ -121,9 +121,11 @@ MenuStateOptionsGraphics::MenuStateOptionsGraphics(Program *program, MainMenu *m int tabButtonWidth=200; int tabButtonHeight=30; + mainMessageBox.init(lang.getString("Ok")); mainMessageBox.setEnabled(false); mainMessageBoxState=0; + buttonAudioSection.init(0, 720,tabButtonWidth,tabButtonHeight); buttonAudioSection.setFont(CoreData::getInstance().getMenuFontVeryBig()); buttonAudioSection.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D()); buttonAudioSection.setText(lang.getString("Audio"));