Залетов Федор 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
..
Configs	Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO	2022-01-19 23:49:46 +03:00
Enemy	Updating armor system	2022-01-15 23:26:40 +03:00
Equipment	Inventory interface made + small fixes	2022-01-16 23:20:47 +03:00
Not used	minifix	2022-01-19 23:48:18 +03:00
CanvasChanger.cs	mission ver.1 + endless game + moving the inventory system + DataHolder	2022-01-17 17:49:27 +03:00
CanvasChanger.cs.meta	Inventory interface made + small fixes	2022-01-16 23:20:47 +03:00
Card.cs	mission ver.1 + endless game + moving the inventory system + DataHolder	2022-01-17 17:49:27 +03:00
Card.cs.meta	Okey, really realy first commit. Troubleshooting errors	2022-01-12 10:39:15 +03:00
Configs.meta	Okey, really realy first commit. Troubleshooting errors	2022-01-12 10:39:15 +03:00
DeckManager.cs	mission ver.1 + endless game + moving the inventory system + DataHolder	2022-01-17 17:49:27 +03:00
DeckManager.cs.meta	Okey, really realy first commit. Troubleshooting errors	2022-01-12 10:39:15 +03:00
Enemy.meta	new card + bugfix	2022-01-13 16:15:53 +03:00
Equipment.meta	Inventory interface made + small fixes	2022-01-16 23:20:47 +03:00
Not used.meta	Updated enemyPrefabs + player prefab + update enemy turns	2022-01-15 10:29:16 +03:00
Player.cs	Updating armor system	2022-01-15 23:26:40 +03:00
Player.cs.meta	enemy turn system + player script + bugfix	2022-01-13 11:00:37 +03:00
SceneLoader.cs	mission ver.1 + endless game + moving the inventory system + DataHolder	2022-01-17 17:49:27 +03:00
SceneLoader.cs.meta	Inventory interface made + small fixes	2022-01-16 23:20:47 +03:00
Session.cs	Completely made inventory + created a stub for using equipment	2022-01-18 22:10:57 +03:00
Session.cs.meta	Okey, really realy first commit. Troubleshooting errors	2022-01-12 10:39:15 +03:00