diff options
| -rw-r--r-- | doc/base/classes.xml | 1 | ||||
| -rw-r--r-- | drivers/nrex/regex.cpp | 9 | ||||
| -rw-r--r-- | drivers/nrex/regex.h | 1 | ||||
| -rw-r--r-- | platform/windows/joystick.cpp | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml index b1871632d0..0c7bbba85e 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -12968,6 +12968,7 @@ verify_host will check the SSL identity of the host if set to true. <return type="Dictionary"> </return> <description> + Returns all response headers as dictionary where the keys and values are transformed to lower case. A key with more than one value is a simple string with "; " as separator. example: (content-length:12), (content-type:application/json; charset=utf-8) </description> </method> <method name="get_response_body_length" qualifiers="const"> diff --git a/drivers/nrex/regex.cpp b/drivers/nrex/regex.cpp index 459cf28e1e..5d6c9583ef 100644 --- a/drivers/nrex/regex.cpp +++ b/drivers/nrex/regex.cpp @@ -21,6 +21,7 @@ void RegEx::_bind_methods() { ObjectTypeDB::bind_method(_MD("is_valid"),&RegEx::is_valid); ObjectTypeDB::bind_method(_MD("get_capture_count"),&RegEx::get_capture_count); ObjectTypeDB::bind_method(_MD("get_capture","capture"),&RegEx::get_capture); + ObjectTypeDB::bind_method(_MD("get_capture_start","capture"),&RegEx::get_capture_start); ObjectTypeDB::bind_method(_MD("get_captures"),&RegEx::_bind_get_captures); }; @@ -68,6 +69,14 @@ String RegEx::get_capture(int capture) const { } +int RegEx::get_capture_start(int capture) const { + + ERR_FAIL_COND_V( get_capture_count() <= capture, -1 ); + + return captures[capture].start; + +} + Error RegEx::compile(const String& p_pattern, int capture) { clear(); diff --git a/drivers/nrex/regex.h b/drivers/nrex/regex.h index ae8d40ceab..4b063f0bf1 100644 --- a/drivers/nrex/regex.h +++ b/drivers/nrex/regex.h @@ -35,6 +35,7 @@ public: void clear(); bool is_valid() const; int get_capture_count() const; + int get_capture_start(int capture) const; String get_capture(int capture) const; Error compile(const String& p_pattern, int capture = 9); int find(const String& p_text, int p_start = 0, int p_end = -1) const; diff --git a/platform/windows/joystick.cpp b/platform/windows/joystick.cpp index f4fb09820f..f8526b5ec1 100644 --- a/platform/windows/joystick.cpp +++ b/platform/windows/joystick.cpp @@ -472,7 +472,7 @@ InputDefault::JoyAxis joystick_windows::axis_correct(int p_val, bool p_xinput, b InputDefault::JoyAxis jx; if (Math::abs(p_val) < MIN_JOY_AXIS) { - jx.min = -1; + jx.min = p_trigger ? 0 : -1; jx.value = 0.0f; return jx; } |