diff --git a/gitattributes b/.gitattributes similarity index 97% rename from gitattributes rename to .gitattributes index 3d2b107d..797774ea 100644 --- a/gitattributes +++ b/.gitattributes @@ -1,13 +1,13 @@ -# UE file types -*.uasset filter=lfs diff=lfs merge=lfs -text -*.umap filter=lfs diff=lfs merge=lfs -text - -# Raw Content types -*.fbx filter=lfs diff=lfs merge=lfs -text -*.3ds filter=lfs diff=lfs merge=lfs -text -*.psd filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.mp3 filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text -*.xcf filter=lfs diff=lfs merge=lfs -text +# UE file types +*.uasset filter=lfs diff=lfs merge=lfs -text +*.umap filter=lfs diff=lfs merge=lfs -text + +# Raw Content types +*.fbx filter=lfs diff=lfs merge=lfs -text +*.3ds filter=lfs diff=lfs merge=lfs -text +*.psd filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.mp3 filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text +*.xcf filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/gitignore b/gitignore deleted file mode 100644 index 8d85a98a..00000000 --- a/gitignore +++ /dev/null @@ -1,76 +0,0 @@ -# ---> UnrealEngine -# Visual Studio 2015 user specific files -.vs/ - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib - - -# Fortran module files -*.mod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app -*.ipa - -# These project files can be generated by the engine -*.xcodeproj -*.xcworkspace -*.sln -*.suo -*.opensdf -*.sdf -*.VC.db -*.VC.opendb - -# Precompiled Assets -SourceArt/**/*.png -SourceArt/**/*.tga - -# Binary Files -Binaries/* -Plugins/*/Binaries/* - -# Builds -Build/* - -# Whitelist PakBlacklist-.txt files -!Build/*/ -Build/*/** -!Build/*/PakBlacklist*.txt - -# Don't ignore icon files in Build -!Build/**/*.ico - -# Built data for maps -*_BuiltData.uasset - -# Configuration files generated by the Editor -Saved/* - -# Compiled source files for the engine to use -Intermediate/* -Plugins/*/Intermediate/* - -# Cache files for the editor to use -DerivedDataCache/* - diff --git a/hwanyoung2/Content/FMOD/Banks/Master.uasset b/hwanyoung2/Content/FMOD/Banks/Master.uasset index 7d220a0a..d8ed3c05 100644 Binary files a/hwanyoung2/Content/FMOD/Banks/Master.uasset and b/hwanyoung2/Content/FMOD/Banks/Master.uasset differ diff --git a/hwanyoung2/Content/FMOD/Buses/Reverb.uasset b/hwanyoung2/Content/FMOD/Buses/Reverb.uasset index 4de43054..d55ee4b9 100644 Binary files a/hwanyoung2/Content/FMOD/Buses/Reverb.uasset and b/hwanyoung2/Content/FMOD/Buses/Reverb.uasset differ diff --git a/hwanyoung2/Content/FMOD/Events/Test_1.uasset b/hwanyoung2/Content/FMOD/Events/Test_1.uasset index 03864d31..f2fa3ca7 100644 Binary files a/hwanyoung2/Content/FMOD/Events/Test_1.uasset and b/hwanyoung2/Content/FMOD/Events/Test_1.uasset differ diff --git a/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset b/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset index 16953eb2..e6f0501c 100644 Binary files a/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset and b/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset differ diff --git a/hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset b/hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset index 548f9887..1aa839c5 100644 Binary files a/hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset and b/hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset differ diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Arrow_Impact_1.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Arrow_Impact_1.uasset new file mode 100644 index 00000000..29ae3d73 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Arrow_Impact_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f211da5ea3593ac5305edcbd73f71a5880da3f1090e7f30f481ed36b13de8067 +size 38188 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Arrow_Impact_1.wav b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Arrow_Impact_1.wav new file mode 100644 index 00000000..6a77dc0f --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Arrow_Impact_1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:081563985ba2db8cdaf9c8011bc72f8da65a426c009c4744c491d91c312d4130 +size 219932 diff --git a/hwanyoung2/Content/Illusions/Assets/Arrow Impact 1.wav b/hwanyoung2/Content/Illusions/Assets/Arrow Impact 1.wav deleted file mode 100644 index 7629560c..00000000 Binary files a/hwanyoung2/Content/Illusions/Assets/Arrow Impact 1.wav and /dev/null differ diff --git a/hwanyoung2/Content/Illusions/Assets/Arrow_Impact_1.uasset b/hwanyoung2/Content/Illusions/Assets/Arrow_Impact_1.uasset deleted file mode 100644 index c5639b85..00000000 Binary files a/hwanyoung2/Content/Illusions/Assets/Arrow_Impact_1.uasset and /dev/null differ diff --git a/hwanyoung2/Intermediate/CachedAssetRegistry.bin b/hwanyoung2/Intermediate/CachedAssetRegistry.bin index 17aa6161..d7277a1e 100644 Binary files a/hwanyoung2/Intermediate/CachedAssetRegistry.bin and b/hwanyoung2/Intermediate/CachedAssetRegistry.bin differ diff --git a/hwanyoung2/Intermediate/ReimportCache/3688439234.bin b/hwanyoung2/Intermediate/ReimportCache/3688439234.bin index 40b512f8..c7c28fb2 100644 Binary files a/hwanyoung2/Intermediate/ReimportCache/3688439234.bin and b/hwanyoung2/Intermediate/ReimportCache/3688439234.bin differ diff --git a/hwanyoung2/Saved/AutoScreenshot.png b/hwanyoung2/Saved/AutoScreenshot.png index 37136fe6..6bc8c076 100644 Binary files a/hwanyoung2/Saved/AutoScreenshot.png and b/hwanyoung2/Saved/AutoScreenshot.png differ