zaletovfyodor
/
PO
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
PO/Assets
History
Залетов Федор 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
..
Graphics Updated font + new enemy: minigolem 2022-01-17 18:24:11 +03:00
Inventory Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-19 23:49:46 +03:00
Prefabs minifix 2022-01-19 23:48:18 +03:00
Scenes minifix 2022-01-19 23:48:18 +03:00
Scripts Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-19 23:49:46 +03:00
TextMesh Pro Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
DataHolder.cs added global list of maps + new method for working with it 2022-01-19 20:27:33 +03:00
DataHolder.cs.meta mission ver.1 + endless game + moving the inventory system + DataHolder 2022-01-17 17:49:27 +03:00
Graphics.meta Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
Inventory.meta minifix 2022-01-19 23:48:18 +03:00
MainCamera.cs mission ver.1 + endless game + moving the inventory system + DataHolder 2022-01-17 17:49:27 +03:00
MainCamera.cs.meta mission ver.1 + endless game + moving the inventory system + DataHolder 2022-01-17 17:49:27 +03:00
PhaseCounter.cs mission ver.1 + endless game + moving the inventory system + DataHolder 2022-01-17 17:49:27 +03:00
PhaseCounter.cs.meta mission ver.1 + endless game + moving the inventory system + DataHolder 2022-01-17 17:49:27 +03:00
Prefabs.meta Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
Scenes.meta Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
Scripts.meta Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
TextMesh Pro.meta Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00