dddushesss
|
04652acfa5
|
fixes
|
2022-01-05 18:35:05 +03:00 |
|
dddushesss
|
3bbdd7e5f4
|
Merge branch 'main' of https://github.com/BG-Games/S_Jump-and-grub
|
2022-01-05 18:33:34 +03:00 |
|
dddushesss
|
aa3187745b
|
metas
|
2022-01-05 18:14:43 +03:00 |
|
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
|
854b093f45
|
cleaned main
|
2022-01-05 16:02:18 +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
|
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
|
94ffd6dd10
|
added hard capture ui
|
2021-12-27 22:54:14 +03:00 |
|
dddushesss
|
0b0ac51fb6
|
Refactor. One class for bots and player
|
2021-12-25 05:58:26 +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
|
c342edbea9
|
attack distance. unit hit
|
2021-12-22 23:29:44 +03:00 |
|
dddushesss
|
4336526417
|
added enemy spawn
|
2021-12-22 21:53:12 +03:00 |
|
dddushesss
|
a5ed0753bb
|
added hp and mana ui, looking at camera
|
2021-12-21 18:32:33 +03:00 |
|
dddushesss
|
594635d9e7
|
minor fixes
|
2021-12-21 14:58:27 +03:00 |
|
dddushesss
|
be4ababa0b
|
fixed moving and animations
|
2021-12-20 21:26:55 +03:00 |
|
dddushesss
|
26ea17872f
|
Painting hex on move and on spawn
|
2021-12-15 23:11:34 +03:00 |
|
dddushesss
|
2453c7082f
|
added resources
|
2021-12-15 16:29:44 +03:00 |
|