diff options
| author | Rémi Verschelde | 2017-11-15 21:54:21 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-15 21:54:21 +0100 |
| commit | c7f7dd3e3e3592264a05e0dc7ee5f1ea37fad738 (patch) | |
| tree | a22a88d22bd079a8404150fbf5b870df6046240e /modules/gdscript | |
| parent | 4d08e7c4204ff3fa0e17e0de7e5a08ef03968202 (diff) | |
| parent | 11e07d18bd80c0b7d8836698d98e058750e33660 (diff) | |
| download | godot-c7f7dd3e3e3592264a05e0dc7ee5f1ea37fad738.tar.gz godot-c7f7dd3e3e3592264a05e0dc7ee5f1ea37fad738.tar.zst godot-c7f7dd3e3e3592264a05e0dc7ee5f1ea37fad738.zip | |
Merge pull request #12954 from akien-mga/docs
Make module docs self-contained and various improvements
Diffstat (limited to '')
| -rw-r--r-- | modules/gdscript/config.py | 13 | ||||
| -rw-r--r-- | modules/gdscript/doc_classes/GDFunctionState.xml (renamed from doc/classes/GDFunctionState.xml) | 2 | ||||
| -rw-r--r-- | modules/gdscript/doc_classes/GDNativeClass.xml (renamed from doc/classes/GDNativeClass.xml) | 2 | ||||
| -rw-r--r-- | modules/gdscript/doc_classes/GDScript.xml (renamed from doc/classes/GDScript.xml) | 2 | ||||
| -rw-r--r-- | modules/gdscript/gd_editor.cpp | 2 |
5 files changed, 14 insertions, 7 deletions
diff --git a/modules/gdscript/config.py b/modules/gdscript/config.py index 5698a3729..6e8994d64 100644 --- a/modules/gdscript/config.py +++ b/modules/gdscript/config.py @@ -1,8 +1,15 @@ - - def can_build(platform): return True - def configure(env): pass + +def get_doc_classes(): + return [ + "GDFunctionState", + "GDNativeClass", + "GDScript", + ] + +def get_doc_path(): + return "doc_classes" diff --git a/doc/classes/GDFunctionState.xml b/modules/gdscript/doc_classes/GDFunctionState.xml index 801ca718e..e1aafa8a5 100644 --- a/doc/classes/GDFunctionState.xml +++ b/modules/gdscript/doc_classes/GDFunctionState.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="GDFunctionState" inherits="Reference" category="Core" version="3.0.alpha.custom_build"> +<class name="GDFunctionState" inherits="Reference" category="Core" version="3.0-alpha"> <brief_description> State of a function call after yielding. </brief_description> diff --git a/doc/classes/GDNativeClass.xml b/modules/gdscript/doc_classes/GDNativeClass.xml index 5a3f35372..95789e1b6 100644 --- a/doc/classes/GDNativeClass.xml +++ b/modules/gdscript/doc_classes/GDNativeClass.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="GDNativeClass" inherits="Reference" category="Core" version="3.0.alpha.custom_build"> +<class name="GDNativeClass" inherits="Reference" category="Core" version="3.0-alpha"> <brief_description> </brief_description> <description> diff --git a/doc/classes/GDScript.xml b/modules/gdscript/doc_classes/GDScript.xml index 2faa0ff96..13d45aa52 100644 --- a/doc/classes/GDScript.xml +++ b/modules/gdscript/doc_classes/GDScript.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="GDScript" inherits="Script" category="Core" version="3.0.alpha.custom_build"> +<class name="GDScript" inherits="Script" category="Core" version="3.0-alpha"> <brief_description> A script implemented in the GDScript programming language. </brief_description> diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index 655e78517..9b7201f5f 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -2798,7 +2798,7 @@ Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol } } else { r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT; - r_result.class_name = "@Global Scope"; + r_result.class_name = "@GlobalScope"; r_result.class_member = p_symbol; return OK; } |