zaletovfyodor
/
PO
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
PO/Library/Artifacts
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
..
00 enemy prefab 2022-01-13 12:07:16 +03:00
0a enemy prefab 2022-01-13 12:07:16 +03:00
0b enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
0c enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
0d enemy prefab 2022-01-13 12:07:16 +03:00
0e new card + bugfix 2022-01-13 16:15:53 +03:00
0f enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
01 enemy prefab 2022-01-13 12:07:16 +03:00
1a enemy prefab 2022-01-13 12:07:16 +03:00
1b Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
1c new card + bugfix 2022-01-13 16:15:53 +03:00
1d enemy prefab 2022-01-13 12:07:16 +03:00
1e enemy prefab 2022-01-13 12:07:16 +03:00
1f enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
02 enemy prefab 2022-01-13 12:07:16 +03:00
2a enemy prefab 2022-01-13 12:07:16 +03:00
2b test 2022-01-13 15:58:33 +03:00
2c test 2022-01-13 15:58:33 +03:00
2d enemy prefab 2022-01-13 12:07:16 +03:00
2e enemy prefab 2022-01-13 12:07:16 +03:00
2f enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
03 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
3a test 2022-01-13 15:58:33 +03:00
3b new card + bugfix 2022-01-13 16:15:53 +03:00
3c enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
3d enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
3e test 2022-01-13 15:58:33 +03:00
3f enemy prefab 2022-01-13 12:07:16 +03:00
04 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
4a enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
4b enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
4c Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
4d enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
4e new card + bugfix 2022-01-13 16:15:53 +03:00
4f test 2022-01-13 15:58:33 +03:00
05 enemy prefab 2022-01-13 12:07:16 +03:00
5a enemy prefab 2022-01-13 12:07:16 +03:00
5b enemy prefab 2022-01-13 12:07:16 +03:00
5c new card + bugfix 2022-01-13 16:15:53 +03:00
5d enemy prefab 2022-01-13 12:07:16 +03:00
5e enemy prefab 2022-01-13 12:07:16 +03:00
5f enemy prefab 2022-01-13 12:07:16 +03:00
06 new card + bugfix 2022-01-13 16:15:53 +03:00
6a enemy prefab 2022-01-13 12:07:16 +03:00
6b enemy prefab 2022-01-13 12:07:16 +03:00
6c enemy prefab 2022-01-13 12:07:16 +03:00
6d new card + bugfix 2022-01-13 16:15:53 +03:00
6e Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
6f Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
07 new card + bugfix 2022-01-13 16:15:53 +03:00
7a test 2022-01-13 15:58:33 +03:00
7b enemy prefab 2022-01-13 12:07:16 +03:00
7c test 2022-01-13 15:58:33 +03:00
7d enemy prefab 2022-01-13 12:07:16 +03:00
7e new card + bugfix 2022-01-13 16:15:53 +03:00
7f enemy prefab 2022-01-13 12:07:16 +03:00
08 enemy prefab 2022-01-13 12:07:16 +03:00
8a enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
8b new card + bugfix 2022-01-13 16:15:53 +03:00
8c enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
8d enemy prefab 2022-01-13 12:07:16 +03:00
8e enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
8f Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
09 new card + bugfix 2022-01-13 16:15:53 +03:00
9a enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
9b enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
9c enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
9d Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
9e Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
9f new card + bugfix 2022-01-13 16:15:53 +03:00
10 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
11 enemy prefab 2022-01-13 12:07:16 +03:00
12 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
13 test 2022-01-13 15:58:33 +03:00
14 enemy prefab 2022-01-13 12:07:16 +03:00
15 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
16 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
17 enemy prefab 2022-01-13 12:07:16 +03:00
18 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
19 enemy prefab 2022-01-13 12:07:16 +03:00
20 enemy prefab 2022-01-13 12:07:16 +03:00
21 new card + bugfix 2022-01-13 16:15:53 +03:00
22 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
23 new card + bugfix 2022-01-13 16:15:53 +03:00
24 enemy prefab 2022-01-13 12:07:16 +03:00
25 enemy prefab 2022-01-13 12:07:16 +03:00
26 new card + bugfix 2022-01-13 16:15:53 +03:00
27 new card + bugfix 2022-01-13 16:15:53 +03:00
28 new card + bugfix 2022-01-13 16:15:53 +03:00
29 enemy prefab 2022-01-13 12:07:16 +03:00
30 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
31 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
32 enemy prefab 2022-01-13 12:07:16 +03:00
33 enemy prefab 2022-01-13 12:07:16 +03:00
34 new card + bugfix 2022-01-13 16:15:53 +03:00
35 test 2022-01-13 15:58:33 +03:00
36 new card + bugfix 2022-01-13 16:15:53 +03:00
37 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
38 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
39 enemy prefab 2022-01-13 12:07:16 +03:00
40 enemy prefab 2022-01-13 12:07:16 +03:00
41 enemy prefab 2022-01-13 12:07:16 +03:00
42 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
43 enemy prefab 2022-01-13 12:07:16 +03:00
44 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
45 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
46 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
47 enemy prefab 2022-01-13 12:07:16 +03:00
48 new card + bugfix 2022-01-13 16:15:53 +03:00
49 enemy prefab 2022-01-13 12:07:16 +03:00
50 enemy prefab 2022-01-13 12:07:16 +03:00
51 enemy prefab 2022-01-13 12:07:16 +03:00
52 test 2022-01-13 15:58:33 +03:00
53 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
54 enemy prefab 2022-01-13 12:07:16 +03:00
55 new card + bugfix 2022-01-13 16:15:53 +03:00
56 enemy prefab 2022-01-13 12:07:16 +03:00
57 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
58 enemy prefab 2022-01-13 12:07:16 +03:00
59 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
60 test 2022-01-13 15:58:33 +03:00
61 Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-13 16:17:34 +03:00
62 enemy prefab 2022-01-13 12:07:16 +03:00
63 new card + bugfix 2022-01-13 16:15:53 +03:00
64 enemy prefab 2022-01-13 12:07:16 +03:00
65 new card + bugfix 2022-01-13 16:15:53 +03:00
66 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
67 enemy prefab 2022-01-13 12:07:16 +03:00
68 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
69 enemy prefab 2022-01-13 12:07:16 +03:00
70 test 2022-01-13 15:58:33 +03:00
71 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
72 enemy prefab 2022-01-13 12:07:16 +03:00
73 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
74 enemy prefab 2022-01-13 12:07:16 +03:00
75 enemy prefab 2022-01-13 12:07:16 +03:00
76 test 2022-01-13 15:58:33 +03:00
77 enemy prefab 2022-01-13 12:07:16 +03:00
78 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
79 enemy prefab 2022-01-13 12:07:16 +03:00
80 new card + bugfix 2022-01-13 16:15:53 +03:00
81 test 2022-01-13 15:58:33 +03:00
82 new card + bugfix 2022-01-13 16:15:53 +03:00
83 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
84 enemy prefab 2022-01-13 12:07:16 +03:00
85 enemy prefab 2022-01-13 12:07:16 +03:00
86 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
87 new card + bugfix 2022-01-13 16:15:53 +03:00
88 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
89 test 2022-01-13 15:58:33 +03:00
90 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
91 enemy prefab 2022-01-13 12:07:16 +03:00
92 enemy prefab 2022-01-13 12:07:16 +03:00
93 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
94 enemy prefab 2022-01-13 12:07:16 +03:00
95 enemy prefab 2022-01-13 12:07:16 +03:00
96 enemy prefab 2022-01-13 12:07:16 +03:00
97 test 2022-01-13 15:58:33 +03:00
98 enemy prefab 2022-01-13 12:07:16 +03:00
99 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
a0 enemy prefab 2022-01-13 12:07:16 +03:00
a1 enemy prefab 2022-01-13 12:07:16 +03:00
a2 enemy prefab 2022-01-13 12:07:16 +03:00
a3 enemy prefab 2022-01-13 12:07:16 +03:00
a4 enemy prefab 2022-01-13 12:07:16 +03:00
a5 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
a6 test 2022-01-13 15:58:33 +03:00
a7 enemy prefab 2022-01-13 12:07:16 +03:00
a8 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
a9 new card + bugfix 2022-01-13 16:15:53 +03:00
aa new card + bugfix 2022-01-13 16:15:53 +03:00
ab enemy prefab 2022-01-13 12:07:16 +03:00
ac enemy prefab 2022-01-13 12:07:16 +03:00
ad enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ae test 2022-01-13 15:58:33 +03:00
af test 2022-01-13 15:58:33 +03:00
b0 enemy prefab 2022-01-13 12:07:16 +03:00
b1 enemy prefab 2022-01-13 12:07:16 +03:00
b2 enemy prefab 2022-01-13 12:07:16 +03:00
b3 enemy prefab 2022-01-13 12:07:16 +03:00
b4 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
b5 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
b6 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
b7 enemy prefab 2022-01-13 12:07:16 +03:00
b8 test 2022-01-13 15:58:33 +03:00
b9 new card + bugfix 2022-01-13 16:15:53 +03:00
ba enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
bb new card + bugfix 2022-01-13 16:15:53 +03:00
bc enemy prefab 2022-01-13 12:07:16 +03:00
bd Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
be Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
bf enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
c0 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
c1 test 2022-01-13 15:58:33 +03:00
c2 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
c3 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
c4 new card + bugfix 2022-01-13 16:15:53 +03:00
c5 new card + bugfix 2022-01-13 16:15:53 +03:00
c6 new card + bugfix 2022-01-13 16:15:53 +03:00
c7 enemy prefab 2022-01-13 12:07:16 +03:00
c8 test 2022-01-13 15:58:33 +03:00
c9 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ca enemy prefab 2022-01-13 12:07:16 +03:00
cb enemy prefab 2022-01-13 12:07:16 +03:00
cc new card + bugfix 2022-01-13 16:15:53 +03:00
cd enemy prefab 2022-01-13 12:07:16 +03:00
ce Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-13 16:17:34 +03:00
cf new card + bugfix 2022-01-13 16:15:53 +03:00
d0 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
d1 enemy prefab 2022-01-13 12:07:16 +03:00
d2 test 2022-01-13 15:58:33 +03:00
d3 enemy prefab 2022-01-13 12:07:16 +03:00
d4 new card + bugfix 2022-01-13 16:15:53 +03:00
d5 enemy prefab 2022-01-13 12:07:16 +03:00
d6 enemy prefab 2022-01-13 12:07:16 +03:00
d7 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
d8 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
d9 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
da test 2022-01-13 15:58:33 +03:00
db enemy prefab 2022-01-13 12:07:16 +03:00
dc new card + bugfix 2022-01-13 16:15:53 +03:00
dd Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
de new card + bugfix 2022-01-13 16:15:53 +03:00
df enemy prefab 2022-01-13 12:07:16 +03:00
e0 enemy prefab 2022-01-13 12:07:16 +03:00
e1 new card + bugfix 2022-01-13 16:15:53 +03:00
e2 enemy prefab 2022-01-13 12:07:16 +03:00
e3 new card + bugfix 2022-01-13 16:15:53 +03:00
e4 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
e5 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
e6 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
e7 test 2022-01-13 15:58:33 +03:00
e8 enemy prefab 2022-01-13 12:07:16 +03:00
e9 test 2022-01-13 15:58:33 +03:00
ea enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
eb new card + bugfix 2022-01-13 16:15:53 +03:00
ec enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ed enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ee Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
ef enemy prefab 2022-01-13 12:07:16 +03:00
f0 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
f1 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
f2 new card + bugfix 2022-01-13 16:15:53 +03:00
f3 new card + bugfix 2022-01-13 16:15:53 +03:00
f4 new card + bugfix 2022-01-13 16:15:53 +03:00
f5 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
f6 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
f7 new card + bugfix 2022-01-13 16:15:53 +03:00
f8 test 2022-01-13 15:58:33 +03:00
f9 new card + bugfix 2022-01-13 16:15:53 +03:00
fa Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
fb enemy prefab 2022-01-13 12:07:16 +03:00
fc new card + bugfix 2022-01-13 16:15:53 +03:00
fd new card + bugfix 2022-01-13 16:15:53 +03:00
fe enemy prefab 2022-01-13 12:07:16 +03:00
ff enemy prefab 2022-01-13 12:07:16 +03:00