Залетов Федор cffb612cc7 Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO ... # Conflicts: # Library/ArtifactDB # Library/CurrentLayout-default.dwlt # Library/InspectorExpandedItems.asset # Library/SceneVisibilityState.asset # Library/SourceAssetDB # Logs/AssetImportWorker0-prev.log # Logs/AssetImportWorker0.log # Logs/shadercompiler-UnityShaderCompiler.exe4.log		2022-01-15 08:02:01 +03:00
..
Configs	Some fixes	2022-01-15 07:58:18 +03:00
Enemy	Added next step icon (working)	2022-01-15 00:55:46 +03:00
Card.cs	New enemy + card specialization + marker system	2022-01-14 10:42:43 +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	New enemy + card specialization + marker system	2022-01-14 10:42:43 +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
Player.cs	New enemy + card specialization + marker system	2022-01-14 10:42:43 +03:00
Player.cs.meta	enemy turn system + player script + bugfix	2022-01-13 11:00:37 +03:00
Session.cs	New enemy + card specialization + marker system	2022-01-14 10:42:43 +03:00
Session.cs.meta	Okey, really realy first commit. Troubleshooting errors	2022-01-12 10:39:15 +03:00