Go to file
Залетов Федор ac1950d901 Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO
# Conflicts:
#	Library/ArtifactDB
#	Library/CurrentLayout-default.dwlt
#	Library/SceneVisibilityState.asset
#	Library/ScriptAssemblies/Assembly-CSharp.dll
#	Library/ScriptAssemblies/Assembly-CSharp.pdb
#	Library/SourceAssetDB
#	Logs/AssetImportWorker0-prev.log
#	Logs/AssetImportWorker0.log
#	Logs/shadercompiler-UnityShaderCompiler.exe10.log
#	Logs/shadercompiler-UnityShaderCompiler.exe11.log
#	Logs/shadercompiler-UnityShaderCompiler.exe3.log
#	Logs/shadercompiler-UnityShaderCompiler.exe5.log
#	Logs/shadercompiler-UnityShaderCompiler.exe7.log
#	Logs/shadercompiler-UnityShaderCompiler.exe8.log
#	Logs/shadercompiler-UnityShaderCompiler.exe9.log
#	obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache
#	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
2022-01-19 23:49:46 +03:00
.vs Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-19 23:49:46 +03:00
Assets Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-19 23:49:46 +03:00
Library Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-19 23:49:46 +03:00
Logs Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-19 23:49:46 +03:00
Packages Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ProjectSettings mission ver.1 + endless game + moving the inventory system + DataHolder 2022-01-17 17:49:27 +03:00
UserSettings Completely made inventory + created a stub for using equipment 2022-01-18 22:10:57 +03:00
obj/Debug minifix 2022-01-19 23:48:18 +03:00
.gitignore new .gitignore 2022-01-13 16:18:44 +03:00
.vsconfig okey, really first commit 2022-01-12 10:06:03 +03:00
README.md first commit 2022-01-12 09:59:03 +03:00

README.md