213 Commits

Author SHA1 Message Date
Uamgl
0cef3f4972 Add all Wariors 2022-03-25 19:34:26 +02:00
Uamgl
7ad754b56e Not Conflicts 2022-03-15 18:06:00 +02:00
Uamgl
2af75490ba Add Patroul 2022-03-15 17:45:18 +02:00
abaf11d237 added enemy random spawn, added kill unit un cheat menu 2022-03-15 16:31:57 +03:00
Uamgl
b1e00327d8 Add Warior 2022-03-12 03:45:04 +02:00
dddushesss
436e8b10d0 added warrior classes 2022-02-28 16:23:54 +03:00
dddushesss
020dbc4be6 fixed Rocket 2022-02-24 14:55:55 +03:00
dddushesss
0503421766 added scroll thirdparty asset, fixed main menu 2022-02-22 05:10:30 +03:00
dddushesss
a690c5b637 added teleport, slow arrow, invisible, fixed switching places, stake, added listing levels, 3 levels as example 2022-02-21 06:13:40 +03:00
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
dddushesss
960f2c2e1f meta 2022-02-14 22:07:36 +03:00
dddushesss
fbbf806bab invetory fix 2022-02-14 22:03:08 +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
919d7c8726 fixed rocket, hard capture bar 2022-02-12 19:40:04 +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
6f1f5911cd fixed items, fixed retreet on enemy capture 2022-02-03 21:27:56 +03:00
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