From: Jaka K. <lyn...@us...> - 2013-01-29 13:32:01
|
gemrb: Infinity Engine emulator The branch master has been updated via d3fbae97ef493fddd02464f6390b59c062ce5c11 (commit) via da14d977d1a379bc490d185e0110f865479674f9 (commit) Summary of changes: gemrb/GUIScripts/GUICommonWindows.py | 6 ++++-- gemrb/unhardcoded/shared/keymap.2da | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) from 64be690867ca3a9e6c83c72b00a01bb74394a175 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=d3fbae97ef493fddd02464f6390b59c062ce5c11 commit d3fbae97ef493fddd02464f6390b59c062ce5c11 Author: Jaka Kranjc <lyn...@us...> Date: Tue Jan 29 14:27:00 2013 +0100 keymap.2da: added iwd2's spellbook shortcut diff --git a/gemrb/unhardcoded/shared/keymap.2da b/gemrb/unhardcoded/shared/keymap.2da index 9aaf065..43ce677 100644 --- a/gemrb/unhardcoded/shared/keymap.2da +++ b/gemrb/unhardcoded/shared/keymap.2da @@ -8,6 +8,7 @@ Journal GUIJRNL OpenJournalWindow 0 Map GUIMA OpenMapWindow 0 Wizard_Spells GUIMG OpenMageWindow 0 Priest_Spells GUIPR OpenPriestWindow 0 +Spellbook GUISPL OpenSpellBookWindow 0 Options GUIOPT OpenOptionsWindow 0 Character_Arbitration GUIMP * Guard_/_Protect GUICommonWindows ActionDefendPressed 0 http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=da14d977d1a379bc490d185e0110f865479674f9 commit da14d977d1a379bc490d185e0110f865479674f9 Author: Jaka Kranjc <lyn...@us...> Date: Tue Jan 29 14:23:43 2013 +0100 gcw: added the missing bits for ReturnToGame keyboard binding support (defaults to g) diff --git a/gemrb/GUIScripts/GUICommonWindows.py b/gemrb/GUIScripts/GUICommonWindows.py index f0d003d..0a0286d 100644 --- a/gemrb/GUIScripts/GUICommonWindows.py +++ b/gemrb/GUIScripts/GUICommonWindows.py @@ -58,6 +58,7 @@ ActionsWindow = None CurrentWindow = None DraggedPortrait = None ActionBarControlOffset = 0 +ReturnToGame = None #The following tables deal with the different control indexes and string refs of each game #so that actual interface code can be game neutral @@ -119,12 +120,13 @@ def InitOptionButton(Window, Index, Action=0,IsPage=1): return Button ##these defaults don't seem to break the games other than pst -def SetupMenuWindowControls (Window, Gears=None, ReturnToGame=None): +def SetupMenuWindowControls (Window, Gears=None, CloseWindowCallback=None): """Binds all of the basic controls and windows to the options pane.""" - global OptionsWindow, ActionBarControlOffset + global OptionsWindow, ActionBarControlOffset, ReturnToGame OptionsWindow = Window + ReturnToGame = CloseWindowCallback bg1 = GUICommon.GameIsBG1() bg2 = GUICommon.GameIsBG2() ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |