Commit Graph

19 Commits

Author SHA1 Message Date
Залетов Федор c8c6f0c010 WARNING! CRASH INVENTORY!!! /// Incident System + small improvements 2022-01-20 02:46:04 +03:00
Залетов Федор 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
Залетов Федор 39f3ef5be8 minifix 2022-01-19 23:48:18 +03:00
Беляев Даниил 1e2d39e0dd added global list of maps + new method for working with it 2022-01-19 20:27:33 +03:00
Беляев Даниил 589282d9e2 Completely made inventory + created a stub for using equipment 2022-01-18 22:10:57 +03:00
Беляев Даниил c93e1eff29 It works, but not as it should) 2022-01-17 23:09:07 +03:00
Залетов Федор 50985c9aa4 Updated font + new enemy: minigolem 2022-01-17 18:24:11 +03:00
Залетов Федор 7313001ee7 mission ver.1 + endless game + moving the inventory system + DataHolder 2022-01-17 17:49:27 +03:00
Беляев Даниил 1f94abd083 Inventory interface made + small fixes 2022-01-16 23:20:47 +03:00
Залетов Федор 8ee19b10cd Updating armor system 2022-01-15 23:26:40 +03:00
Беляев Даниил a33648edd8 Enemies are displaced to the left upon death 2022-01-15 12:11:34 +03:00
Беляев Даниил e432fe75ad idk 2022-01-15 01:05:02 +03:00
Беляев Даниил bf3ff49d38 Added next step icon (working) 2022-01-15 00:55:46 +03:00
Залетов Федор 54a0e9e690 shaman fix 2022-01-14 12:25:32 +03:00
Залетов Федор beff3f591d New enemy + card specialization + marker system 2022-01-14 10:42:43 +03:00
Беляев Даниил e49e96f2ec Переделана подстановка текста в скрипте Card 2022-01-13 23:33:21 +03:00
Беляев Даниил f40b9c3824 test 2022-01-13 15:58:33 +03:00
Залетов Федор afd57a1a23 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
Залетов Федор 4112b19b37 okey, really first commit 2022-01-12 10:06:03 +03:00