From 9165e550f85c820a65dc97111c521ac74275ecb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 13 Jun 2018 14:42:55 +0200 Subject: Style fixes for commit d5bb6faa --- doc/classes/@GDScript.xml | 2 +- doc/classes/AnimationTrackEditPlugin.xml | 15 +++ doc/classes/ProjectSettings.xml | 196 ++++++++++++++++--------------- editor/doc/doc_data.cpp | 4 +- platform/windows/detect.py | 2 +- 5 files changed, 117 insertions(+), 102 deletions(-) create mode 100644 doc/classes/AnimationTrackEditPlugin.xml diff --git a/doc/classes/@GDScript.xml b/doc/classes/@GDScript.xml index 4a42cca836..cddc59ab71 100644 --- a/doc/classes/@GDScript.xml +++ b/doc/classes/@GDScript.xml @@ -1160,7 +1160,7 @@ A positive infinity. (For negative infinity, use -INF). - + Macro constant that expands to an expression of type float that represents a NaN. The NaN values are used to identify undefined or non-representable values for floating-point elements, such as the square root of negative numbers or the result of 0/0. diff --git a/doc/classes/AnimationTrackEditPlugin.xml b/doc/classes/AnimationTrackEditPlugin.xml new file mode 100644 index 0000000000..f322a556b1 --- /dev/null +++ b/doc/classes/AnimationTrackEditPlugin.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index 77b61f29ac..666f6b4710 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -158,67 +158,69 @@ - Scale the boot splash image to the full window length when engine starts (will leave it as default pixel size otherwise). + Scale the boot splash image to the full window length when engine starts (will leave it as default pixel size otherwise). - Path to an image used for boot splash. + Path to an image used for boot splash. - This directory is used for storing persistent data (user:// filesystem). If a custom name is set, then system paths will be used to store this on Desktop (AppData on Windows, user ~/.config on Unixes, etc), else the Godot config folder is used. This name needs to be unique, and it's recommended to set it to something before publishing. + This directory is used for storing persistent data (user:// filesystem). If a custom name is set, then system paths will be used to store this on Desktop (AppData on Windows, user ~/.config on Unixes, etc), else the Godot config folder is used. This name needs to be unique, and it's recommended to set it to something before publishing. the "use_custom_user_dir" setting must be enabled for this to take effect. - Icon used for the project, set when project loads. Exporters will use this icon when possible to. + Icon used for the project, set when project loads. Exporters will use this icon when possible to. - Name of the project. It is used from both project manager and by the exporters. Overriding this as name.locale allows setting it in multiple languages. + Name of the project. It is used from both project manager and by the exporters. Overriding this as name.locale allows setting it in multiple languages. - Allow the project to save to it's own custom user dir (in AppData on windows or ~/.config on unixes). This setting only works for desktop exporters. A name must be set in the "custom_user_dir_name" setting for this to take effect. + Allow the project to save to it's own custom user dir (in AppData on windows or ~/.config on unixes). This setting only works for desktop exporters. A name must be set in the "custom_user_dir_name" setting for this to take effect. - Disable printing to stderr on exported build. + Disable printing to stderr on exported build. - Disable printing to stdout on exported build. + Disable printing to stdout on exported build. - Force a delay between frames in the main loop. This may be useful if you plan to disable vsync. + Force a delay between frames in the main loop. This may be useful if you plan to disable vsync. - Turn on low processor mode. This setting only works on desktops. The screen is not redrawn if nothing changes visually. This is meant for writing applications and editors, but is pretty useless (and can hurt performance) on games. + Turn on low processor mode. This setting only works on desktops. The screen is not redrawn if nothing changes visually. This is meant for writing applications and editors, but is pretty useless (and can hurt performance) on games. - Amount of sleeping between frames when the low_processor_mode is enabled. This effectively reduces CPU usage when this mode is enabled. + Amount of sleeping between frames when the low_processor_mode is enabled. This effectively reduces CPU usage when this mode is enabled. - Path to the main scene file that will be loaded when the project runs. + Path to the main scene file that will be loaded when the project runs. - Audio buses will disable automatically when sound goes below a given DB threshold for a given time. This saves CPU as effects assigned to that bus will no longer do any processing. + Audio buses will disable automatically when sound goes below a given DB threshold for a given time. This saves CPU as effects assigned to that bus will no longer do any processing. - Audio buses will disable automatically when sound goes below a given DB threshold for a given time. This saves CPU as effects assigned to that bus will no longer do any processing. + Audio buses will disable automatically when sound goes below a given DB threshold for a given time. This saves CPU as effects assigned to that bus will no longer do any processing. - Mix rate used for audio. In general, it's better to not touch this and leave it to the host operating system. + Mix rate used for audio. In general, it's better to not touch this and leave it to the host operating system. + + - Setting to harcode audio delay when playing video. Best to leave this untouched unless you know what you are doing. + Setting to harcode audio delay when playing video. Best to leave this untouched unless you know what you are doing. - Default compression level for gzip. Affects compressed scenes and resources. + Default compression level for gzip. Affects compressed scenes and resources. - Default compression level for zlib. Affects compressed scenes and resources. + Default compression level for zlib. Affects compressed scenes and resources. - Default compression level for zstd. Affects compressed scenes and resources. + Default compression level for zstd. Affects compressed scenes and resources. - Enable long distance matching in zstd. + Enable long distance matching in zstd. @@ -227,91 +229,91 @@ - Maximum call stack allowed for debugging GDScript. + Maximum call stack allowed for debugging GDScript. - Maximum amount of functions per frame allowed when profiling. + Maximum amount of functions per frame allowed when profiling. - Print frames per second to stdout. Not very useful in general. + Print frames per second to stdout. Not very useful in general. - Print more information to stdout when running. It shows info such as memory leaks, which scenes and resources are being loaded, etc. + Print more information to stdout when running. It shows info such as memory leaks, which scenes and resources are being loaded, etc. - Maximum call stack in visual scripting, to avoid infinite recursion. + Maximum call stack in visual scripting, to avoid infinite recursion. - Custom image for the mouse cursor. + Custom image for the mouse cursor. - Hotspot for the custom mouse cursor image. + Hotspot for the custom mouse cursor image. - Allow per pixel transparency in a Desktop window. This affects performance if not needed, so leave it off. + Allow per pixel transparency in a Desktop window. This affects performance if not needed, so leave it off. - Allow HiDPI display on Windows and OSX. On Desktop Linux, this can't be enabled or disabled. + Allow HiDPI display on Windows and OSX. On Desktop Linux, this can't be enabled or disabled. - Force keep the screen on, so the screensaver does not take over. Works on Desktop and Mobile. + Force keep the screen on, so the screensaver does not take over. Works on Desktop and Mobile. - Default orientation for cell phone or tablet. + Default orientation for cell phone or tablet. - Force the window to be always on top. + Force the window to be always on top. - Force the window to be borderless. + Force the window to be borderless. - Set the window to full screen when it starts. + Set the window to full screen when it starts. - Set the main window height. On desktop, this is the default window size. Stretch mode settings use this also as a reference when enabled. + Set the main window height. On desktop, this is the default window size. Stretch mode settings use this also as a reference when enabled. - Allow the window to be resizable by default. + Allow the window to be resizable by default. - Test a different height for the window. The main use for this is to test with stretch modes. + Test a different height for the window. The main use for this is to test with stretch modes. - Test a different width for the window. The main use for this is to test with stretch modes. + Test a different width for the window. The main use for this is to test with stretch modes. - Set the main window width. On desktop, this is the default window size. Stretch mode settings use this also as a reference when enabled. + Set the main window width. On desktop, this is the default window size. Stretch mode settings use this also as a reference when enabled. - Use VSync. Don't be stupid, don't turn this off. + Use VSync. Don't be stupid, don't turn this off. - Internal editor setting, don't touch. + Internal editor setting, don't touch. - Enable swap OK and Cancel buttons on dialogs. This is because Windows/MacOS/Desktop Linux may use them in different order, so the GUI swaps them depending on the host OS. Disable this behavior by turning this setting off. + Enable swap OK and Cancel buttons on dialogs. This is because Windows/MacOS/Desktop Linux may use them in different order, so the GUI swaps them depending on the host OS. Disable this behavior by turning this setting off. - Use a custom theme resource, set a path to it here. + Use a custom theme resource, set a path to it here. - USe a custom default font resource, set a path to it here. + USe a custom default font resource, set a path to it here. - Make sure the theme used works with hidpi. + Make sure the theme used works with hidpi. - Timer setting for incremental search in Tree, IntemList, etc. controls. + Timer setting for incremental search in Tree, IntemList, etc. controls. - Timer for detecting idle in the editor. + Timer for detecting idle in the editor. @@ -508,178 +510,178 @@ - Log all output to a file. + Log all output to a file. - Path to logs withint he project. Using an user:// based path is recommended. + Path to logs withint he project. Using an user:// based path is recommended. - Amount of log files (used for rotation)/ + Amount of log files (used for rotation)/ - Godot uses a message queue to defer some function calls. If you run out of space on it (you will see an error), you can increase the size here. + Godot uses a message queue to defer some function calls. If you run out of space on it (you will see an error), you can increase the size here. - This is used by servers when used in multi threading mode (servers and visual). RIDs are preallocated to avoid stalling the server requesting them on threads. If servers get stalled too often when loading resources in a thread, increase this number. + This is used by servers when used in multi threading mode (servers and visual). RIDs are preallocated to avoid stalling the server requesting them on threads. If servers get stalled too often when loading resources in a thread, increase this number. - Maximum amount of characters allowed to send as output from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection. + Maximum amount of characters allowed to send as output from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection. - Maximum amount of errors allowed to send as output from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection. + Maximum amount of errors allowed to send as output from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection. - Maximum amount of messages allowed to send as output from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection. + Maximum amount of messages allowed to send as output from the debugger. Over this value, content is dropped. This helps not to stall the debugger connection. - Default size of packet peer stream for deserializing godot data. Over this size, data is dropped. + Default size of packet peer stream for deserializing godot data. Over this size, data is dropped. - Maximum amount of pages used for remote filesystem (used by debugging). + Maximum amount of pages used for remote filesystem (used by debugging). - Amount of read ahead used by remote filesystem. Improves latency. + Amount of read ahead used by remote filesystem. Improves latency. - Page size used by remote filesystem. + Page size used by remote filesystem. - If your game or application uses HTTPS, a certificates file is needed. It must be set here. + If your game or application uses HTTPS, a certificates file is needed. It must be set here. - When creating nodes names automatically, set the type of casing in this project. This is mostly an editor setting. + When creating nodes names automatically, set the type of casing in this project. This is mostly an editor setting. - What to use to separate node name from number. This is mostly an editor setting. + What to use to separate node name from number. This is mostly an editor setting. - Set whether physics is run on the main thread or a separate one. Running the server on a thread increases performance, but restricts API Access to only physics process. + Set whether physics is run on the main thread or a separate one. Running the server on a thread increases performance, but restricts API Access to only physics process. - Frames per second used in the physics. Physics always needs a fixed amount of frames per second. + Frames per second used in the physics. Physics always needs a fixed amount of frames per second. - Fix to improve physics jitter, specially on monitors where refresh rate is different than physics FPS. + Fix to improve physics jitter, specially on monitors where refresh rate is different than physics FPS. - Default background clear color. + Default background clear color. - Max buffer size for blend shapes. Any blend shape bigger than this will not work. + Max buffer size for blend shapes. Any blend shape bigger than this will not work. - Max buffer size for drawing polygons. Any polygon bigger than this will not work. + Max buffer size for drawing polygons. Any polygon bigger than this will not work. - Max index buffer size for drawing polygons. Any polygon bigger than this will not work. + Max index buffer size for drawing polygons. Any polygon bigger than this will not work. - Max buffer size for drawing immediate objects (ImmediateGeometry nodes). Nodes using more than this size will not work. + Max buffer size for drawing immediate objects (ImmediateGeometry nodes). Nodes using more than this size will not work. - Max amount of elements renderable in a frame. If more than this are visible per frame, they will be dropped. Keep in mind elements refer to mesh surfaces and not mesh themselves. + Max amount of elements renderable in a frame. If more than this are visible per frame, they will be dropped. Keep in mind elements refer to mesh surfaces and not mesh themselves. - Shaders have a time variable that constantly increases. At some point it needs to be rolled back to zero to avoid numerical errors on shader animations. This setting specifies when. + Shaders have a time variable that constantly increases. At some point it needs to be rolled back to zero to avoid numerical errors on shader animations. This setting specifies when. - Force snapping of polygons to pixels in 2D rendering. May help in some pixel art styles. + Force snapping of polygons to pixels in 2D rendering. May help in some pixel art styles. - Disable depth pre-pass for some GPU vendors (usually mobile), as their architecture already does this. + Disable depth pre-pass for some GPU vendors (usually mobile), as their architecture already does this. - Do a previous depth pass before rendering materials. This increases performance in scenes with high overdraw, when complex materials and lighting are used. + Do a previous depth pass before rendering materials. This increases performance in scenes with high overdraw, when complex materials and lighting are used. - Size in pixels of the directional shadow. + Size in pixels of the directional shadow. - Maximum Anisotropic filter level used for textures when anisotropy enabled. + Maximum Anisotropic filter level used for textures when anisotropy enabled. - Force to use nearest mipmap filtering when using mipmaps. This may increase performance in mobile as less memory bandwidth is used. + Force to use nearest mipmap filtering when using mipmaps. This may increase performance in mobile as less memory bandwidth is used. - Strategy used for framebuffer allocation. The simpler it is, the less memory it uses (but the least features it supports). + Strategy used for framebuffer allocation. The simpler it is, the less memory it uses (but the least features it supports). - For reflection probes and panorama backgrounds (sky), use a high amount of samples to create ggx blurred versions (used for roughness). + For reflection probes and panorama backgrounds (sky), use a high amount of samples to create ggx blurred versions (used for roughness). - For reflection probes and panorama backgrounds (sky), use a texure array instead of mipmaps. This reduces jitter noise on reflections, but costs more performance and memory. + For reflection probes and panorama backgrounds (sky), use a texure array instead of mipmaps. This reduces jitter noise on reflections, but costs more performance and memory. - Force vertex shading for all rendering. This can increase performance a lot, but also reduces quality inmensely. Can work to optimize on very low end mobile. + Force vertex shading for all rendering. This can increase performance a lot, but also reduces quality inmensely. Can work to optimize on very low end mobile. - Subdivision quadrant size for shadow mapping. See shadow mapping documentation. + Subdivision quadrant size for shadow mapping. See shadow mapping documentation. - Subdivision quadrant size for shadow mapping. See shadow mapping documentation. + Subdivision quadrant size for shadow mapping. See shadow mapping documentation. - Subdivision quadrant size for shadow mapping. See shadow mapping documentation. + Subdivision quadrant size for shadow mapping. See shadow mapping documentation. - Subdivision quadrant size for shadow mapping. See shadow mapping documentation. + Subdivision quadrant size for shadow mapping. See shadow mapping documentation. - Size for shadow atlas (used for point and omni lights). See documentation. + Size for shadow atlas (used for point and omni lights). See documentation. - Shadow filter mode. The more complex the filter, the more memory bandwidth required. + Shadow filter mode. The more complex the filter, the more memory bandwidth required. - Improves quality of subsurface scattering, but cost significantly increases. + Improves quality of subsurface scattering, but cost significantly increases. - Quality setting for subsurface scaterring (samples taken). + Quality setting for subsurface scaterring (samples taken). - Weight subsurface scattering samples. Helps to avoid reading samples from unrelated parts of the screen. + Weight subsurface scattering samples. Helps to avoid reading samples from unrelated parts of the screen. - Use high quality voxel cone tracing (looks better, but requires a higher end GPU). + Use high quality voxel cone tracing (looks better, but requires a higher end GPU). - Thread model for rendering. Rendering on a thread can vastly improve performance, but syncinc to the main thread can cause a bit more jitter. + Thread model for rendering. Rendering on a thread can vastly improve performance, but syncinc to the main thread can cause a bit more jitter. - If the project uses this compression (usually low end mobile), texture importer will import these. + If the project uses this compression (usually low end mobile), texture importer will import these. - If the project uses this compression (usually high end mobile), texture importer will import these. + If the project uses this compression (usually high end mobile), texture importer will import these. - If the project uses this compression (usually iOS), texture importer will import these. + If the project uses this compression (usually iOS), texture importer will import these. - If the project uses this compression (usually Desktop and Consoles), texture importer will import these. + If the project uses this compression (usually Desktop and Consoles), texture importer will import these. diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 3a32c3f40f..542dca74e0 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -233,15 +233,13 @@ void DocData::generate(bool p_basic_types) { c.category = ClassDB::get_category(name); List properties; - if (name=="ProjectSettings") { + if (name == "ProjectSettings") { //special case for project settings, so settings can be documented ProjectSettings::get_singleton()->get_property_list(&properties); } else { ClassDB::get_property_list(name, &properties, true); } - - for (List::Element *E = properties.front(); E; E = E->next()) { if (E->get().usage & PROPERTY_USAGE_GROUP || E->get().usage & PROPERTY_USAGE_CATEGORY || E->get().usage & PROPERTY_USAGE_INTERNAL) continue; diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 63336d43bd..05806d2fe8 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -332,7 +332,7 @@ def configure(env): # First figure out which compiler, version, and target arch we're using if os.getenv("VCINSTALLDIR"): - # Manual setup of MSVC + # Manual setup of MSVC setup_msvc_manual(env) env.msvc = True manual_msvc_config = True -- cgit v1.2.3