29 Commits

Author SHA1 Message Date
dddushesss
b298adec90 final item fixes 2022-01-05 22:36:27 +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
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
c87a906d97 items finished 2022-01-05 15:43:08 +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
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
dddushesss
1977ae6d7c minor fixes 2021-12-30 19:57:59 +03:00
dddushesss
6bb16f8757 Отрезание 2021-12-29 21:11:12 +03:00
dddushesss
94fcee00f6 fixed unit bar facing camera, other minor fixes 2021-12-29 06:15:38 +03:00
dddushesss
16852906d3 changed menu, added weapon choose,added music controller, settings save 2021-12-28 17:17:47 +03:00
dddushesss
9a9481eb04 added pause menu, refactored unit canvas, added ui controller 2021-12-27 21:01:37 +03:00
dddushesss
849bce5891 fire forward on tap attack joystick 2021-12-27 17:06:17 +03:00
dddushesss
4f188bc304 Added mana mechanic, shoots limitation and ui for it. added vfx for hitting. Hitting is working. aim ui 2021-12-25 05:17:35 +03:00
dddushesss
4336526417 added enemy spawn 2021-12-22 21:53:12 +03:00
dddushesss
2b404fd7bf previos commit 2021-12-21 21:23:10 +03:00
dddushesss
a5ed0753bb added hp and mana ui, looking at camera 2021-12-21 18:32:33 +03:00
dddushesss
ac7e2a0b52 menu fix 2021-12-18 02:51:59 +03:00
dddushesss
fbd54e36ec edited light, changed material on cell prefab 2021-12-17 22:30:16 +03:00
dddushesss
26ea17872f Painting hex on move and on spawn 2021-12-15 23:11:34 +03:00
dddushesss
6b656a6486 Convert joystick to HexDirection.cs, player move 2021-12-15 18:41:43 +03:00
dddushesss
2453c7082f added resources 2021-12-15 16:29:44 +03:00
dddushesss
ff45de1cbf added resources, joistics, CameraControl.cs, PlayerControl.cs, HexDirection.cs, changed one mesh map to multi mesh 2021-12-15 15:58:32 +03:00
dddushesss
740205bc3d Grid generation, painting hex on click, MVC Arcitecture, OnPaintHex listener, added readme 2021-12-14 16:06:37 +03:00
AlexMamontow
8483d0ef43 Added project 2021-08-02 16:22:16 +03:00