diff --git a/readme.txt b/readme.txt index 8500a238d9..5a19f5318c 100644 --- a/readme.txt +++ b/readme.txt @@ -229,6 +229,18 @@ https://github.com/Andrettin/Wyrmsun # Changelog ############################################################ +----------------------------------------------------------------------- +- 1.9.1 +----------------------------------------------------------------------- + +* Miscellaneous +- Fixed issue which caused the C key to center on the selected unit, rather than Ctrl+C or Alt+C, as intended. +- To prevent conflicts with command button hotkeys, the hotkey for selecting the entire army is now Alt+Q, rather than Q. +- To prevent conflicts with command button hotkeys, the hotkey for selecting all visible units of the same type as the currently selected one is now Alt+W, rather than W. + +* Units +- Fixed issue which caused rescued units to get all upgrades applied to them, regardless of whether their new owner had them researched or not. + ----------------------------------------------------------------------- - 1.9.0 ----------------------------------------------------------------------- diff --git a/scripts/commands.lua b/scripts/commands.lua index bc5b0fd717..6bd5c62e94 100644 --- a/scripts/commands.lua +++ b/scripts/commands.lua @@ -52,7 +52,7 @@ local function HandleIneditorCommandKey(key, ctrl, alt, shift) RunEditorSaveMenu() elseif (key == "f12") then -- Load RunEditorLoadMenu() - elseif (key == "q" and (ctrl or alt)) then -- Quit to menu + elseif (key == "q" and (ctrl)) then -- Quit to menu RunQuitToMenuConfirmMenu() elseif (key == "x" and (ctrl or alt)) then -- Exit RunExitConfirmMenu() diff --git a/scripts/keystrokes.lua b/scripts/keystrokes.lua index 8cb2fddb2e..3b41230d9d 100644 --- a/scripts/keystrokes.lua +++ b/scripts/keystrokes.lua @@ -48,14 +48,14 @@ AddKeystrokeHelp("Ctrl-S", "- mute sound") AddKeystrokeHelp("Alt-M", "- game menu") AddKeystrokeHelp("Ctrl-M", "- mute music") AddKeystrokeHelp("Ctrl-P", "- pause game") -AddKeystrokeHelp("Q", "- select entire army") -AddKeystrokeHelp("Alt-Q", "- quit to main menu") +AddKeystrokeHelp("Alt-Q", "- select entire army") +AddKeystrokeHelp("Ctrl-Q", "- quit to main menu") AddKeystrokeHelp("Alt-R", "- restart scenario") AddKeystrokeHelp("Ctrl-T", "- track unit") AddKeystrokeHelp("Alt-V", "- next view port") AddKeystrokeHelp("Ctrl-V", "- previous view port") -AddKeystrokeHelp("W", "- select all visible units of the same type as the currently selected one") -AddKeystrokeHelp("WW", "- select all units of the same type as the currently selected one") +AddKeystrokeHelp("Alt-W", "- select all visible units of the same type as the currently selected one") +AddKeystrokeHelp("Alt-WW", "- select all units of the same type as the currently selected one") AddKeystrokeHelp("Alt-X", "- quit game") AddKeystrokeHelp("+", "- increase game speed") AddKeystrokeHelp("-", "- decrease game speed") diff --git a/scripts/menus/help.lua b/scripts/menus/help.lua index bbc6f37ad9..0b80346abb 100644 --- a/scripts/menus/help.lua +++ b/scripts/menus/help.lua @@ -24,15 +24,15 @@ local keystrokes = { {"Alt-M", "- game menu"}, {"Ctrl-M", "- mute music"}, {"Ctrl-P", "- pause game"}, - {"Q", "- select entire army"}, - {"Alt-Q", "- quit to main menu"}, + {"Alt-Q", "- select entire army"}, + {"Ctrl-Q", "- quit to main menu"}, {"Alt-R", "- restart scenario"}, {"Ctrl-S", "- mute sound"}, {"Ctrl-T", "- track unit"}, {"Alt-V", "- next view port"}, {"Ctrl-V", "- previous view port"}, - {"W", "- select all visible units of the same type as the currently selected one"}, - {"WW", "- select all units of the same type as the currently selected one"}, + {"Alt-W", "- select all visible units of the same type as the currently selected one"}, + {"Alt-WW", "- select all units of the same type as the currently selected one"}, {"Alt-X", "- quit game"}, {"+", "- increase game speed"}, {"-", "- decrease game speed"}, diff --git a/scripts/stratagus.lua b/scripts/stratagus.lua index 1d1448a45f..ebc75b8155 100644 --- a/scripts/stratagus.lua +++ b/scripts/stratagus.lua @@ -37,7 +37,7 @@ DebugPrint("Stratagus default config file loading ...\n") wyrmsun = {} wyrmsun.Name = "Wyrmsun" -wyrmsun.Version = "1.9.0" +wyrmsun.Version = "1.9.1" wyrmsun.Homepage = "" wyrmsun.Licence = "GPL 2.0" wyrmsun.Copyright = "Copyright (c) 2013-2015 by Andrettin"