zaletovfyodor
/
PO
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
PO/Library
History
Залетов Федор 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
..
APIUpdater enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
Artifacts It works, but not as it should) 2022-01-17 23:09:07 +03:00
PackageCache Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
PackageManager minifix 2022-01-19 23:48:18 +03:00
ScriptAssemblies minifix 2022-01-19 23:48:18 +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 minifix 2022-01-19 23:48:18 +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-19 23:49:46 +03:00
EditorOnlyScriptingSettings.json minifix 2022-01-19 23:48:18 +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 minifix 2022-01-19 23:48:18 +03:00
LastSceneManagerSetup.txt It works, but not as it should) 2022-01-17 23:09:07 +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 minifix 2022-01-19 23:48:18 +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 minifix 2022-01-19 23:48:18 +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 minifix 2022-01-19 23:48:18 +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