Merge pull request 'mac build working' (#4 ) from devrim.macbuild into main

Reviewed-on: #4
mac build working
2025-03-27 16:37:26 +00:00 · 2025-03-27 11:35:26 -05:00 · 2025-03-27 15:12:15 +00:00 · 2025-03-27 13:20:14 +03:00 · 2025-03-26 23:20:51 -07:00 · 2025-03-27 06:12:49 +00:00
13 changed files with 6 additions and 5 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/Luckyrobots.uproject
+++ b/Luckyrobots.uproject
@ -53,6 +53,7 @@
 	],
 	"TargetPlatforms": [
 		"Windows",
-		"Linux"
+		"Linux",
+		"Mac"
 	]
 }
--- a/Plugins/AsyncLoadingScreen/Binaries/Mac/UnrealEditor-AsyncLoadingScreen.dylib
+++ b/Plugins/AsyncLoadingScreen/Binaries/Mac/UnrealEditor-AsyncLoadingScreen.dylib
--- a/Plugins/AsyncLoadingScreen/Binaries/Mac/UnrealEditor.modules
+++ b/Plugins/AsyncLoadingScreen/Binaries/Mac/UnrealEditor.modules
@ -1,5 +1,5 @@
 {
-	"BuildId": "27405482",
+	"BuildId": "37670630",
 	"Modules": 
 	{
 		"AsyncLoadingScreen": "UnrealEditor-AsyncLoadingScreen.dylib"
--- a/Plugins/BlueprintJson/Binaries/Mac/UnrealEditor-BlueprintJson.dylib
+++ b/Plugins/BlueprintJson/Binaries/Mac/UnrealEditor-BlueprintJson.dylib
--- a/Plugins/BlueprintJson/Binaries/Mac/UnrealEditor.modules
+++ b/Plugins/BlueprintJson/Binaries/Mac/UnrealEditor.modules
@ -1,5 +1,5 @@
 {
-	"BuildId": "27405482",
+	"BuildId": "37670630",
 	"Modules": 
 	{
 		"BlueprintJson": "UnrealEditor-BlueprintJson.dylib"
--- a/Plugins/FileHelperPlugin/Binaries/Mac/UnrealEditor-FileHelper.dylib
+++ b/Plugins/FileHelperPlugin/Binaries/Mac/UnrealEditor-FileHelper.dylib
--- a/Plugins/FileHelperPlugin/Binaries/Mac/UnrealEditor.modules
+++ b/Plugins/FileHelperPlugin/Binaries/Mac/UnrealEditor.modules
@ -1,5 +1,5 @@
 {
-	"BuildId": "27405482",
+	"BuildId": "37670630",
 	"Modules": 
 	{
 		"FileHelper": "UnrealEditor-FileHelper.dylib"
--- a/Plugins/LuckyMujoco/Binaries/Mac/UnrealEditor-LuckyMujoco.dylib
+++ b/Plugins/LuckyMujoco/Binaries/Mac/UnrealEditor-LuckyMujoco.dylib
--- a/Plugins/LuckyMujoco/Binaries/Mac/UnrealEditor-LuckyMujocoEditor.dylib
+++ b/Plugins/LuckyMujoco/Binaries/Mac/UnrealEditor-LuckyMujocoEditor.dylib
--- a/Plugins/VaRestPlugin/Binaries/Mac/UnrealEditor-VaRest.dylib
+++ b/Plugins/VaRestPlugin/Binaries/Mac/UnrealEditor-VaRest.dylib
--- a/Plugins/VaRestPlugin/Binaries/Mac/UnrealEditor-VaRestEditor.dylib
+++ b/Plugins/VaRestPlugin/Binaries/Mac/UnrealEditor-VaRestEditor.dylib
--- a/Plugins/VaRestPlugin/Binaries/Mac/UnrealEditor.modules
+++ b/Plugins/VaRestPlugin/Binaries/Mac/UnrealEditor.modules
@ -1,5 +1,5 @@
 {
-	"BuildId": "27405482",
+	"BuildId": "37670630",
 	"Modules": 
 	{
 		"VaRest": "UnrealEditor-VaRest.dylib",
Author	SHA1	Message	Date
Devrim Yasar	02985f5928	Merge pull request 'mac build working' (#4 ) from devrim.macbuild into main Some checks failed Unreal Engine Build / macos-build (push) Failing after 19m36s Details Reviewed-on: #4	2025-03-27 16:37:26 +00:00
Devrim Yasar	c344bdb3b4	mac build working	2025-03-27 11:35:26 -05:00
Devrim Yasar	c3c66ebaca	Merge pull request 'gurkan.erdinc.branches.merge' (#2 ) from gurkan.erdinc.temp into main Some checks failed Unreal Engine Build / macos-build (push) Failing after 24m7s Details Reviewed-on: #2 Reviewed-by: martinluckyrobots <martin@luckyrobots.ai>	2025-03-27 15:12:15 +00:00
gurkan01	2b6f510706	Merge branch 'main' of https://luckyrobots.com/luckyrobots/luckyworld Some checks failed Unreal Engine Build / macos-build (push) Failing after 24m29s Details	2025-03-27 13:20:14 +03:00
Martin	897f1a6b10	Revert "Merge pull request 'martin' (#3 ) from martin into main" Some checks failed Unreal Engine Build / macos-build (push) Failing after 1h7m30s Details This reverts commit 566a6fc59fba3bf4150c1375552883c95641f7cd, reversing changes made to 594356189a4db2e2529cda8c79a47705b04246c4.	2025-03-26 23:20:51 -07:00
Martin2	566a6fc59f	Merge pull request 'martin' (#3 ) from martin into main Some checks failed Unreal Engine Build / macos-build (push) Has been cancelled Details Reviewed-on: #3	2025-03-27 06:12:49 +00:00
Martin2	e320ad185a	Merge branch 'martin' of https://luckyrobots.com/luckyrobots/luckyworld into martin # Conflicts: # .gitea/workflows/unreal-build.yml	2025-03-27 14:08:35 +08:00
Martin2	0a9a9f153c	Start from WheeledVehicle template with the Sedan	2025-03-27 13:55:19 +08:00
Martin2	3dcad847bf	Merge branch 'main' of https://luckyrobots.com/luckyrobots/luckyworld into martin # Conflicts: # .gitea/workflows/unreal-build.yml	2025-03-27 10:44:17 +08:00
gurkan01	594356189a	Merge branch 'main' of https://luckyrobots.com/luckyrobots/luckyworld Some checks failed Unreal Engine Build / macos-build (push) Failing after 1h1m20s Details	2025-03-26 22:49:44 +03:00
Martin2	db91b1f5c2	Merge branch 'main' of https://luckyrobots.com/luckyrobots/luckyworld into martin # Conflicts: # .gitea/workflows/unreal-build.yml	2025-03-26 10:25:32 +08:00
Martin	1fbe794f92	Merge branch 'main' into martin	2025-03-25 09:57:14 -07:00
Goran Lazarevski	5be268c913	MacOS build Some checks failed Unreal Engine Build / macos-build (push) Failing after 10m36s Details	2025-03-25 16:16:56 +01:00
gurkan01	d9a5601439	Merge branch 'main' of https://luckyrobots.com/luckyrobots/luckyworld	2025-03-25 16:04:28 +03:00
Goran Lazarevski	121797d73f	MacOS build Some checks failed Unreal Engine Build / macos-build (push) Failing after 10m48s Details	2025-03-25 13:29:19 +01:00
Martin2	344174e4cd	Merge branch 'main' of https://luckyrobots.com/luckyrobots/luckyworld into martin	2025-03-25 18:58:37 +08:00
Martin2	01e6d529cd	fix bug The right side arm is going through dogs, and still collides into dynamic obstacle The right arm goes into the chair and stuff	2025-03-25 13:21:00 +08:00
gurkan01	449dcc96db	Merge branch 'main' of https://luckyrobots.com/luckyrobots/luckyworld	2025-03-25 07:49:33 +03:00
Martin2	f55ebca0d9	fix bug RGB HeadCam has text inside the shot	2025-03-25 12:48:13 +08:00
Martin2	abc2ef731d	fix bug Robots are turning way too fast	2025-03-25 12:15:52 +08:00
Goran Lazarevski	31fb606d06	Merge branches 'main' and 'main' of ssh://luckyrobots.com:2222/luckyrobots/luckyworld Some checks failed Unreal Engine Build / macos-build (push) Failing after 10m50s Details	2025-03-24 22:38:55 +01:00