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
|
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
|
854b093f45
|
cleaned main
|
2022-01-05 16:02:18 +03:00 |
|
dddushesss
|
c87a906d97
|
items finished
|
2022-01-05 15:43:08 +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 |
|
dddushesss
|
7421638a8d
|
item base class. tower. some fixes. inventory canvas
|
2022-01-04 20:57:06 +03:00 |
|
dddushesss
|
cd2a468be9
|
started new main menu. fixed round bag
|
2021-12-31 19:26:01 +03:00 |
|
dddushesss
|
ec9b0b8e17
|
Merge branch 'Prod' into Zakhar
|
2021-12-30 20:00:57 +03:00 |
|
dddushesss
|
6bb16f8757
|
Отрезание
|
2021-12-29 21:11:12 +03:00 |
|
dddushesss
|
d94a8b64f3
|
some fixes
|
2021-12-29 20:03:42 +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
|
94ffd6dd10
|
added hard capture ui
|
2021-12-27 22:54:14 +03:00 |
|
dddushesss
|
4adea6e7cb
|
added hardcapture
|
2021-12-27 21:45:24 +03:00 |
|
dddushesss
|
849bce5891
|
fire forward on tap attack joystick
|
2021-12-27 17:06:17 +03:00 |
|
dddushesss
|
0b0ac51fb6
|
Refactor. One class for bots and player
|
2021-12-25 05:58:26 +03:00 |
|