Merge remote-tracking branch 'falconne/plugin_hotkeys' into update-fa…

…lconne-plugins Conflicts: plugins/CMakeLists.txt
kraila · Nov 15, 2014 · d18ed6d · d18ed6d
2 parents 723d6af + f764081
commit d18ed6d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/Readme.rst b/Readme.rst
@@ -2859,6 +2859,19 @@ globally active hotkey in dfhack.init, e.g.::
 
     keybinding add Ctrl-F1 hotkeys
 
+Hotkeys
+=======
+
+Opens an in-game screen showing DFHack keybindings that are valid in the current mode.
+
+.. image:: images/hotkeys.png
+
+Type ``hotkeys`` into the DFHack console to open the screen, or bind the command to a
+globally active hotkey in dfhack.init, e.g.:
+
+ ``keybinding add Ctrl-F1 hotkeys``
+
+
 gui/liquids
 ===========
 

diff --git a/images/hotkeys.PNG b/images/hotkeys.PNG