8a94ce9de3
# Conflicts: # .idea/.idea.AwesomeRunner/.idea/.gitignore # .vscode/settings.json # Assets/ParticleSystems/lasers/lasers2.unitypackage.meta # Assets/Scenes/DeathScreen.unity.meta # Assets/Scenes/GameScene.unity # Assets/Scenes/MainMenu.unity # Assets/ScriptableObjects/PlayerData.asset # Assets/Scripts/Player/Health.cs # Assets/Scripts/Player/Player.cs # Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset # Assets/TextMesh Pro/Examples & Extras/Scenes/27 - Double Pass Shader Example.unity.meta # ProjectSettings/EditorBuildSettings.asset
68 lines
1.7 KiB
JSON
68 lines
1.7 KiB
JSON
{
|
|
"files.exclude": {
|
|
"**/.DS_Store": true,
|
|
"**/.git": true,
|
|
<<<<<<< HEAD
|
|
"**/.vs": true,
|
|
"**/.gitmodules": true,
|
|
"**/.vsconfig": true,
|
|
=======
|
|
"**/.gitmodules": true,
|
|
>>>>>>> 4c350d16a4b31db0659a0e5146e5626a353b2200
|
|
"**/*.booproj": true,
|
|
"**/*.pidb": true,
|
|
"**/*.suo": true,
|
|
"**/*.user": true,
|
|
"**/*.userprefs": true,
|
|
"**/*.unityproj": true,
|
|
"**/*.dll": true,
|
|
"**/*.exe": true,
|
|
"**/*.pdf": true,
|
|
"**/*.mid": true,
|
|
"**/*.midi": true,
|
|
"**/*.wav": true,
|
|
"**/*.gif": true,
|
|
"**/*.ico": true,
|
|
"**/*.jpg": true,
|
|
"**/*.jpeg": true,
|
|
"**/*.png": true,
|
|
"**/*.psd": true,
|
|
"**/*.tga": true,
|
|
"**/*.tif": true,
|
|
"**/*.tiff": true,
|
|
"**/*.3ds": true,
|
|
"**/*.3DS": true,
|
|
"**/*.fbx": true,
|
|
"**/*.FBX": true,
|
|
"**/*.lxo": true,
|
|
"**/*.LXO": true,
|
|
"**/*.ma": true,
|
|
"**/*.MA": true,
|
|
"**/*.obj": true,
|
|
"**/*.OBJ": true,
|
|
"**/*.asset": true,
|
|
"**/*.cubemap": true,
|
|
"**/*.flare": true,
|
|
"**/*.mat": true,
|
|
"**/*.meta": true,
|
|
"**/*.prefab": true,
|
|
"**/*.unity": true,
|
|
"build/": true,
|
|
"Build/": true,
|
|
"Library/": true,
|
|
"library/": true,
|
|
"obj/": true,
|
|
"Obj/": true,
|
|
<<<<<<< HEAD
|
|
"Logs/": true,
|
|
"logs/": true,
|
|
"ProjectSettings/": true,
|
|
"UserSettings/": true,
|
|
=======
|
|
"ProjectSettings/": true,
|
|
>>>>>>> 4c350d16a4b31db0659a0e5146e5626a353b2200
|
|
"temp/": true,
|
|
"Temp/": true
|
|
},
|
|
"dotnet.defaultSolution": "AwesomeRunner.sln"
|
|
} |