diff --git a/Content/Zelda/level1.umap b/Content/Zelda/level1.umap index be708c2..533dce4 100644 Binary files a/Content/Zelda/level1.umap and b/Content/Zelda/level1.umap differ diff --git a/StreamTwo.sln b/StreamTwo.sln index 737cd3c..fd4824b 100644 --- a/StreamTwo.sln +++ b/StreamTwo.sln @@ -7,9 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{94A6C6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{8E2F6A87-1826-34F4-940C-CC23A48F9FE4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{6E79FB46-1C0E-49EA-871E-A78A29692E31}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{C32128A6-1246-43AB-9595-658E12523AAB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StreamTwo", "Intermediate\ProjectFiles\StreamTwo.vcxproj", "{1307470A-1BCE-4F50-AD4E-47F519F74E6D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StreamTwo", "Intermediate\ProjectFiles\StreamTwo.vcxproj", "{3CA74F0C-AF87-4C24-AFF0-A71929797353}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visualizers", "Visualizers", "{1CCEC849-CC72-4C59-8C36-2F7C38706D4C}" ProjectSection(SolutionItems) = preProject @@ -40,68 +40,68 @@ Global Shipping|Win64 = Shipping|Win64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.DebugGame Editor|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.DebugGame Editor|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.DebugGame|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.DebugGame|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Development Editor|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Development Editor|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Development|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Development|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Shipping|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Shipping|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {6E79FB46-1C0E-49EA-871E-A78A29692E31}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame Editor|Linux.ActiveCfg = Linux_DebugGame_Editor|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame Editor|Linux.Build.0 = Linux_DebugGame_Editor|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame Editor|LinuxAArch64.ActiveCfg = Invalid|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame Editor|Win32.ActiveCfg = Invalid|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame Editor|Win64.ActiveCfg = DebugGame_Editor|x64 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame Editor|Win64.Build.0 = DebugGame_Editor|x64 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame|Linux.ActiveCfg = Linux_DebugGame|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame|Linux.Build.0 = Linux_DebugGame|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame|LinuxAArch64.ActiveCfg = LinuxAArch64_DebugGame|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame|LinuxAArch64.Build.0 = LinuxAArch64_DebugGame|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame|Win32.ActiveCfg = DebugGame|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame|Win32.Build.0 = DebugGame|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame|Win64.ActiveCfg = DebugGame|x64 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.DebugGame|Win64.Build.0 = DebugGame|x64 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development Editor|Linux.ActiveCfg = Linux_Development_Editor|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development Editor|Linux.Build.0 = Linux_Development_Editor|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development Editor|LinuxAArch64.ActiveCfg = Invalid|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development Editor|Win32.ActiveCfg = Invalid|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development Editor|Win64.ActiveCfg = Development_Editor|x64 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development Editor|Win64.Build.0 = Development_Editor|x64 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development|Linux.ActiveCfg = Linux_Development|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development|Linux.Build.0 = Linux_Development|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development|LinuxAArch64.ActiveCfg = LinuxAArch64_Development|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development|LinuxAArch64.Build.0 = LinuxAArch64_Development|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development|Win32.ActiveCfg = Development|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development|Win32.Build.0 = Development|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development|Win64.ActiveCfg = Development|x64 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Development|Win64.Build.0 = Development|x64 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Shipping|Linux.ActiveCfg = Linux_Shipping|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Shipping|Linux.Build.0 = Linux_Shipping|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Shipping|LinuxAArch64.ActiveCfg = LinuxAArch64_Shipping|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Shipping|LinuxAArch64.Build.0 = LinuxAArch64_Shipping|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Shipping|Win32.ActiveCfg = Shipping|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Shipping|Win32.Build.0 = Shipping|Win32 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Shipping|Win64.ActiveCfg = Shipping|x64 - {1307470A-1BCE-4F50-AD4E-47F519F74E6D}.Shipping|Win64.Build.0 = Shipping|x64 + {C32128A6-1246-43AB-9595-658E12523AAB}.DebugGame Editor|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.DebugGame Editor|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.DebugGame|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.DebugGame|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Development Editor|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Development Editor|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Development|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Development|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Shipping|Linux.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Shipping|LinuxAArch64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {C32128A6-1246-43AB-9595-658E12523AAB}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame Editor|Linux.ActiveCfg = Linux_DebugGame_Editor|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame Editor|Linux.Build.0 = Linux_DebugGame_Editor|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame Editor|LinuxAArch64.ActiveCfg = Invalid|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame Editor|Win32.ActiveCfg = Invalid|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame Editor|Win64.ActiveCfg = DebugGame_Editor|x64 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame Editor|Win64.Build.0 = DebugGame_Editor|x64 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame|Linux.ActiveCfg = Linux_DebugGame|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame|Linux.Build.0 = Linux_DebugGame|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame|LinuxAArch64.ActiveCfg = LinuxAArch64_DebugGame|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame|LinuxAArch64.Build.0 = LinuxAArch64_DebugGame|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame|Win32.ActiveCfg = DebugGame|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame|Win32.Build.0 = DebugGame|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame|Win64.ActiveCfg = DebugGame|x64 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.DebugGame|Win64.Build.0 = DebugGame|x64 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development Editor|Linux.ActiveCfg = Linux_Development_Editor|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development Editor|Linux.Build.0 = Linux_Development_Editor|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development Editor|LinuxAArch64.ActiveCfg = Invalid|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development Editor|Win32.ActiveCfg = Invalid|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development Editor|Win64.ActiveCfg = Development_Editor|x64 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development Editor|Win64.Build.0 = Development_Editor|x64 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development|Linux.ActiveCfg = Linux_Development|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development|Linux.Build.0 = Linux_Development|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development|LinuxAArch64.ActiveCfg = LinuxAArch64_Development|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development|LinuxAArch64.Build.0 = LinuxAArch64_Development|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development|Win32.ActiveCfg = Development|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development|Win32.Build.0 = Development|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development|Win64.ActiveCfg = Development|x64 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Development|Win64.Build.0 = Development|x64 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Shipping|Linux.ActiveCfg = Linux_Shipping|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Shipping|Linux.Build.0 = Linux_Shipping|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Shipping|LinuxAArch64.ActiveCfg = LinuxAArch64_Shipping|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Shipping|LinuxAArch64.Build.0 = LinuxAArch64_Shipping|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Shipping|Win32.ActiveCfg = Shipping|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Shipping|Win32.Build.0 = Shipping|Win32 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Shipping|Win64.ActiveCfg = Shipping|x64 + {3CA74F0C-AF87-4C24-AFF0-A71929797353}.Shipping|Win64.Build.0 = Shipping|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {6E79FB46-1C0E-49EA-871E-A78A29692E31} = {94A6C6F3-99B3-346E-9557-ABF9D4064DBD} - {1307470A-1BCE-4F50-AD4E-47F519F74E6D} = {8E2F6A87-1826-34F4-940C-CC23A48F9FE4} + {C32128A6-1246-43AB-9595-658E12523AAB} = {94A6C6F3-99B3-346E-9557-ABF9D4064DBD} + {3CA74F0C-AF87-4C24-AFF0-A71929797353} = {8E2F6A87-1826-34F4-940C-CC23A48F9FE4} EndGlobalSection EndGlobal