zaletovfyodor
/
PO
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
PO/Library
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
..
APIUpdater enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
Artifacts Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-13 16:17:34 +03:00
PackageCache Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
PackageManager test 2022-01-13 15:58:33 +03:00
ScriptAssemblies new card + bugfix 2022-01-13 16:15:53 +03:00
ShaderCache test 2022-01-13 15:58:33 +03:00
StateCache Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-13 16:17:34 +03:00
AnnotationManager enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ArtifactDB new card + bugfix 2022-01-13 16:15:53 +03:00
ArtifactDB-lock enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
AssetImportState okey, really first commit 2022-01-12 10:06:03 +03:00
BuildPlayer.prefs okey, really first commit 2022-01-12 10:06:03 +03:00
BuildSettings.asset enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
CurrentLayout-default.dwlt Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 2022-01-13 16:17:34 +03:00
EditorOnlyScriptingSettings.json okey, really first commit 2022-01-12 10:06:03 +03:00
EditorOnlyVirtualTextureState.json okey, really first commit 2022-01-12 10:06:03 +03:00
EditorSnapSettings.asset okey, really first commit 2022-01-12 10:06:03 +03:00
EditorUserBuildSettings.asset enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
EditorUserSettings.asset okey, really first commit 2022-01-12 10:06:03 +03:00
InspectorExpandedItems.asset new card + bugfix 2022-01-13 16:15:53 +03:00
LastSceneManagerSetup.txt okey, really first commit 2022-01-12 10:06:03 +03:00
LibraryFormatVersion.txt okey, really first commit 2022-01-12 10:06:03 +03:00
MonoManager.asset enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
SceneVisibilityState.asset new card + bugfix 2022-01-13 16:15:53 +03:00
ScriptMapper enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
ShaderCache.db Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
SourceAssetDB new card + bugfix 2022-01-13 16:15:53 +03:00
SourceAssetDB-lock enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
SpriteAtlasDatabase.asset Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
Style.catalog Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
expandedItems Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
shadercompiler-UnityShaderCompiler.exe0.log enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
shadercompiler-UnityShaderCompiler.exe1.log enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
shadercompiler-UnityShaderCompiler.exe2.log enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00