dddushesss
|
e630b2f332
|
Merge branch 'Prod'
# Conflicts:
# Assets/Prefab/AimCanvas.prefab
# Assets/Prefab/BarCAnvas.prefab
# Assets/Resources/1/Character/Prefab/Asvald.prefab
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_box_blur.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_blur 1.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_blur.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_glow.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_line_blue.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_glow.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_glow_small.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_rotate_line.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_rotate_line_small.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_blue.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_green.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_purple.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_red.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_white.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_yellow.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_blue.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_green.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_light.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_purple.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_red.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_white.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_yellow.png
# Assets/Resources/1/_NewSprites/Logo.png
# Assets/Resources/1/_NewSprites/icon.png
# Assets/Resources/Data/ItemData.asset
# Assets/Scripts/Controller/GameInit.cs
# Assets/Scripts/Items/ItemFabric.cs
# Assets/Scripts/Units/Unit.cs
# Assets/Scripts/Units/Views/UnitView.cs
# Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf
# Assets/TextMesh Pro/Fonts/LiberationSans.ttf
# Assets/TextMesh Pro/Sprites/EmojiOne.png
|
2022-01-05 18:05:43 +03:00 |
|
dddushesss
|
6ccb4723cb
|
fixed weapon modified damage
|
2022-01-05 17:54:11 +03:00 |
|
dddushesss
|
854b093f45
|
cleaned main
|
2022-01-05 16:02:18 +03:00 |
|
dddushesss
|
c87a906d97
|
items finished
|
2022-01-05 15:43:08 +03:00 |
|
dddushesss
|
7421638a8d
|
item base class. tower. some fixes. inventory canvas
|
2022-01-04 20:57:06 +03:00 |
|
dddushesss
|
ec9b0b8e17
|
Merge branch 'Prod' into Zakhar
|
2021-12-30 20:00:57 +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 |
|
dddushesss
|
d94a8b64f3
|
some fixes
|
2021-12-29 20:03:42 +03:00 |
|
DyatelO
|
296a5384c6
|
Поиск пути.
|
2021-12-29 20:02:01 +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
|
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 |
|
dddushesss
|
9a9481eb04
|
added pause menu, refactored unit canvas, added ui controller
|
2021-12-27 21:01:37 +03:00 |
|
dddushesss
|
0b0ac51fb6
|
Refactor. One class for bots and player
|
2021-12-25 05:58:26 +03:00 |
|
dddushesss
|
4336526417
|
added enemy spawn
|
2021-12-22 21:53:12 +03:00 |
|
dddushesss
|
f2f6abcdbc
|
added attacking, seted attack animation, updating mana canvas
|
2021-12-21 21:22:55 +03:00 |
|
dddushesss
|
594635d9e7
|
minor fixes
|
2021-12-21 14:58:27 +03:00 |
|
dddushesss
|
1dfea0637d
|
Fixed character controller
|
2021-12-15 19:42:13 +03:00 |
|
dddushesss
|
6b656a6486
|
Convert joystick to HexDirection.cs, player move
|
2021-12-15 18:41:43 +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
|
fa9398993e
|
OnColorChangeListener returns HexCoordinates, witch has been painted. Removed unnecessary files
|
2021-12-14 16:15:12 +03:00 |
|
dddushesss
|
740205bc3d
|
Grid generation, painting hex on click, MVC Arcitecture, OnPaintHex listener, added readme
|
2021-12-14 16:06:37 +03:00 |
|