11 Commits

Author SHA1 Message Date
e2bc30f953 Merge branch 'main' into fmod-co 2025-05-02 13:33:41 -04:00
c9ebb16f36 Added Spring Song yet again
Triple checked sync with main due to an issue with the Spring map not loading. Everything seems to work now
2025-04-25 19:30:13 -04:00
6f80cafaa3 Revert "Committing Changes(?)"
This reverts commit aac996d671.
2025-04-25 19:14:47 -04:00
5b40e6c814 Revert "Merge branch 'main' into fmod-co"
This reverts commit a42441f427, reversing
changes made to aac996d671.
2025-04-25 17:13:12 -04:00
78a9b1c17d Revert "Added Spring Song (again)"
This reverts commit aa05178a8a.
2025-04-25 17:08:45 -04:00
aa05178a8a Added Spring Song (again)
After syncing with main, got a working clean slate to resume working
2025-04-25 16:25:02 -04:00
a42441f427 Merge branch 'main' into fmod-co 2025-04-25 16:17:22 -04:00
aac996d671 Committing Changes(?)
Committing changes that aren't mine but Git is saying they're mine (Events for footsteps). Shouldn't mess anything up.
2025-04-25 13:35:28 -04:00
fae2bf06dd Added Second Spring Music 2025-04-25 13:17:52 -04:00
bc78126919 Built bank and added into UE - Sanin Rock Teleport Oneshot 2025-04-18 14:54:30 -04:00
0cac75517d Changed Rock Teleport Move to be a oneshot 2025-04-18 13:54:43 -04:00
2882 changed files with 10261 additions and 21180 deletions

2
.gitignore vendored
View File

@ -1,2 +0,0 @@
hwanyoung2/Content/Illusions/.cache/\{d547300b-f688-4816-b2a8-0edd5f5e77a1\}.pdc

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"
]
}

View File

@ -2,7 +2,6 @@
GameDefaultMap=/Game/ThirdPerson/Maps/ThirdPersonMap.ThirdPersonMap
EditorStartupMap=/Game/Hwanyoung/Levels/Spring-Sharon.Spring-Sharon
GlobalDefaultGameMode=/Script/hwanyoung2.hwanyoung2GameMode
GameInstanceClass=/Game/Hwanyoung/Interactables/BP_GameInstance.BP_GameInstance_C
[/Script/Engine.RendererSettings]
r.Mobile.ShadingPath=0
@ -238,7 +237,6 @@ ManualIPAddress=
+Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.")
+Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ")
+Profiles=(Name="WaterBodyCollision",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="",CustomResponses=((Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="Default Water Collision Profile (Created by Water Plugin)")
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="GroundOnly")
-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall")
-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn")
-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic")
@ -261,6 +259,3 @@ ManualIPAddress=
[Internationalization]
+LocalizationPaths=%GAMEDIR%Content/Localization/Text
[/Script/Engine.UserInterfaceSettings]
UIScaleRule=ScaleToFit

Some files were not shown because too many files have changed in this diff Show More