Merge pull request #7 from charisma-ai/mac-support

feat: support Mac
charisma-ai · Dec 15, 2023 · dd0a0b8 · dd0a0b8
2 parents 8f5f733 + 5759270
commit dd0a0b8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Source/CharismaModule/Private/APIBlueprints/ForkPlaythrough.cpp b/Source/CharismaModule/Private/APIBlueprints/ForkPlaythrough.cpp
@@ -12,13 +12,14 @@ UForkPlaythrough* UForkPlaythrough::ForkPlaythrough(UObject* WorldContextObject,
 	UForkPlaythrough* BlueprintNode = NewObject<UForkPlaythrough>();
 	BlueprintNode->WorldContextObject = WorldContextObject;
 	BlueprintNode->Token = Token;
-	
+
 	return BlueprintNode;
 }
 
 void UForkPlaythrough::Activate()
 {
 	UCharismaAPI::ForkPlaythrough(
-		Token, [&](const FString Token, const FString PlaythroughUuid) { Success.Broadcast(Token, PlaythroughUuid, TEXT("")); },
-		[&](const FString Error) { Failure.Broadcast(TEXT(""),TEXT(""), Error); });
+		Token,
+		[&](const FString NewToken, const FString PlaythroughUuid) { Success.Broadcast(NewToken, PlaythroughUuid, TEXT("")); },
+		[&](const FString Error) { Failure.Broadcast(TEXT(""), TEXT(""), Error); });
 }
diff --git a/Source/ThirdParty/colyseus-unreal b/Source/ThirdParty/colyseus-unreal
diff --git a/charisma-unreal.uplugin b/charisma-unreal.uplugin
@@ -19,7 +19,8 @@
 			"Type": "Runtime",
 			"LoadingPhase": "PreDefault",
 			"PlatformAllowList": [
-				"Win64"
+				"Win64",
+				"Mac"
 			]
 		}
 	]
+1 −0		LICENSE
+7 −2		Source/Colyseus/ColyseusClient.Build.cs
+3 −0		Source/Colyseus/Public/Protocol.h
+21 −19		Source/Colyseus/Public/Room.h
+2 −2		colyseus-unreal.uplugin