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