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

184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DyatelO
3ec1b523a2 Merge branch 'Alexei' into Zakhar 2022-02-03 02:19:32 +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
dddushesss
896a1dae28 fixed despawn items. added ISetUp.cs for building views 2022-01-31 19:29:45 +03:00
DyatelO
d7b606e885 Merge branch 'Zakhar' into Prod 2022-01-31 18:53:13 +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
7e09b90397 fixed cheat menu 2022-01-27 13:57:37 +03:00
dddushesss
495fb17ab7 Merge branch 'Alexei' into Prod 2022-01-26 18:18:05 +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
DyatelO
330ad97d72 Добавлены 3D звуки. И Прицел не выключается во время движения. 
Отключена реклама. Билд работает.
 2022-01-22 22:00:40 +03:00
DyatelO
41849df639 Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
 2022-01-20 15:37:26 +03:00
DyatelO
4190493dd0 Добавлен плагин Admob 2022-01-20 15:35:47 +03:00
dddushesss
f94c64f52c Merge branch 'Alexei' into Prod 2022-01-20 01:44:55 +03:00
dddushesss
54a1dc4f18 fix 2022-01-20 01:44:33 +03:00
dddushesss
784b1d3c17 fixes. added editorbutton 2022-01-20 01:03:49 +03:00
dddushesss
f8640c9ab2 Merge branch 'Alexei' into Prod 2022-01-19 22:53:35 +03:00
dddushesss
13e7fdd2ef icons, splashscreen 2022-01-19 21:37:33 +03:00
DyatelO
03df16d0c5 Отключена реклама. 2022-01-19 21:32:30 +03:00
DyatelO
73b9ad95e8 Добавлен 3Д звук на некоторые можели. 
Отображается прицел во время предвижения.
 2022-01-19 21:31:29 +03:00
dddushesss
1b51bbbe0e fixed bomb 2022-01-19 21:14:07 +03:00
dddushesss
8e35a15691 added bomb, added capture ability. fixes 2022-01-19 20:56:48 +03:00
DyatelO
88a0e09a9c Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/Scripts/Controller/GameInit.cs
 2022-01-19 13:20:07 +03:00
dddushesss
dbcc62d965 added capture ability. fixes 2022-01-18 22:43:19 +03:00
DyatelO
b6510c0d30 Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/Heureka.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.meta
#	Packages/manifest.json
#	Packages/packages-lock.json
 2022-01-18 02:54:59 +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
f15026f918 Merge branch 'Alexei' into Prod 2022-01-16 06:00:33 +03:00
dddushesss
07f24e06c3 some changes 2022-01-16 06:00:07 +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
DyatelO
bf5ce5528e Ещё стабильный билд без рекламы. 2022-01-14 12:14:21 +03:00
DyatelO
05910d57d7 Рабочий билд. без рекламы. 2022-01-14 10:57:41 +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