zaletovfyodor
/
PO
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
PO/Library/Artifacts/ce
History
Залетов Федор 7716822fbb Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 
# Conflicts:
#	Library/ArtifactDB
#	Library/Artifacts/07/075865a943086604a762d95a5807cdaa
#	Library/Artifacts/0e/0e8cb150e08f91c527ab98a19f079906
#	Library/Artifacts/1c/1c832a41d5750b091ce64db3e556b16e
#	Library/Artifacts/21/212997b24db34583c86cdb63cde56cda
#	Library/Artifacts/48/4845d065de8cbc74f79a14e634acd590
#	Library/Artifacts/5c/5ce9ba3e15ec14065598cc6610a35ff8
#	Library/Artifacts/61/61e07943a3c939c0874f89420a9e06e4
#	Library/Artifacts/76/7698b31a2be09fa44fed242ef1879a06
#	Library/Artifacts/7e/7e6c680e10eed54084aae97a8ae47ebf
#	Library/Artifacts/89/89477e0f84f72905c4d45749d2fefdde
#	Library/Artifacts/9f/9f2739eac630a515c9ccc8b9cff5faf9
#	Library/Artifacts/a9/a93e8833f42f63dd1399cc36cb0d482a
#	Library/Artifacts/aa/aac789788bb9465c7a6d6869dffb49d2
#	Library/Artifacts/c6/c6f9e2c30532558927351ae5ccc82160
#	Library/Artifacts/c8/c8365094b84ebf089d65861ad06a6691
#	Library/Artifacts/ce/ce3b4bf9dcb86cb04c132cfd3775cb39
#	Library/Artifacts/ce/ce93173dece2bc5ac6e856ef4b91890e
#	Library/Artifacts/dc/dc372914ede409a9c46990dc3cb2a5b3
#	Library/Artifacts/de/de25b0b561f98c91e7bd4ee7414a8cfb
#	Library/CurrentLayout-default.dwlt
#	Library/InspectorExpandedItems.asset
#	Library/SceneVisibilityState.asset
#	Library/ScriptAssemblies/Assembly-CSharp.dll
#	Library/ScriptAssemblies/Assembly-CSharp.pdb
#	Library/SourceAssetDB
#	Logs/AssetImportWorker0.log
#	Logs/shadercompiler-UnityShaderCompiler.exe0.log
#	Logs/shadercompiler-UnityShaderCompiler.exe4.log
#	Logs/shadercompiler-UnityShaderCompiler.exe5.log
#	Logs/shadercompiler-UnityShaderCompiler.exe6.log
#	Logs/shadercompiler-UnityShaderCompiler.exe7.log
 		2022-01-13 16:17:34 +03:00
..
ce0d8017bdcc9f8f448b8e5ec499308d Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce2f38d290743445c32f045fb883bb3f Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce3b4bf9dcb86cb04c132cfd3775cb39 new card + bugfix 2022-01-13 16:15:53 +03:00
ce4e42b2d64fcf152aafa4add569fcbd Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce6d4d84fb67371d7ce6ecfd906c4575 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ce7c3ef26e0d2e468504b47636aaa508 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ce9ac680ef857d3b9ddeb06564d3d24b enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ce14ac7c3423f5057d7633878d552288 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce467cecedb044cbbab7dd5621aba86c Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce3276d368542d2493bb8fb2c7edf0c5 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce4189d4bbb0bdfcbf8535df153e6c34 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce4723c18f33dcae7fe23f2fdea1d819 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce4907cbf59d4b37e84a38e7d6e0b7cf Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce7857c7dc7fafca7a4ad5748936ce1a enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ce50106c773231365bd95f0b419f0831 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce93173dece2bc5ac6e856ef4b91890e test 2022-01-13 15:58:33 +03:00
ce725992ed9dea544d720582d3680408 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ce11678668bea2c7197e2412d73e0f4f Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
cea8323aa815e87f2745439386e3a778 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ceb340cd96a9e23a6a798d90780c867d Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
cebf8f5cde9ed713460279e3fb2f0ac0 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ced17447a2ec5f395dc74cfc40967eb2 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
cefdc36f9bfbb3a4b7db11ef9d85a8fe Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00