diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 23:14:35 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 23:14:35 -0300 |
| commit | 0a717ffee270b3d2761aaae6a42c06d999a5b823 (patch) | |
| tree | a52dd64a8c76e24f4734f917af3a124f4dea6d4b /doc | |
| parent | 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b (diff) | |
| parent | 81757d2e977d959e6b0bc26f9fa990417ca91de9 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
modules/multiscript/register_types.cpp
platform/android/java/src/com/android/godot/GodotLib.java
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/base/classes.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | doc/make_doc.sh | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 46bc8997ff..25278f2444 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -20966,7 +20966,7 @@ <argument index="0" name="linear_velocity" type="Vector2"> </argument> <description> - Set the body linear velocity. Can be used sporadically, but[b] DONT SET THIS IN EVERY FRAME [b], because physics may be running in another thread and definitely runs at a different granularity. Use [_integrate_forces] as your process loop if you want to have precise control of the body state. + Set the body linear velocity. Can be used sporadically, but[b] DONT SET THIS IN EVERY FRAME [/b], because physics may be running in another thread and definitely runs at a different granularity. Use [_integrate_forces] as your process loop if you want to have precise control of the body state. </description> </method> <method name="get_linear_velocity" qualifiers="const" > @@ -20980,7 +20980,7 @@ <argument index="0" name="angular_velocity" type="real"> </argument> <description> - Set the body angular velocity. Can be used sporadically, but[b] DONT SET THIS IN EVERY FRAME [b], because physics may be running in another thread and definitely runs at a different granularity. Use [_integrate_forces] as your process loop if you want to have precise control of the body state. + Set the body angular velocity. Can be used sporadically, but[b] DONT SET THIS IN EVERY FRAME [/b], because physics may be running in another thread and definitely runs at a different granularity. Use [_integrate_forces] as your process loop if you want to have precise control of the body state. </description> </method> <method name="get_angular_velocity" qualifiers="const" > diff --git a/doc/make_doc.sh b/doc/make_doc.sh index aa9b47cd46..a76f568bfc 100644..100755 --- a/doc/make_doc.sh +++ b/doc/make_doc.sh @@ -1,5 +1,17 @@ #! /bin/bash -cd html/class_list -python ../../../tools/docdump/makehtml.py -multipage ../../base/classes.xml -cd ../.. +here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +godotHome=$(dirname "$here") +docTarget=${here}/html/class_list +toolsRoot=${godotHome}/tools + +throw() { + echo "$@" >&2 + exit 1 +} + +[ -d "$docTarget" ] || mkdir -p "$docTarget" || throw "Could not create doc target $docTarget" + +cd "$docTarget" +python ${toolsRoot}/docdump/makehtml.py -multipage ${here}/base/classes.xml +cd "$here" |