diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..4f51584 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,52 @@ +# Unity +*.cs diff=csharp text +*.cginc text +*.shader text + +*.mat merge=unityyamlmerge eol=lf +*.anim merge=unityyamlmerge eol=lf +*.unity merge=unityyamlmerge eol=lf +*.prefab merge=unityyamlmerge eol=lf +*.physicsMaterial2D merge=unityyamlmerge eol=lf +*.physicsMaterial merge=unityyamlmerge eol=lf +*.asset merge=unityyamlmerge eol=lf +*.meta merge=unityyamlmerge eol=lf +*.controller merge=unityyamlmerge eol=lf + +# git-lfs +#Image +*.jpg filter=lfs diff=lfs merge=lfs -text +*.jpeg filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text +*.psd filter=lfs diff=lfs merge=lfs -text +*.ai filter=lfs diff=lfs merge=lfs -text +*.tif filter=lfs diff=lfs merge=lfs -text +*.tga filter=lfs diff=lfs merge=lfs -text +*.cubemap filter=lfs diff=lfs merge=lfs -text +*.svg filter=lfs diff=lfs merge=lfs -text +#Audio +*.mp3 filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text +*.ogg filter=lfs diff=lfs merge=lfs -text +#Video +*.mp4 filter=lfs diff=lfs merge=lfs -text +*.mov filter=lfs diff=lfs merge=lfs -text +*.webm filter=lfs diff=lfs merge=lfs -text +#3D Object +*.FBX filter=lfs diff=lfs merge=lfs -text +*.fbx filter=lfs diff=lfs merge=lfs -text +*.blend filter=lfs diff=lfs merge=lfs -text +*.obj filter=lfs diff=lfs merge=lfs -text +#ETC +*.a filter=lfs diff=lfs merge=lfs -text +*.exr filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.dll filter=lfs diff=lfs merge=lfs -text +*.unitypackage filter=lfs diff=lfs merge=lfs -text +*.aif filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.rns filter=lfs diff=lfs merge=lfs -text +*.reason filter=lfs diff=lfs merge=lfs -text +*.lxo filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 85d5d84..fc37946 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ -# ---> Unity # This .gitignore file should be placed at the root of your Unity project directory # -# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore +# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore # /[Ll]ibrary/ /[Tt]emp/ @@ -15,8 +14,8 @@ # They also could contain extremely sensitive data /[Mm]emoryCaptures/ -# Recordings can get excessive in size -/[Rr]ecordings/ +# Asset meta data should only be ignored when the corresponding asset is also ignored +!/[Aa]ssets/**/*.meta # Uncomment this line if you wish to ignore the asset store tools plugin # /[Aa]ssets/AssetStoreTools* @@ -58,10 +57,7 @@ sysinfo.txt # Builds *.apk -*.aab *.unitypackage -*.unitypackage.meta -*.app # Crashlytics generated file crashlytics-build.properties @@ -73,4 +69,6 @@ crashlytics-build.properties /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* -Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +# Exceptions +!*.dll +!*.obj \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index b3df891..4ff11fa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -56,5 +56,5 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "Learning-UnityNGO.sln" + "dotnet.defaultSolution": "UnityNGO.sln" } \ No newline at end of file diff --git a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Circle01_v1.png b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Circle01_v1.png index f199235..1e4f07c 100644 Binary files a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Circle01_v1.png and b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Circle01_v1.png differ diff --git a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/DistortedFlare01.png b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/DistortedFlare01.png index 6a3e357..7c2887d 100644 Binary files a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/DistortedFlare01.png and b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/DistortedFlare01.png differ diff --git a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Flame02.png b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Flame02.png index bf959bf..d46b3a4 100644 Binary files a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Flame02.png and b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Flame02.png differ diff --git a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Flare00.PNG b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Flare00.PNG index 737d8b5..61b2141 100644 Binary files a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Flare00.PNG and b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Flare00.PNG differ diff --git a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Swirl01.png b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Swirl01.png index c10c790..82b7596 100644 Binary files a/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Swirl01.png and b/Assets/ASSETS/GabrielAguiarProductions/FreeQuickEffectsVol1/Textures/Swirl01.png differ diff --git a/Assets/CONTENT/ART/LVLS/TestLoc.fbx b/Assets/CONTENT/ART/LVLS/TestLoc.fbx index 6213484..cf79f31 100644 Binary files a/Assets/CONTENT/ART/LVLS/TestLoc.fbx and b/Assets/CONTENT/ART/LVLS/TestLoc.fbx differ diff --git a/Assets/Plugins/Demigiant/DOTween/DOTween.dll b/Assets/Plugins/Demigiant/DOTween/DOTween.dll index 65032ee..9a74efd 100644 Binary files a/Assets/Plugins/Demigiant/DOTween/DOTween.dll and b/Assets/Plugins/Demigiant/DOTween/DOTween.dll differ diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll b/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll index 024a2da..aa613be 100644 Binary files a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenIcon.png b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenIcon.png index d06fc7c..f30cda6 100644 Binary files a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenIcon.png and b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenIcon.png differ diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenMiniIcon.png b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenMiniIcon.png index 7cd74c1..73d1a3c 100644 Binary files a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenMiniIcon.png and b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenMiniIcon.png differ diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer.png b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer.png index e29d02f..cd04429 100644 Binary files a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer.png and b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer.png differ diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer_dark.png b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer_dark.png index e48db5e..05be4dc 100644 Binary files a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer_dark.png and b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer_dark.png differ diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Header.jpg b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Header.jpg index 4d710d7..be330b7 100644 Binary files a/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Header.jpg and b/Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Header.jpg differ