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

59 Commits

Author SHA1 Message Date
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
b0b08de96b Шейдеры. Правки ИИ. 2022-02-14 02:53:59 +03:00
dddushesss
7c8f78a39b added rocket, level editor, level settings, made round async 2022-02-12 19:07:57 +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
82a6ed79bc Merge branch 'Prod' into Alexei 2022-01-31 20:01:48 +03:00
dddushesss
9ffcc35cf8 fixing light 2022-01-31 19:36:52 +03:00
DyatelO
2c7871b1f3 Правки визуальной части. 2022-01-31 18:51:59 +03:00
dddushesss
5ea371e08d optimization and bugs fixed 2022-01-31 18:39:13 +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
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
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
0ba3d39df9 optimization. changed move joystick to dynamic 2022-01-16 05:54:28 +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
9a20f44447 cleaned branch 2022-01-13 23:23:11 +03:00
dddushesss
6f3baa5a97 AI. Build does not work 2022-01-13 18:56:24 +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
DyatelO
a6c79ba3aa Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/Scripts/Units/Unit.cs
#	Assets/add.cs
 2022-01-08 15:07:40 +03:00
DyatelO
99bd500107 Добавлен респавн игрока после просмотра рекламы. (Нет спавна гексов цвета игрока при репавне.) 2022-01-08 03:57:28 +03:00
DyatelO
832807ae6d Добавлена кнопка повторной попытки. 2022-01-08 01:29:43 +03:00
DyatelO
e4a5948115 Класс add переименован в AdsMob 2022-01-07 22:31:39 +03:00
dddushesss
443845a35c ai start 2022-01-07 19:39:47 +03:00
DyatelO
0ff461f99a Изменена полоска выстрелов. (Для игрока) 2022-01-07 03:13:06 +03:00
dddushesss
b298adec90 final item fixes 2022-01-05 22:36:27 +03:00
dddushesss
ea32692481 minor fixes 2022-01-05 21:43:53 +03:00
dddushesss
5f0c2b0446 Merge branch 'Prod' into Alexei 
# Conflicts:
#	Assets/Resources/Data/ItemData.asset
 2022-01-05 21:36:39 +03:00
dddushesss
95f941abb8 weapon fixes 2022-01-05 21:33:46 +03:00
dddushesss
2d87148a09 Merge branch 'Alexei' into Prod 
# Conflicts:
#	Assets/Scenes/NewMainMenu.unity
#	Assets/Scripts/Units/Unit.cs
 2022-01-05 17:44:03 +03:00
dddushesss
c87a906d97 items finished 2022-01-05 15:43:08 +03:00
DyatelO
e196974851 Merge branch 'Zakhar' of https://github.com/BG-Games/S_Jump-and-grub into Zakhar 
# Conflicts:
#	Assets/Scripts/HexFiled/PaintedController.cs
 2022-01-05 02:49:07 +03:00
dddushesss
7421638a8d item base class. tower. some fixes. inventory canvas 2022-01-04 20:57:06 +03:00
dddushesss
2b78e18398 fixes 2022-01-03 22:38:21 +03:00
dddushesss
9a0d54ee76 new main menu 2022-01-03 00:41:09 +03:00
dddushesss
cd2a468be9 started new main menu. fixed round bag 2021-12-31 19:26:01 +03:00
dddushesss
1977ae6d7c minor fixes 2021-12-30 19:57:59 +03:00
dddushesss
6bb16f8757 Отрезание 2021-12-29 21:11:12 +03:00
dddushesss
94fcee00f6 fixed unit bar facing camera, other minor fixes 2021-12-29 06:15:38 +03:00
dddushesss
16852906d3 changed menu, added weapon choose,added music controller, settings save 2021-12-28 17:17:47 +03:00
dddushesss
9a9481eb04 added pause menu, refactored unit canvas, added ui controller 2021-12-27 21:01:37 +03:00
dddushesss
849bce5891 fire forward on tap attack joystick 2021-12-27 17:06:17 +03:00
dddushesss
4f188bc304 Added mana mechanic, shoots limitation and ui for it. added vfx for hitting. Hitting is working. aim ui 2021-12-25 05:17:35 +03:00
dddushesss
4336526417 added enemy spawn 2021-12-22 21:53:12 +03:00
dddushesss
2b404fd7bf previos commit 2021-12-21 21:23:10 +03:00