zaletovfyodor
/
PO
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
37 Commits 1 Branch 0 Tags 521 MiB
Commit Graph

34 Commits

Author SHA1 Message Date
Беляев Даниил bc53f03e57 completion of shortcomings 2022-02-01 21:49:54 +03:00
Беляев Даниил a95b864da0 Added maps to item description (visual) 2022-02-01 14:34:57 +03:00
Беляев Даниил c1636a3587 Resolution change 2022-01-29 21:15:36 +03:00
Беляев Даниил dc7cdd09be Added ranger pack 2022-01-28 19:47:38 +03:00
Беляев Даниил a43e7873c6 Ability to select the number of targets when creating cards + A card that deals damage to all enemies 2022-01-27 11:31:20 +03:00
Залетов Федор f9a81c0aad FIRST PROTOTYPE/ Updated IncidentSystem + repaired inventory 2022-01-20 11:44:38 +03:00
Залетов Федор 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
Беляев Даниил d5c91ca8ff Made armor for the enemy and the character + cards replenishing HP now work + small fixes 2022-01-15 21:47:03 +03:00
Беляев Даниил a33648edd8 Enemies are displaced to the left upon death 2022-01-15 12:11:34 +03:00
Залетов Федор 728573371c Updated enemyPrefabs + player prefab + update enemy turns 2022-01-15 10:29:16 +03:00
Залетов Федор cffb612cc7 Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO 
# Conflicts:
#	Library/ArtifactDB
#	Library/CurrentLayout-default.dwlt
#	Library/InspectorExpandedItems.asset
#	Library/SceneVisibilityState.asset
#	Library/SourceAssetDB
#	Logs/AssetImportWorker0-prev.log
#	Logs/AssetImportWorker0.log
#	Logs/shadercompiler-UnityShaderCompiler.exe4.log
 2022-01-15 08:02:01 +03:00
Залетов Федор 7edc0b2fc8 . 2022-01-15 08:01:13 +03:00
Залетов Федор c91fa87049 Some fixes 2022-01-15 07:58:18 +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
Залетов Федор 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
Залетов Федор bd052c4755 new card + bugfix 2022-01-13 16:15:53 +03:00
Беляев Даниил f40b9c3824 test 2022-01-13 15:58:33 +03:00
Залетов Федор 31191a5c5e enemy prefab 2022-01-13 12:07:16 +03:00
Залетов Федор afd57a1a23 enemy turn system + player script + bugfix 2022-01-13 11:00:37 +03:00
Залетов Федор 573b3fda65 Okey, really realy first commit. Troubleshooting errors 2022-01-12 10:39:15 +03:00
Залетов Федор 4112b19b37 okey, really first commit 2022-01-12 10:06:03 +03:00