diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-16 02:18:25 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-16 02:18:25 +0400 |
| commit | 004e38a44eff3b2987771aef8c7427f8c15a6494 (patch) | |
| tree | 9ee104822b10f65cfd629d8243b61e65b941abf6 /doc/python_api | |
| parent | 295976b7791e8005f82bb8644835b6feed10c861 (diff) | |
| parent | a2d4fddfd38ce0795d21ec9c5b5cc51fc50f3bd1 (diff) | |
Merged changes in the trunk up to revision 47977.
Diffstat (limited to 'doc/python_api')
| -rw-r--r-- | doc/python_api/rst/bge.types.rst | 7 | ||||
| -rw-r--r-- | doc/python_api/sphinx_doc_gen.py | 5 | ||||
| -rwxr-xr-x | doc/python_api/sphinx_doc_gen.sh | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/python_api/rst/bge.types.rst b/doc/python_api/rst/bge.types.rst index bcef816dc9d..ff85df1f68b 100644 --- a/doc/python_api/rst/bge.types.rst +++ b/doc/python_api/rst/bge.types.rst @@ -2692,7 +2692,7 @@ Game Types (bge.types) The angle of the cone (in degrees) with which to test. - :type: float from 0 to 360 + :type: float .. attribute:: axis @@ -2703,11 +2703,6 @@ Game Types (bge.types) KX_RADAR_AXIS_POS_X, KX_RADAR_AXIS_POS_Y, KX_RADAR_AXIS_POS_Z, KX_RADAR_AXIS_NEG_X, KX_RADAR_AXIS_NEG_Y, KX_RADAR_AXIS_NEG_Z - .. method:: getConeHeight() - - :return: The height of the cone with which to test. - :rtype: float - .. class:: KX_RaySensor(SCA_ISensor) A ray sensor detects the first object in a given direction. diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 5408c479b7c..57dec830c74 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -942,6 +942,8 @@ def pycontext2sphinx(basepath): "image_context_dir", "node_context_dir", "text_context_dir", + "clip_context_dir", + "sequencer_context_dir", ) # Changes in blender will force errors here @@ -951,6 +953,7 @@ def pycontext2sphinx(basepath): "active_object": ("Object", False), "active_operator": ("Operator", False), "active_pose_bone": ("PoseBone", False), + "active_node": ("Node", False), "armature": ("Armature", False), "bone": ("Bone", False), "brush": ("Brush", False), @@ -961,6 +964,8 @@ def pycontext2sphinx(basepath): "dynamic_paint": ("DynamicPaintModifier", False), "edit_bone": ("EditBone", False), "edit_image": ("Image", False), + "edit_mask": ("Mask", False), + "edit_movieclip": ("MovieClip", False), "edit_object": ("Object", False), "edit_text": ("Text", False), "editable_bones": ("EditBone", True), diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh index ccb293d7a0e..92461961920 100755 --- a/doc/python_api/sphinx_doc_gen.sh +++ b/doc/python_api/sphinx_doc_gen.sh @@ -61,7 +61,7 @@ if $DO_OUT_HTML ; then # annoying bug in sphinx makes it very slow unless we do this. should report. cd $SPHINXBASE - sphinx-build -n -b html sphinx-in sphinx-out + sphinx-build -b html sphinx-in sphinx-out # XXX, saves space on upload and zip, should move HTML outside # and zip up there, for now this is OK |