Merge branch 'main' into auto-luamod-reload-rebase2

Author: UE4SS

CMakeLists.txt

@@ -59,8 +59,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/$<CONFIG>/${CMAKE_INSTALL
 add_subdirectory("cmake/modules/CompilerOptions")
 
 # Set compiler options
-add_compile_options("$<$<NOT:$<COMPILE_LANGUAGE:ASM_MASM>>:${DEFAULT_COMPILER_FLAGS}>")
-add_link_options("${DEFAULT_SHARED_LINKER_FLAGS}" "${DEFAULT_EXE_LINKER_FLAGS}")
+# NOTE: Do NOT use add_compile_options/add_link_options here as they won't propagate to external consumers
+# Instead, these are applied via apply_compiler_settings_to_targets() which uses target_*_options with PUBLIC
+# visibility on the UE4SS target, ensuring proper propagation to downstream projects
+# add_compile_options("$<$<NOT:$<COMPILE_LANGUAGE:ASM_MASM>>:${DEFAULT_COMPILER_FLAGS}>")
+# add_link_options("${DEFAULT_SHARED_LINKER_FLAGS}" "${DEFAULT_EXE_LINKER_FLAGS}")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # Initialize Compiler flags after compiler detection.

README.md

@@ -27,7 +27,14 @@ The easiest installation is via downloading the non-dev version of the latest no
 
 If your game is in the custom config list, extract the contents from the relevant folder to `Win64` as well.
 
-If you are planning on doing mod development using UE4SS, you can do the same as above but download the zDEV version instead. 
+If you are planning on doing mod development using UE4SS, you can do the same as above but download the zDEV version instead.
+
+### Command Line Options
+
+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/CMakeLists.txt

@@ -45,19 +45,6 @@ else()
     set(UE4SS_LIB_BUILD_GITSHA "no-git")
 endif()
 
-# Add version definitions
-add_compile_definitions(
-    UE4SS_LIB_VERSION_MAJOR=${UE4SS_LIB_VERSION_MAJOR}
-    UE4SS_LIB_VERSION_MINOR=${UE4SS_LIB_VERSION_MINOR}
-    UE4SS_LIB_VERSION_HOTFIX=${UE4SS_LIB_VERSION_HOTFIX}
-    UE4SS_LIB_VERSION_PRERELEASE=${UE4SS_LIB_VERSION_PRERELEASE}
-    UE4SS_LIB_VERSION_BETA=${UE4SS_LIB_VERSION_BETA}
-    UE4SS_LIB_BETA_STARTED=$<BOOL:${UE4SS_LIB_BETA_IS_STARTED}>
-    UE4SS_LIB_IS_BETA=$<BOOL:${UE4SS_LIB_IS_BETA}>
-    UE4SS_LIB_BUILD_GITSHA="${UE4SS_LIB_BUILD_GITSHA}"
-    UE4SS_CONFIGURATION="$<CONFIG>"
-)
-
 message("UE4SS Version: ${UE4SS_LIB_VERSION_MAJOR}.${UE4SS_LIB_VERSION_MINOR}.${UE4SS_LIB_VERSION_HOTFIX}.${UE4SS_LIB_VERSION_PRERELEASE}.${UE4SS_LIB_VERSION_BETA} (${UE4SS_LIB_BUILD_GITSHA})")
 
 # ---------------------------------------------------------------------------
@@ -75,11 +62,24 @@ add_library(UE4SS SHARED ${UE4SS_SOURCES})
 target_compile_features(UE4SS PUBLIC cxx_std_23)
 
 # Add include directories
-target_include_directories(UE4SS PUBLIC 
+target_include_directories(UE4SS PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/generated_include>
 )
 
+# Add version definitions with PUBLIC visibility so external consumers get them
+target_compile_definitions(UE4SS PUBLIC
+    UE4SS_LIB_VERSION_MAJOR=${UE4SS_LIB_VERSION_MAJOR}
+    UE4SS_LIB_VERSION_MINOR=${UE4SS_LIB_VERSION_MINOR}
+    UE4SS_LIB_VERSION_HOTFIX=${UE4SS_LIB_VERSION_HOTFIX}
+    UE4SS_LIB_VERSION_PRERELEASE=${UE4SS_LIB_VERSION_PRERELEASE}
+    UE4SS_LIB_VERSION_BETA=${UE4SS_LIB_VERSION_BETA}
+    UE4SS_LIB_BETA_STARTED=$<BOOL:${UE4SS_LIB_BETA_IS_STARTED}>
+    UE4SS_LIB_IS_BETA=$<BOOL:${UE4SS_LIB_IS_BETA}>
+    UE4SS_LIB_BUILD_GITSHA="${UE4SS_LIB_BUILD_GITSHA}"
+    UE4SS_CONFIGURATION="$<CONFIG>"
+)
+
 # Add headers as sources for IDE integration
 target_sources(UE4SS PUBLIC
     FILE_SET ue4ss_headers TYPE HEADERS
@@ -137,7 +137,8 @@ target_link_libraries(UE4SS PUBLIC
 # Enable link-time optimization
 set_property(TARGET UE4SS PROPERTY INTERPROCEDURAL_OPTIMIZATION ON)
 
-# Set runtime library to DLL for C++ mods compatibility
+# Set runtime library to dynamic CRT (/MD, /MDd)
+# This matches Visual Studio's default, so external mods don't need to set it explicitly.
 set_property(TARGET UE4SS PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 
 # Set output name and standard

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/GUI/LiveView.hpp

@@ -99,6 +99,8 @@ namespace RC::GUI
         bool m_modal_edit_property_value_is_open{};
         bool m_modal_edit_property_value_opened_this_frame{};
         bool m_modal_edit_property_value_error_unable_to_edit{};
+        bool m_modal_search_by_address_error_not_hex{};
+        bool m_modal_search_by_address_error_out_of_range{};
         bool m_listeners_set{};
         bool m_listeners_allowed{};
         bool m_is_initialized{};
@@ -140,6 +142,7 @@ namespace RC::GUI
         static bool s_watches_loaded_from_disk;
         static bool s_filters_loaded_from_disk;
         static bool s_use_regex_for_search;
+        static bool s_search_by_address;
 
       private:
         enum class AffectsHistory

UE4SS/include/LuaLibrary.hpp

@@ -31,6 +31,7 @@ namespace RC::LuaLibrary
 
     // Global Lua functions are meant to be called with intact Lua stack
     auto global_print(const LuaMadeSimple::Lua&) -> int;
+    auto load_export(const LuaMadeSimple::Lua&) -> int;
 
     // Used exclusively for the scripts inside the 'UE4SS_Signatures' folder
     auto deref_to_int32(const LuaMadeSimple::Lua&) -> int;

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/LuaUDataTable.hpp

@@ -17,17 +17,14 @@ namespace RC::LuaType
         }
     };
 
-    class UDataTable : public RemoteObjectBase<Unreal::UDataTable, UDataTableName>
+    class UDataTable : public UObjectBase<Unreal::UDataTable, UDataTableName>
     {
-    private:
-        explicit UDataTable(const PusherParams&);
-
     public:
+        explicit UDataTable(Unreal::UDataTable* object);
         UDataTable() = delete;
 
-        auto static construct(const PusherParams&) -> const LuaMadeSimple::Lua::Table;
-        auto static construct(const LuaMadeSimple::Lua&, BaseObject&) -> const LuaMadeSimple::Lua::Table;
         auto static construct(const LuaMadeSimple::Lua& lua, Unreal::UDataTable* unreal_object) -> const LuaMadeSimple::Lua::Table;
+        auto static construct(const LuaMadeSimple::Lua&, BaseObject&) -> const LuaMadeSimple::Lua::Table;
 
     private:
         auto static setup_metamethods(BaseObject&) -> void;

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
@@ -716,8 +721,8 @@ No overload found for function 'UObject.ProcessConsoleExec'.
 
             table.add_pair("IsValid", [](const LuaMadeSimple::Lua& lua) -> int {
                 const auto& lua_object = lua.get_userdata<SelfType>();
-                if (lua_object.get_remote_cpp_object() && !lua_object.get_remote_cpp_object()->IsUnreachable() &&
-                    is_object_in_global_unreal_object_map(lua_object.get_remote_cpp_object()))
+                if (lua_object.get_remote_cpp_object() && is_object_in_global_unreal_object_map(lua_object.get_remote_cpp_object()) &&
+                    !lua_object.get_remote_cpp_object()->IsUnreachable())
                 {
                     lua.set_bool(true);
                 }