Merge branch 'main' into multimodsfol-v2

Author: UE4SS

README.md

@@ -29,9 +29,12 @@ If your game is in the custom config list, extract the contents from the relevan
 
 If you are planning on doing mod development using UE4SS, you can do the same as above but download the zDEV version instead.
 
-### Disabling UE4SS Temporarily
+### Command Line Options
 
-If RE-UE4SS is installed via proxy DLL, you can temporarily disable it without uninstalling by launching the game with the `--disable-ue4ss` command line argument. 
+If RE-UE4SS is installed via proxy DLL, the following command line options are available:
+
+- `--disable-ue4ss` - Temporarily disable UE4SS without uninstalling by launching the game with this argument.
+- `--ue4ss-path <path>` - Specify a custom path to UE4SS.dll. Supports both absolute paths (e.g., `C:\custom\UE4SS.dll`) and relative paths (e.g., `dev\builds\UE4SS.dll` relative to the game executable directory). Useful for testing different UE4SS builds without modifying installation files. 
 
 ## Links
 

UE4SS/generated_include/MacroSetter.hpp

@@ -146,6 +146,10 @@ if (auto val = parser.get_int64(STR("UFunction"), STR("EventGraphCallOffset"), -
     Unreal::UFunction::MemberOffsets.emplace(STR("EventGraphCallOffset"), static_cast<int32_t>(val));
 if (auto val = parser.get_int64(STR("UFunction"), STR("Func"), -1); val != -1)
     Unreal::UFunction::MemberOffsets.emplace(STR("Func"), static_cast<int32_t>(val));
+if (auto val = parser.get_int64(STR("USparseDelegateFunction"), STR("OwningClassName"), -1); val != -1)
+    Unreal::USparseDelegateFunction::MemberOffsets.emplace(STR("OwningClassName"), static_cast<int32_t>(val));
+if (auto val = parser.get_int64(STR("USparseDelegateFunction"), STR("DelegateName"), -1); val != -1)
+    Unreal::USparseDelegateFunction::MemberOffsets.emplace(STR("DelegateName"), static_cast<int32_t>(val));
 if (auto val = parser.get_int64(STR("UField"), STR("Next"), -1); val != -1)
     Unreal::UField::MemberOffsets.emplace(STR("Next"), static_cast<int32_t>(val));
 if (auto val = parser.get_int64(STR("FField"), STR("ClassPrivate"), -1); val != -1)

UE4SS/include/LuaType/LuaFString.hpp

@@ -1,36 +1,5 @@
 #pragma once
 
-#include <LuaType/LuaUObject.hpp>
+// Forward include of this to the new Lua Unreal String file for backwards compatability
+#include <LuaType/LuaUnrealString.hpp>
 
-namespace RC::Unreal
-{
-    class FString;
-}
-
-namespace RC::LuaType
-{
-    struct FStringName
-    {
-        constexpr static const char* ToString()
-        {
-            return "FString";
-        }
-    };
-    class FString : public LocalObjectBase<Unreal::FString, FStringName>
-    {
-      private:
-        explicit FString(Unreal::FString* object);
-
-      public:
-        FString() = delete;
-        auto static construct(const LuaMadeSimple::Lua&, Unreal::FString*) -> const LuaMadeSimple::Lua::Table;
-        auto static construct(const LuaMadeSimple::Lua&, BaseObject&) -> const LuaMadeSimple::Lua::Table;
-
-      private:
-        auto static setup_metamethods(BaseObject&) -> void;
-
-      private:
-        template <LuaMadeSimple::Type::IsFinal is_final>
-        auto static setup_member_functions(const LuaMadeSimple::Lua::Table&) -> void;
-    };
-} // namespace RC::LuaType

UE4SS/include/LuaType/LuaUObject.hpp

@@ -384,8 +384,13 @@ namespace RC::LuaType
     RC_UE4SS_API auto push_nameproperty(const PusherParams&) -> void;
     RC_UE4SS_API auto push_textproperty(const PusherParams&) -> void;
     RC_UE4SS_API auto push_strproperty(const PusherParams&) -> void;
+    RC_UE4SS_API auto push_utf8strproperty(const PusherParams&) -> void;
+    RC_UE4SS_API auto push_ansistrproperty(const PusherParams&) -> void;
     RC_UE4SS_API auto push_softobjectproperty(const PusherParams&) -> void;
     RC_UE4SS_API auto push_interfaceproperty(const PusherParams&) -> void;
+    RC_UE4SS_API auto push_delegateproperty(const PusherParams&) -> void;
+    RC_UE4SS_API auto push_multicastdelegateproperty(const PusherParams&) -> void;
+    RC_UE4SS_API auto push_multicastsparsedelegateproperty(const PusherParams&) -> void;
 
     RC_UE4SS_API auto push_functionproperty(const FunctionPusherParams&) -> void;
     // Push to Lua -> END