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 |
|
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 |
|