diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 289c9869174..9a863ab86b0 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -5182,8 +5182,26 @@
Base class for Box containers. It arranges children controls vertically or horizontally, and rearranges them automatically when their minimum size changes.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -13239,6 +13257,14 @@
+
+
+
+
+
+
+
+
@@ -14375,7 +14401,7 @@
-
+
@@ -14964,7 +14990,7 @@
-
+
Control that displays formatted text.
@@ -15105,20 +15131,6 @@
Return the restricted number of characters to display (as a percentage of the total text).
-
-
-
-
- Restricts the number of lines to display. Set to -1 to disable.
-
-
-
-
-
-
- Return the restricted number of lines to display. Returns -1 if unrestricted.
-
-
@@ -15133,6 +15145,20 @@
Return the the number of lines to skipped before displaying.
+
+
+
+
+ Restricts the number of lines to display. Set to -1 to disable.
+
+
+
+
+
+
+ Return the restricted number of lines to display. Returns -1 if unrestricted.
+
+
@@ -15912,6 +15938,10 @@
+
+
+
+
@@ -30272,6 +30302,12 @@
Return the amount of bones in the skeleton.
+
+
+
+
+
+
@@ -30290,6 +30326,22 @@
Set the rest transform for bone "bone_idx"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -34789,13 +34841,14 @@
A TileSet is a library of tiles for a [TileMap]. It contains a list of tiles, each consisting of a sprite and optional collision shapes.
+ Tiles are referenced by a unique integer ID.
- Create a new tile, the ID must be specified.
+ Create a new tile which will be referenced by the given ID.
@@ -34804,7 +34857,7 @@
- Set the name of a tile, for decriptive purposes.
+ Set the name of the tile, for descriptive purposes.
@@ -34813,7 +34866,7 @@
- Return the name of a tile, for decriptive purposes.
+ Return the name of the tile.
@@ -34840,6 +34893,7 @@
+ Set the material of the tile.
@@ -34848,6 +34902,7 @@
+ Return the material of the tile.
@@ -34856,6 +34911,7 @@
+ Set the texture offset of the tile.
@@ -34864,6 +34920,7 @@
+ Return the texture offset of the tile.
@@ -34872,6 +34929,7 @@
+ Set the shape offset of the tile.
@@ -34880,6 +34938,7 @@
+ Return the shape offset of the tile.
@@ -34897,7 +34956,7 @@
- Return the tile sub-region in the texture. This is common in texture atlases.
+ Return the tile sub-region in the texture.
@@ -34924,6 +34983,7 @@
+ Set an array of shapes for the tile, enabling physics to collide with it.
@@ -34932,6 +34992,7 @@
+ Return the array of shapes of the tile.
@@ -34940,6 +35001,7 @@
+ Set a navigation polygon for the tile.
@@ -34948,6 +35010,7 @@
+ Return the navigation polygon of the tile.
@@ -34956,6 +35019,7 @@
+ Set an offset for the tile's navigation polygon.
@@ -34964,6 +35028,7 @@
+ Return the offset of the tile's navigation polygon.
@@ -34972,6 +35037,7 @@
+ Set a light occluder for the tile.
@@ -34980,6 +35046,7 @@
+ Return the light occluder of the tile.
@@ -34988,6 +35055,7 @@
+ Set an offset for the tile's light occluder.
@@ -34996,13 +35064,14 @@
+ Return the offset of the tile's light occluder.
- Remove a tile, by integer id.
+ Remove the tile referenced by the given ID.
@@ -35014,7 +35083,7 @@
- Find an empty id for creating a new tile.
+ Return the ID following the last currently used ID, useful when creating a new tile.
@@ -35023,13 +35092,14 @@
- Find the first tile with the given name.
+ Find the first tile matching the given name.
+ Return an array of all currently used tile IDs.
@@ -35040,35 +35110,35 @@
- Timer node. This is a simple node that will emit a timeout callback when the timer runs out. It can optinally be set to loop.
+ Timer node. This is a simple node that will emit a timeout callback when the timer runs out. It can optionally be set to loop.
- Set wait time. When the time is over, it will emit the timeout signal.
+ Set wait time in seconds. When the time is over, it will emit the timeout signal.
- Return the wait time. When the time is over, it will emit the timeout signal.
+ Return the wait time in seconds.
- Set as one-shot. If true, timer will stop after timeout, otherwise it will automatically restart.
+ Set as one-shot. If enabled, the timer will stop after timeout, otherwise it will automatically restart.
- Return true if is set as one-shot. If true, timer will stop after timeout, otherwise it will automatically restart.
+ Return true if configured as one-shot.
@@ -35099,19 +35169,21 @@
- Return the time left for timeout if the timer is active.
+ Return the time left for timeout in seconds if the timer is active, 0 otherwise.
+ Set the timer's processing mode (fixed or idle, use TIMER_PROCESS_* constants as argument).
+ Return the timer's processing mode.
@@ -35123,6 +35195,12 @@
+
+ Update the timer at fixed intervals (framerate processing).
+
+
+ Update the timer during the idle time at each frame.
+
diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp
index 3a80382a40e..1bd22a9db18 100644
--- a/scene/main/timer.cpp
+++ b/scene/main/timer.cpp
@@ -182,11 +182,14 @@ void Timer::_bind_methods() {
ADD_SIGNAL( MethodInfo("timeout") );
- ADD_PROPERTY(PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), _SCS("set_timer_process_mode"), _SCS("get_timer_process_mode"));
+ ADD_PROPERTY( PropertyInfo(Variant::INT, "process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), _SCS("set_timer_process_mode"), _SCS("get_timer_process_mode") );
ADD_PROPERTY( PropertyInfo(Variant::REAL, "wait_time", PROPERTY_HINT_EXP_RANGE, "0.01,4096,0.01" ), _SCS("set_wait_time"), _SCS("get_wait_time") );
ADD_PROPERTY( PropertyInfo(Variant::BOOL, "one_shot" ), _SCS("set_one_shot"), _SCS("is_one_shot") );
ADD_PROPERTY( PropertyInfo(Variant::BOOL, "autostart" ), _SCS("set_autostart"), _SCS("has_autostart") );
+ BIND_CONSTANT( TIMER_PROCESS_FIXED );
+ BIND_CONSTANT( TIMER_PROCESS_IDLE );
+
}
Timer::Timer() {