dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
230 Commits 12 Branches 0 Tags
Commit Graph

56 Commits

Author SHA1 Message Date
dddushesss
5a736a8335 Merge branch 'Alexei' 2022-01-05 22:52:30 +03:00
dddushesss
b298adec90 final item fixes 2022-01-05 22:36:27 +03:00
dddushesss
69f25319a4 no message 2022-01-05 22:06:40 +03:00
dddushesss
58e6c64618 Merge branch 'main' of https://github.com/BG-Games/S_Jump-and-grub 
# Conflicts:
#	Assets/Scenes/MainMenu.unity
 2022-01-05 22:01:39 +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
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
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
fd79cecfdd some changes 2022-01-05 17:42:55 +03:00
dddushesss
690af7421b something 2022-01-05 16:04:09 +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
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
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
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
6a41c388cb refactor and fixes 2021-12-29 03:02:55 +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
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
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
2b5b4029f0 previos commit 2021-12-22 21:53:29 +03:00
dddushesss
4336526417 added enemy spawn 2021-12-22 21:53:12 +03:00
dddushesss
1b3d4fb8bd changed shooting mechanic, aiming on 360 2021-12-22 17:01:17 +03:00
dddushesss
73256f251d updated packeges 2021-12-21 22:29:32 +03:00
dddushesss
2b404fd7bf previos commit 2021-12-21 21:23:10 +03:00
dddushesss
f2f6abcdbc added attacking, seted attack animation, updating mana canvas 2021-12-21 21:22:55 +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
bf97cf74ca added vfx effect on capture hex 2021-12-21 14:03:59 +03:00
dddushesss
0eba5f8bee move time fixed 2021-12-20 22:10:12 +03:00
dddushesss
be4ababa0b fixed moving and animations 2021-12-20 21:26:55 +03:00
dddushesss
ac7e2a0b52 menu fix 2021-12-18 02:51:59 +03:00
dddushesss
5e9d69eab8 saved scene 2021-12-17 22:30:50 +03:00
dddushesss
bcc2b7e133 added menu 2021-12-17 17:15:18 +03:00
dddushesss
1fbc75f374 added git lfs 2021-12-16 16:17:58 +03:00
dddushesss
313331f6b2 move animation 2021-12-16 14:52:07 +03:00
dddushesss
26ea17872f Painting hex on move and on spawn 2021-12-15 23:11:34 +03:00