Merge tag '1.11.0' into 1.11

2021-04-01 21:19:42 +03:00
parent 78c60cc896 bd80ec7cff
commit 403ff8badd
115 changed files with 2677 additions and 1103 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -828,6 +828,7 @@ bool SettingDesc::IsEditable(bool do_command) const
 	if ((this->desc.flags & SGF_NEWGAME_ONLY) &&
 			(_game_mode == GM_NORMAL ||
 			(_game_mode == GM_EDITOR && !(this->desc.flags & SGF_SCENEDIT_TOO)))) return false;
+	if ((this->desc.flags & SGF_SCENEDIT_ONLY) && _game_mode != GM_EDITOR) return false;
 	return true;
 }