dddushesss
|
443845a35c
|
ai start
|
2022-01-07 19:39:47 +03:00 |
|
dddushesss
|
315d54a56e
|
add added
|
2022-01-06 16:17:20 +03:00 |
|
dddushesss
|
6eb981cf59
|
effect for rounding
|
2022-01-06 12:04:20 +03:00 |
|
dddushesss
|
43993fb918
|
fixed rounding
|
2022-01-06 10:59:47 +03:00 |
|
dddushesss
|
b298adec90
|
final item fixes
|
2022-01-05 22:36:27 +03:00 |
|
dddushesss
|
ea2690fb00
|
Merge branch 'Alexei' of https://github.com/BG-Games/S_Jump-and-grub into Alexei
|
2022-01-05 22:06:58 +03:00 |
|
dddushesss
|
69f25319a4
|
no message
|
2022-01-05 22:06:40 +03:00 |
|
dddushesss
|
0fea04df39
|
no message
|
2022-01-05 21:44:24 +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
|
732e184c22
|
Merge branch 'Alexei' into Prod
|
2022-01-05 17:55:30 +03:00 |
|
dddushesss
|
6ccb4723cb
|
fixed weapon modified damage
|
2022-01-05 17:54:11 +03:00 |
|
dddushesss
|
8393a51221
|
deleted obsolute
|
2022-01-05 17:49:10 +03:00 |
|
dddushesss
|
0585266d8d
|
merge fixes
|
2022-01-05 17:48:27 +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
|
fd79cecfdd
|
some changes
|
2022-01-05 17:42:55 +03:00 |
|
dddushesss
|
60920c229e
|
Merge branch 'Alexei' of https://github.com/BG-Games/S_Jump-and-grub into Alexei
|
2022-01-05 17:39:10 +03:00 |
|
dddushesss
|
482a8371a3
|
fixes item
|
2022-01-05 17:39:00 +03:00 |
|
dddushesss
|
b4d5b6abe2
|
Merge pull request #4 from BG-Games/Zakhar
Zakhar
|
2022-01-05 17:17:31 +03:00 |
|
dddushesss
|
690af7421b
|
something
|
2022-01-05 16:04:09 +03:00 |
|
dddushesss
|
c87a906d97
|
items finished
|
2022-01-05 15:43:08 +03:00 |
|
DyatelO
|
ff63e72172
|
Баг с перезарядкой. (Дополнение.)
|
2022-01-05 05:11:30 +03:00 |
|
DyatelO
|
b85aae35d4
|
Скорректирован баг с перезарядкой.
|
2022-01-05 03:41:23 +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
|
38749a4a95
|
fiexed rounding/cutting.
|
2022-01-03 19:48:44 +03:00 |
|
dddushesss
|
def871faed
|
fixes. chosen weapon status
|
2022-01-03 18:47:13 +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 |
|
DyatelO
|
831b007331
|
Merge branch 'Zakhar' of https://github.com/BG-Games/S_Jump-and-grub into Zakhar
|
2021-12-30 20:15:40 +03:00 |
|
DyatelO
|
c6391c6441
|
no message
|
2021-12-30 20:14:47 +03:00 |
|
dddushesss
|
4d0be05a80
|
Merge pull request #1 from BG-Games/Zakhar
Zakhar
|
2021-12-30 20:01:03 +03:00 |
|
dddushesss
|
ec9b0b8e17
|
Merge branch 'Prod' into Zakhar
|
2021-12-30 20:00:57 +03:00 |
|
dddushesss
|
3ef4b65c69
|
Merge pull request #2 from BG-Games/Alexei
Alexei
|
2021-12-30 19:59:51 +03:00 |
|
dddushesss
|
1977ae6d7c
|
minor fixes
|
2021-12-30 19:57:59 +03:00 |
|
dddushesss
|
d083a5dc9c
|
fixes
|
2021-12-30 19:51:11 +03:00 |
|
DyatelO
|
7c43cc8bc3
|
Merge branch 'Zakhar' of https://github.com/BG-Games/S_Jump-and-grub into Zakhar
|
2021-12-29 22:36:30 +03:00 |
|
DyatelO
|
077fed3fee
|
Debug forUnity
|
2021-12-29 22:36:19 +03:00 |
|
dddushesss
|
6bb16f8757
|
Отрезание
|
2021-12-29 21:11:12 +03:00 |
|
dddushesss
|
d94a8b64f3
|
some fixes
|
2021-12-29 20:03:42 +03:00 |
|
DyatelO
|
296a5384c6
|
Поиск пути.
|
2021-12-29 20:02:01 +03:00 |
|
DyatelO
|
15a734b2b4
|
Merge branch 'Prod' into Zakhar
# Conflicts:
# Assets/Resources/1/MK/MKToon/Examples/Textures/Watermelon/Watermelon.png
# Assets/Resources/1/MK/MKToon/Examples/Textures/Watermelon/WatermelonNormal.png
|
2021-12-29 16:15:32 +03:00 |
|
DyatelO
|
6b6feb2d9c
|
no message
|
2021-12-29 16:13:23 +03:00 |
|
dddushesss
|
e63c863167
|
added sfx, minor fixes
|
2021-12-29 08:10:48 +03:00 |
|
dddushesss
|
94fcee00f6
|
fixed unit bar facing camera, other minor fixes
|
2021-12-29 06:15:38 +03:00 |
|
dddushesss
|
6a41c388cb
|
refactor and fixes
|
2021-12-29 03:02:55 +03:00 |
|
dddushesss
|
d158c8fb37
|
music control from main menu, minor fixes
|
2021-12-28 17:44:43 +03:00 |
|
dddushesss
|
16852906d3
|
changed menu, added weapon choose,added music controller, settings save
|
2021-12-28 17:17:47 +03:00 |
|