diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-22 22:02:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-22 22:02:47 +0100 |
commit | b255744e0f2c142763f8f383731513a491a711c3 (patch) | |
tree | b6880029ff49c4c35f73313351af58fc1395d8e5 | |
parent | 37897dba80ae88785ca1cc7e0a717a6b15081a5b (diff) | |
parent | b4770c0a2781f203cd6a5eeaa92164ac56d2ca6a (diff) |
Merge pull request #35449 from bojidar-bg/35439-scenetree-settings
Add settings from SceneTree in the documentation
-rw-r--r-- | doc/classes/ProjectSettings.xml | 50 | ||||
-rw-r--r-- | editor/doc/doc_data.cpp | 2 |
2 files changed, 52 insertions, 0 deletions
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index c5a67d5d95..323a510f09 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -386,6 +386,16 @@ <member name="debug/settings/visual_script/max_call_stack" type="int" setter="" getter="" default="1024"> Maximum call stack in visual scripting, to avoid infinite recursion. </member> + <member name="debug/shapes/collision/contact_color" type="Color" setter="" getter="" default="Color( 1, 0.2, 0.1, 0.8 )"> + </member> + <member name="debug/shapes/collision/max_contacts_displayed" type="int" setter="" getter="" default="10000"> + </member> + <member name="debug/shapes/collision/shape_color" type="Color" setter="" getter="" default="Color( 0, 0.6, 0.7, 0.5 )"> + </member> + <member name="debug/shapes/navigation/disabled_geometry_color" type="Color" setter="" getter="" default="Color( 1, 0.7, 0.1, 0.4 )"> + </member> + <member name="debug/shapes/navigation/geometry_color" type="Color" setter="" getter="" default="Color( 0.1, 1, 0.7, 0.4 )"> + </member> <member name="display/mouse_cursor/custom_image" type="String" setter="" getter="" default=""""> Custom image for the mouse cursor (limited to 256×256). </member> @@ -468,6 +478,8 @@ <member name="gui/timers/text_edit_idle_detect_sec" type="float" setter="" getter="" default="3"> Timer for detecting idle in the editor (in seconds). </member> + <member name="gui/timers/tooltip_delay_sec" type="float" setter="" getter="" default="0.5"> + </member> <member name="input/ui_accept" type="Dictionary" setter="" getter=""> </member> <member name="input/ui_cancel" type="Dictionary" setter="" getter=""> @@ -730,20 +742,46 @@ <member name="node/name_num_separator" type="int" setter="" getter="" default="0"> What to use to separate node name from number. This is mostly an editor setting. </member> + <member name="physics/2d/bp_hash_table_size" type="int" setter="" getter="" default="4096"> + </member> + <member name="physics/2d/cell_size" type="int" setter="" getter="" default="128"> + </member> + <member name="physics/2d/default_angular_damp" type="float" setter="" getter="" default="1.0"> + </member> <member name="physics/2d/default_gravity" type="int" setter="" getter="" default="98"> </member> + <member name="physics/2d/default_gravity_vector" type="Vector2" setter="" getter="" default="Vector2( 0, 1 )"> + </member> + <member name="physics/2d/default_linear_damp" type="float" setter="" getter="" default="0.1"> + </member> + <member name="physics/2d/large_object_surface_threshold_in_cells" type="int" setter="" getter="" default="512"> + </member> <member name="physics/2d/physics_engine" type="String" setter="" getter="" default=""DEFAULT""> </member> + <member name="physics/2d/sleep_threshold_angular" type="float" setter="" getter="" default="0.139626"> + </member> + <member name="physics/2d/sleep_threshold_linear" type="float" setter="" getter="" default="2.0"> + </member> <member name="physics/2d/thread_model" type="int" setter="" getter="" default="1"> Sets 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. </member> + <member name="physics/2d/time_before_sleep" type="float" setter="" getter="" default="0.5"> + </member> <member name="physics/3d/active_soft_world" type="bool" setter="" getter="" default="true"> </member> + <member name="physics/3d/default_angular_damp" type="float" setter="" getter="" default="0.1"> + </member> <member name="physics/3d/default_gravity" type="float" setter="" getter="" default="9.8"> </member> + <member name="physics/3d/default_gravity_vector" type="Vector3" setter="" getter="" default="Vector3( 0, -1, 0 )"> + </member> + <member name="physics/3d/default_linear_damp" type="float" setter="" getter="" default="0.1"> + </member> <member name="physics/3d/physics_engine" type="String" setter="" getter="" default=""DEFAULT""> Sets which physics engine to use. </member> + <member name="physics/common/enable_object_picking" type="bool" setter="" getter="" default="true"> + </member> <member name="physics/common/physics_fps" type="int" setter="" getter="" default="60"> Frames per second used in the physics. Physics always needs a fixed amount of frames per second. </member> @@ -753,6 +791,8 @@ <member name="rendering/environment/default_clear_color" type="Color" setter="" getter="" default="Color( 0.3, 0.3, 0.3, 1 )"> Default background clear color. Overridable per [Viewport] using its [Environment]. See [member Environment.background_mode] and [member Environment.background_color] in particular. To change this default color programmatically, use [method VisualServer.set_default_clear_color]. </member> + <member name="rendering/environment/default_environment" type="String" setter="" getter="" default=""""> + </member> <member name="rendering/limits/buffers/blend_shape_max_buffer_size_kb" type="int" setter="" getter="" default="4096"> Max buffer size for blend shapes. Any blend shape bigger than this will not work. </member> @@ -784,6 +824,10 @@ <member name="rendering/quality/2d/use_pixel_snap" type="bool" setter="" getter="" default="false"> If [code]true[/code], forces snapping of polygons to pixels in 2D rendering. May help in some pixel art styles. </member> + <member name="rendering/quality/depth/hdr" type="bool" setter="" getter="" default="true"> + </member> + <member name="rendering/quality/depth/hdr.mobile" type="bool" setter="" getter="" default="false"> + </member> <member name="rendering/quality/depth_prepass/disable_for_vendors" type="String" setter="" getter="" default=""PowerVR,Mali,Adreno,Apple""> Disables depth pre-pass for some GPU vendors (usually mobile), as their architecture already does this. </member> @@ -806,6 +850,8 @@ <member name="rendering/quality/filters/anisotropic_filter_level" type="int" setter="" getter="" default="4"> Maximum anisotropic filter level used for textures with anisotropy enabled. Higher values will result in sharper textures when viewed from oblique angles, at the cost of performance. Only power-of-two values are valid (2, 4, 8, 16). </member> + <member name="rendering/quality/filters/msaa" type="int" setter="" getter="" default="0"> + </member> <member name="rendering/quality/filters/use_nearest_mipmap_filter" type="bool" setter="" getter="" default="false"> If [code]true[/code], uses nearest-neighbor mipmap filtering when using mipmaps (also called "bilinear filtering"), which will result in visible seams appearing between mipmap stages. This may increase performance in mobile as less memory bandwidth is used. If [code]false[/code], linear mipmap filtering (also called "trilinear filtering") is used. </member> @@ -814,6 +860,10 @@ </member> <member name="rendering/quality/intended_usage/framebuffer_allocation.mobile" type="int" setter="" getter="" default="3"> </member> + <member name="rendering/quality/reflections/atlas_size" type="int" setter="" getter="" default="2048"> + </member> + <member name="rendering/quality/reflections/atlas_subdiv" type="int" setter="" getter="" default="8"> + </member> <member name="rendering/quality/reflections/high_quality_ggx" type="bool" setter="" getter="" default="true"> If [code]true[/code], uses a high amount of samples to create blurred variants of reflection probes and panorama backgrounds (sky). Those blurred variants are used by rough materials. </member> diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index f9f8761247..26970446f5 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -233,6 +233,8 @@ void DocData::generate(bool p_basic_types) { List<StringName> classes; ClassDB::get_class_list(&classes); classes.sort_custom<StringName::AlphCompare>(); + // Move ProjectSettings, so that other classes can register properties there + classes.move_to_back(classes.find("ProjectSettings")); bool skip_setter_getter_methods = true; |