merge

.gitea/workflows/unreal-build.yml

@@ -3,7 +3,7 @@ name: Unreal Engine Build
 on:
   workflow_dispatch:
   push:
-    branches: [ main, develop ]
+    branches: [main, develop]
 
 jobs:
   # windows-build:
@@ -14,22 +14,22 @@ jobs:
   #       with:
   #         lfs: true
   #         fetch-depth: 0
-      
+
   #     - name: Setup Unreal Engine
   #       run: |
   #         # Ensure Unreal Engine is installed and set up
   #         # This assumes you have Unreal Engine installed on your runner
   #         # If not, you can add installation steps here
-          
+
   #         # Set environment variables for Unreal Engine
   #         echo "UE_ROOT=C:\Program Files\Epic Games\UE_5.2" >> $GITHUB_ENV
-          
+
   #     - name: Build Unreal Project
   #       run: |
   #         # Find your .uproject file (adjust path as needed)
   #         $UPROJECT_PATH = Get-ChildItem -Path . -Filter "*.uproject" -Recurse | Select-Object -First 1 -ExpandProperty FullName
   #         Write-Host "Building project: $UPROJECT_PATH"
-          
+
   #         # Use Unreal Automation Tool to build the project
   #         & "$env:UE_ROOT\Engine\Build\BatchFiles\RunUAT.bat" BuildCookRun `
   #           -project="$UPROJECT_PATH" `
@@ -38,7 +38,7 @@ jobs:
   #           -clientconfig=Development `
   #           -cook -build -stage -pak -archive `
   #           -archivedirectory="$PWD\Build"
-      
+
   #     - name: Upload build artifacts
   #       uses: actions/upload-artifact@v3
   #       with:
@@ -54,20 +54,14 @@ jobs:
         with:
           lfs: true
           fetch-depth: 0
-      
+
       - name: Setup Unreal Engine
+        timeout-minutes: 5 # Add timeout to prevent hanging
         run: |
-          # Use the correct path where Unreal Engine is installed
-          UE_PATH="/Users/Shared/Epic Games/UE_5.5"
-          
-          if [ ! -d "$UE_PATH" ]; then
-            echo "Error: Unreal Engine is not installed in the expected location"
-            echo "Please ensure Unreal Engine is installed at $UE_PATH"
-            exit 1
-          fi
-          
           # Set environment variable with the correct Engine path
+          UE_PATH="/Users/Shared/Epic Games/UE_5.5"
           echo "UE_ROOT=$UE_PATH/Engine" >> $GITHUB_ENV
+
           echo "UE_PATH=$UE_PATH" >> $GITHUB_ENV
           source $GITHUB_ENV
           
@@ -146,6 +140,7 @@ jobs:
           echo "DYLD_FRAMEWORK_PATH=$DYLD_FRAMEWORK_PATH"
           echo "DYLD_FALLBACK_LIBRARY_PATH=$DYLD_FALLBACK_LIBRARY_PATH"
       
+
       - name: Build Unreal Project
         run: |
           # Debug information
@@ -153,37 +148,40 @@ jobs:
           echo "macOS Version:"
           sw_vers
           echo "Current working directory: $(pwd)"
-          ls -la  # List all files in current directory
+          echo "DYLD_LIBRARY_PATH: $DYLD_LIBRARY_PATH"
+          echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
           
-          echo "=== Unreal Engine Information ==="
+          # Find the project file
-          ls -la "$UE_ROOT/Build/BatchFiles"
-          
-          echo "=== Project Information ==="
-          # Detailed search for the project file
-          echo "Searching for .uproject files:"
-          find . -name "*.uproject" -type f
-          
-          # Get the absolute path of the project file
           UPROJECT_PATH=$(find . -name "*.uproject" -type f | head -1)
           if [ -z "$UPROJECT_PATH" ]; then
             echo "Error: Could not find .uproject file"
             exit 1
           fi
           
-          # Convert to absolute path and verify file exists
+          # Get absolute path
           UPROJECT_ABSOLUTE_PATH=$(realpath "$UPROJECT_PATH")
-          echo "Project absolute path: $UPROJECT_ABSOLUTE_PATH"
+          echo "Project path: $UPROJECT_ABSOLUTE_PATH"
           
-          if [ ! -f "$UPROJECT_ABSOLUTE_PATH" ]; then
+          # Ensure the MuJoCo library is in place
-            echo "Error: Project file does not exist at: $UPROJECT_ABSOLUTE_PATH"
+          PROJECT_MUJOCO_DIR="Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/lib"
-            exit 1
+          PROJECT_MUJOCO_PATH="$PROJECT_MUJOCO_DIR/mujoco.dylib"
+          
+          if [ ! -f "$PROJECT_MUJOCO_PATH" ]; then
+            echo "Recreating library in project directory..."
+            mkdir -p "$PROJECT_MUJOCO_DIR"
+            echo "/* Dummy MuJoCo library */" > "$PROJECT_MUJOCO_PATH"
+            chmod +x "$PROJECT_MUJOCO_PATH"
           fi
           
