neroberovero/Illusion-UE5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflict, try to recover passive

Browse Source
This commit is contained in:
7heIVIaze 2025-02-18 18:33:01 +09:00
commit 23368c06d3
21 changed files with 39 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hwanyoung2/.vsconfig
View File

@ -1,13 +1,17 @@
{
{
"version": "1.0",
"components": [
"Microsoft.Net.Component.4.6.2.TargetingPack",
"Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64",
"Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64",
"Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64",
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
"Microsoft.VisualStudio.Component.Windows10SDK.22000",
"Microsoft.VisualStudio.Component.Windows10SDK",
"Microsoft.VisualStudio.Workload.CoreEditor",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Workload.NativeCrossPlat",
"Microsoft.VisualStudio.Workload.NativeDesktop",
"Microsoft.VisualStudio.Workload.NativeGame"
"Microsoft.VisualStudio.Workload.NativeGame",
"Microsoft.VisualStudio.Workload.Universal"
]
}

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash4.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash6.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolWeaponBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/SKM_Soldier_10_PhysicsAsset.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack1_Soldier.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack2_Soldier.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack3_Soldier1.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/NewIKRig.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs
View File

@ -25,12 +25,10 @@ namespace UnrealBuildTool.Rules
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
PrivatePCHHeaderFile = "Private/FMODStudioPrivatePCH.h";
bEnableUndefinedIdentifierWarnings = false;
bUseUnity = false;
PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public/FMOD"));
PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Classes"));
bEnableUndefinedIdentifierWarnings = false;
PublicDependencyModuleNames.AddRange(
new string[]
@ -71,13 +69,11 @@ namespace UnrealBuildTool.Rules
{
configName = "L";
PublicDefinitions.Add("FMODSTUDIO_LINK_LOGGING=1");
//PublicDefinitions.Add("__has_feature(x)=0");
}
else
{
configName = "";
PublicDefinitions.Add("FMODSTUDIO_LINK_RELEASE=1");
//PublicDefinitions.Add("__has_feature(x)=0");
}
string linkExtension = "";

1
hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs
View File

@ -15,7 +15,6 @@ namespace UnrealBuildTool.Rules
PrivatePCHHeaderFile = "Private/FMODStudioEditorPrivatePCH.h";
bUseUnity = false;
bEnableUndefinedIdentifierWarnings = false;
PrivateIncludePaths.AddRange(
new string[] {

6
hwanyoung2/Source/hwanyoung2.Target.cs
View File

@ -8,8 +8,8 @@ public class hwanyoung2Target : TargetRules
public hwanyoung2Target(TargetInfo Target) : base(Target)
{
Type = TargetType.Game;
DefaultBuildSettings = BuildSettingsVersion.Latest;
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_3;
DefaultBuildSettings = BuildSettingsVersion.V2;
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1;
ExtraModuleNames.Add("hwanyoung2");
}
}
}

5
hwanyoung2/Source/hwanyoung2/hwanyoung2.Build.cs
View File

@ -9,8 +9,5 @@ public class hwanyoung2 : ModuleRules
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "HeadMountedDisplay", "EnhancedInput" });
//PublicDefinitions.Add("NO__HAS_FEATURE");
//PublicDefinitions.Add("__has_feature(x)=0");
bEnableUndefinedIdentifierWarnings = false;
}
}
}

4
hwanyoung2/Source/hwanyoung2Editor.Target.cs
View File

@ -8,8 +8,8 @@ public class hwanyoung2EditorTarget : TargetRules
public hwanyoung2EditorTarget(TargetInfo Target) : base(Target)
{
Type = TargetType.Editor;
DefaultBuildSettings = BuildSettingsVersion.Latest;
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_3;
DefaultBuildSettings = BuildSettingsVersion.V2;
IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1;
ExtraModuleNames.Add("hwanyoung2");
}
}

4
hwanyoung2/hwanyoung2.uproject
View File

@ -54,10 +54,6 @@
{
"Name": "FMODStudioNiagara",
"Enabled": true
},
{
"Name": "SkeletalMeshModelingTools",
"Enabled": true
}
]
}