dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204 Commits 12 Branches 0 Tags
Commit Graph

110 Commits

Author SHA1 Message Date
dddushesss
975bc7b311 item system global fix 2022-02-18 05:02:16 +03:00
dddushesss
6533271dc8 Merge branch 'Zakhar' into Alexei 
# Conflicts:
#	Assets/Plugins/Sirenix.meta
#	Assets/Plugins/Sirenix/Assemblies.meta
#	Assets/Plugins/Sirenix/Assemblies/NoEditor.meta
#	Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor.meta
#	Assets/Plugins/Sirenix/Odin Inspector.meta
#	Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/GeneralDrawerConfig.asset
#	Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset
#	Assets/Prefab/HexCell.prefab
 2022-02-14 22:10:56 +03:00
DyatelO
99761e6cab Цветокор как в старой версии. 2022-02-14 05:51:45 +03:00
dddushesss
cb8fbbafce fixed CaptureAbility.cs 2022-02-14 05:01:53 +03:00
dddushesss
76e280dfad fixed item despawn 2022-02-14 04:52:54 +03:00
dddushesss
9ca0f33ceb added infinite mana, magnet, stakes, fixed inventory after respawn 2022-02-14 04:15:36 +03:00
DyatelO
b0b08de96b Шейдеры. Правки ИИ. 2022-02-14 02:53:59 +03:00
dddushesss
b2dc16746a Item Fixed 2022-02-14 01:45:11 +03:00
dddushesss
eb2fd931ff added item editor in item settings 2022-02-12 23:44:05 +03:00
dddushesss
7c8f78a39b added rocket, level editor, level settings, made round async 2022-02-12 19:07:57 +03:00
dddushesss
1b6b18e2dc added map editor 2022-02-08 23:10:34 +03:00
dddushesss
8a32e9c2dd added odin, Added LevelSettings.cs for adding new LevelS 2022-02-07 19:57:50 +03:00
DyatelO
37d7562f85 Merge branch 'Alexei' into Zakhar 2022-02-07 18:27:32 +03:00
DyatelO
626cc30f14 Добавлен свет. 2022-02-07 18:27:18 +03:00
dddushesss
e574b0294a added rocket 2022-02-07 13:16:46 +03:00
dddushesss
53ffc3a8f6 fixes 2022-02-05 22:15:01 +03:00
dddushesss
e51a742d2c folder logic and fixes 2022-02-02 19:08:18 +03:00
dddushesss
dae27aa6b8 light 2022-01-31 20:06:47 +03:00
dddushesss
9ffcc35cf8 fixing light 2022-01-31 19:36:52 +03:00
DyatelO
2c7871b1f3 Правки визуальной части. 2022-01-31 18:51:59 +03:00
DyatelO
562572beb0 Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/Prefab/Canvas.prefab
#	Assets/Scripts/Controller/GameInit.cs
#	Assets/Scripts/GameUI/UIController.cs
#	Assets/Scripts/Units/PlayerControl.cs
 2022-01-28 18:21:28 +03:00
dddushesss
7e09b90397 fixed cheat menu 2022-01-27 13:57:37 +03:00
dddushesss
f222ed4bec added CheatMenu.cs, optimized canvas 2022-01-26 18:17:42 +03:00
DyatelO
5f9a16e4bb Цветокоррекция и мелкие исправления. 2022-01-26 00:10:39 +03:00
dddushesss
4e3cfd2cd7 fixes. heal item 2022-01-26 00:01:04 +03:00
dddushesss
1385b54587 fixed items, added resources new abilities 2022-01-25 22:19:59 +03:00
dddushesss
e2017dc339 changed spawn logic. fixed inventory 2022-01-24 05:31:26 +03:00
dddushesss
8e35a15691 added bomb, added capture ability. fixes 2022-01-19 20:56:48 +03:00
dddushesss
dbcc62d965 added capture ability. fixes 2022-01-18 22:43:19 +03:00
dddushesss
e8fdc6c5b5 optimization. fixed mana regen, towers only on own territory, destroing buildings, changed bar canvas look at camera, fixed move(cannot move to hex, where is another character). fixed spawn. fixed random weapon to enemies 2022-01-18 02:48:30 +03:00
dddushesss
2183deb840 ai settings, autoaim, 2022-01-17 13:01:19 +03:00
dddushesss
3304c858d0 fixes shaders. fixed ai. fixed project size 2022-01-17 11:26:35 +03:00
dddushesss
0ba3d39df9 optimization. changed move joystick to dynamic 2022-01-16 05:54:28 +03:00
dddushesss
74af3ab42d resources optimized 2022-01-16 05:40:49 +03:00
dddushesss
196b483125 final fix for build bug. optimized 2022-01-16 05:38:22 +03:00
dddushesss
d75d52df94 reimported project 2022-01-15 22:31:30 +03:00
dddushesss
212d976b54 cleaned branch 2022-01-15 22:31:25 +03:00
dddushesss
9a20f44447 cleaned branch 2022-01-13 23:23:11 +03:00
dddushesss
2c2fae3b58 Merge remote-tracking branch 'origin/Alexei' into Alexei 
# Conflicts:
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Mana.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Power.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Replace.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Magnet.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab.meta
#	Assets/Resources/Data/ItemData.asset
#	Assets/Scripts/Items/Bonus.cs.meta
#	Assets/Scripts/Items/Building.cs.meta
 2022-01-13 22:59:27 +03:00
dddushesss
03960d7d0b fixes/ latest ai version 2022-01-13 22:58:54 +03:00
dddushesss
6f3baa5a97 AI. Build does not work 2022-01-13 18:56:24 +03:00
dddushesss
cac61cfdd7 item fixes 2022-01-11 07:02:07 +03:00
dddushesss
d7424ed972 refactored items 2022-01-11 06:36:00 +03:00
dddushesss
2528c3e4dd paint fix, tower fix 2022-01-11 04:57:05 +03:00
dddushesss
7c5979e6a9 vfx controller, fire method in weapon 2022-01-10 23:26:07 +03:00
dddushesss
6224ac3354 changed tower view and prefab 2022-01-10 22:25:25 +03:00
dddushesss
564d85ae6f mana regen fix. hardcapture fix. mana limit capture 2022-01-10 17:37:20 +03:00
dddushesss
ff5bdd180a movement fix. ai movement 2022-01-10 17:11:07 +03:00
dddushesss
722b8da02b spawn, adsmob, ai, respawn 2022-01-09 00:37:09 +03:00
DyatelO
b197f6d8b2 Лёгкие исправления. 2022-01-08 15:50:03 +03:00