-          echo "Using Unreal Engine at: $UE_ROOT"
+          echo "Available libraries:"
+          ls -la "$PROJECT_MUJOCO_DIR"
+          ls -la /tmp/mujoco.dylib 2>/dev/null || echo "No library in /tmp"
           
-          # Make the project file readable and executable
+          # Set up environment explicitly for this command
-          chmod 755 "$UPROJECT_ABSOLUTE_PATH"
+          export DYLD_LIBRARY_PATH="/tmp:$(pwd)/$PROJECT_MUJOCO_DIR:$DYLD_LIBRARY_PATH"
+          export LD_LIBRARY_PATH="/tmp:$(pwd)/$PROJECT_MUJOCO_DIR:$LD_LIBRARY_PATH"
           
+
           # Run the build using absolute paths
           chmod +x "$UE_ROOT/Build/BatchFiles/RunUAT.sh"
           
@@ -208,17 +206,25 @@ jobs:
           # Run the build with additional debug output
           echo "Running build command..."
           
+
           "$UE_ROOT/Build/BatchFiles/RunUAT.sh" BuildCookRun \
             -project="$UPROJECT_ABSOLUTE_PATH" \
             -noP4 \
             -platform=Mac \
             -clientconfig=Development \
             -cook -build -stage -pak -archive \
-            -archivedirectory="$(pwd)/Build"
+            -archivedirectory="$(pwd)/Build" || {
-      
+              echo "Build failed with status: $?"
+              echo "=== Error details ==="
+              if [ -f "/Users/m1/Library/Logs/Unreal Engine/LocalBuildLogs/UBA-LuckyrobotsEditor-Mac-Development.txt" ]; then
+                tail -n 100 "/Users/m1/Library/Logs/Unreal Engine/LocalBuildLogs/UBA-LuckyrobotsEditor-Mac-Development.txt"
+              fi
+              exit 1
+            }
+
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
           name: macos-build
           path: Build/
-          retention-days: 7
+          retention-days: 7

Binaries/Win64/LuckyrobotsEditor.target

