dddushesss
|
a2bd0c5927
|
updated to current version
|
2022-01-05 19:11:58 +03:00 |
|
dddushesss
|
b21b000880
|
cleaned branch
|
2022-01-05 18:46:17 +03:00 |
|
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
|
fd79cecfdd
|
some changes
|
2022-01-05 17:42:55 +03:00 |
|
dddushesss
|
854b093f45
|
cleaned main
|
2022-01-05 16:02:18 +03:00 |
|
dddushesss
|
9a0d54ee76
|
new main menu
|
2022-01-03 00:41:09 +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
|
2453c7082f
|
added resources
|
2021-12-15 16:29:44 +03:00 |
|