diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-29 07:42:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-29 07:42:19 +0400 |
| commit | fe26492538edefe60a342bce109e17b9536e5a16 (patch) | |
| tree | df81d2485abd06be9cd2f4536a661b05153dff94 /doc | |
| parent | 8f969fdc40cded16ec58f6810585411adbb5538d (diff) | |
| parent | cf9e619889fdcdc457e44d4b384cda091de55673 (diff) | |
Merged changes in the trunk up to revision 54171.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/python_api/rst/bge.events.rst | 4 | ||||
| -rw-r--r-- | doc/python_api/rst/bge.types.rst | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/python_api/rst/bge.events.rst b/doc/python_api/rst/bge.events.rst index 074e928f0d8..2238faea242 100644 --- a/doc/python_api/rst/bge.events.rst +++ b/doc/python_api/rst/bge.events.rst @@ -69,7 +69,7 @@ Functions Return the string name of a key event. Will raise a ValueError error if its invalid. - :arg event: key event from bge.keys or the keyboard sensor. + :arg event: key event constant from :mod:`bge.events` or the keyboard sensor. :type event: int :rtype: string @@ -78,7 +78,7 @@ Functions Return the string name of a key event. Returns an empty string if the event cant be represented as a character. :type event: int - :arg event: key event from :mod:`bge.keys` or the keyboard sensor. + :arg event: key event constant from :mod:`bge.events` or the keyboard sensor. :type shift: bool :arg shift: set to true if shift is held. :rtype: string diff --git a/doc/python_api/rst/bge.types.rst b/doc/python_api/rst/bge.types.rst index a86272ddf5c..1e2632b9ada 100644 --- a/doc/python_api/rst/bge.types.rst +++ b/doc/python_api/rst/bge.types.rst @@ -4215,25 +4215,25 @@ Types A keyboard sensor detects player key presses. - See module :mod:`bge.keys` for keycode values. + See module :mod:`bge.events` for keycode values. .. attribute:: key The key code this sensor is looking for. - :type: keycode from :mod:`bge.keys` module + :type: keycode from :mod:`bge.events` module .. attribute:: hold1 The key code for the first modifier this sensor is looking for. - :type: keycode from :mod:`bge.keys` module + :type: keycode from :mod:`bge.events` module .. attribute:: hold2 The key code for the second modifier this sensor is looking for. - :type: keycode from :mod:`bge.keys` module + :type: keycode from :mod:`bge.events` module .. attribute:: toggleProperty |