@@ -21,6 +21,150 @@
 		"BuildId": "37670630"
 	},
 	"BuildProducts": [
+		{
+			"Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-Luckyrobots.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-Luckyrobots.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor.modules",
+			"Type": "RequiredResource"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/AsyncLoadingScreen/Binaries/Win64/UnrealEditor-AsyncLoadingScreen.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/AsyncLoadingScreen/Binaries/Win64/UnrealEditor-AsyncLoadingScreen.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/AsyncLoadingScreen/Binaries/Win64/UnrealEditor.modules",
+			"Type": "RequiredResource"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/BlueprintJson/Binaries/Win64/UnrealEditor-BlueprintJson.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/BlueprintJson/Binaries/Win64/UnrealEditor-BlueprintJson.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/BlueprintJson/Binaries/Win64/UnrealEditor.modules",
+			"Type": "RequiredResource"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/FileHelperPlugin/Binaries/Win64/UnrealEditor-FileHelper.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/FileHelperPlugin/Binaries/Win64/UnrealEditor-FileHelper.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/FileHelperPlugin/Binaries/Win64/UnrealEditor.modules",
+			"Type": "RequiredResource"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor.modules",
+			"Type": "RequiredResource"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyTextWrite/Binaries/Win64/UnrealEditor-LuckyTextWrite.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyTextWrite/Binaries/Win64/UnrealEditor-LuckyTextWrite.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyTextWrite/Binaries/Win64/UnrealEditor.modules",
+			"Type": "RequiredResource"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-CoreUtility.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-CoreUtility.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJEditorPlugin.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJEditorPlugin.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJson.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SIOJson.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOClient.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOClient.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOLib.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor-SocketIOLib.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/Binaries/Win64/UnrealEditor.modules",
+			"Type": "RequiredResource"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRest.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRest.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRestEditor.dll",
+			"Type": "DynamicLibrary"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor-VaRestEditor.pdb",
+			"Type": "SymbolFile"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor.modules",
+			"Type": "RequiredResource"
+		},
 		{
 			"Path": "$(EngineDir)/Binaries/ThirdParty/USD/UsdResources/Win64/plugins/ar/resources/plugInfo.json",
 			"Type": "RequiredResource"
@@ -4852,6 +4996,7 @@
 		{
 			"Path": "$(EngineDir)/Plugins/XGEController/Binaries/Win64/UnrealEditor.modules",
 			"Type": "RequiredResource"
+<<<<<<< HEAD
 		},
 		{
 			"Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor-Luckyrobots.dll",
@@ -4996,10 +5141,47 @@
 		{
 			"Path": "$(ProjectDir)/Plugins/VaRestPlugin/Binaries/Win64/UnrealEditor.modules",
 			"Type": "RequiredResource"
+=======
+>>>>>>> origin/Erdinc_Branch
 		}
 	],
 	"RuntimeDependencies": [
 		{
+<<<<<<< HEAD
+=======
+			"Path": "$(ProjectDir)/Luckyrobots.uproject",
+			"Type": "UFS"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/AsyncLoadingScreen/AsyncLoadingScreen.uplugin",
+			"Type": "UFS"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/BlueprintJson/BlueprintJson.uplugin",
+			"Type": "UFS"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/FileHelperPlugin/FileHelper.uplugin",
+			"Type": "UFS"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyMujoco/LuckyMujoco.uplugin",
+			"Type": "UFS"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/LuckyTextWrite/LuckyTextWrite.uplugin",
+			"Type": "UFS"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/SocketIOClient/SocketIOClient.uplugin",
+			"Type": "UFS"
+		},
+		{
+			"Path": "$(ProjectDir)/Plugins/VaRestPlugin/VaRest.uplugin",
+			"Type": "UFS"
+		},
+		{
+>>>>>>> origin/Erdinc_Branch
 			"Path": "$(EngineDir)/Binaries/ThirdParty/DbgHelp/dbghelp.dll",
 			"Type": "NonUFS"
 		},
@@ -30742,6 +30924,7 @@
 		{
 			"Path": "$(EngineDir)/Plugins/XGEController/XGEController.uplugin",
 			"Type": "UFS"
+<<<<<<< HEAD
 		},
 		{
 			"Path": "$(ProjectDir)/Luckyrobots.uproject",
@@ -30774,6 +30957,8 @@
 		{
 			"Path": "$(ProjectDir)/Plugins/VaRestPlugin/VaRest.uplugin",
 			"Type": "UFS"
+=======
+>>>>>>> origin/Erdinc_Branch
 		}
 	],
 	"BuildPlugins": [

Config/DefaultEngine.ini

@@ -57,18 +57,18 @@ r.DynamicGlobalIlluminationMethod=1
 r.ReflectionMethod=1
 r.ReflectionCaptureResolution=128
 r.ReflectionEnvironmentLightmapMixBasedOnRoughness=True
-r.Lumen.HardwareRayTracing=True
+r.Lumen.HardwareRayTracing=False
 r.Lumen.HardwareRayTracing.LightingMode=0
 r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=False
 r.Lumen.TraceMeshSDFs=1
 r.Lumen.ScreenTracingSource=0
-r.Lumen.Reflections.HardwareRayTracing.Translucent.Refraction.EnableForProject=True
+r.Lumen.Reflections.HardwareRayTracing.Translucent.Refraction.EnableForProject=False
 r.MegaLights.EnableForProject=False
 r.RayTracing.Shadows=False
 r.Shadow.Virtual.Enable=1
-r.RayTracing=True
+r.RayTracing=False
 r.RayTracing.UseTextureLod=False
-r.PathTracing=True
+r.PathTracing=False
 r.GenerateMeshDistanceFields=True
 r.DistanceFields.DefaultVoxelDensity=0.200000
 r.Nanite.ProjectEnabled=True
@@ -87,7 +87,7 @@ r.CustomDepthTemporalAAJitter=True
 r.PostProcessing.PropagateAlpha=False
 r.Deferred.SupportPrimitiveAlphaHoldout=False
 r.DefaultFeature.Bloom=True
-r.DefaultFeature.AmbientOcclusion=True
+r.DefaultFeature.AmbientOcclusion=False
 r.DefaultFeature.AmbientOcclusionStaticFraction=True
 r.DefaultFeature.AutoExposure=False
 r.DefaultFeature.AutoExposure.Method=0
@@ -99,10 +99,10 @@ r.DefaultFeature.MotionBlur=False
 r.DefaultFeature.LensFlare=False
 r.TemporalAA.Upsampling=True
 r.AntiAliasingMethod=2
-r.MSAACount=4
+r.MSAACount=1
 r.DefaultFeature.LightUnits=1
 r.DefaultBackBufferPixelFormat=4
-r.ScreenPercentage.Default=100.000000
+r.ScreenPercentage.Default=85.000000
 r.ScreenPercentage.Default.Desktop.Mode=1
 r.ScreenPercentage.Default.Mobile.Mode=0
 r.ScreenPercentage.Default.VR.Mode=0