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

114 Commits

This Branch
This Branch
All Branches
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
ea2690fb00 Merge branch 'Alexei' of https://github.com/BG-Games/S_Jump-and-grub into Alexei 2022-01-05 22:06:58 +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
0fea04df39 no message 2022-01-05 21:44:24 +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
90292f1012 Merge branch 'main' of https://github.com/BG-Games/S_Jump-and-grub 
# Conflicts:
#	Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenIcon.png.meta
#	Assets/Plugins/Demigiant/DOTween/Editor/Imgs/DOTweenMiniIcon.png.meta
#	Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer.png.meta
#	Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Footer_dark.png.meta
#	Assets/Plugins/Demigiant/DOTween/Editor/Imgs/Header.jpg.meta
#	Assets/Resources/1/Pillar 01.FBX.meta
#	Assets/Resources/1/_NewSprites/1. Game_Scene/HP_Bar.png.meta
#	Assets/Resources/1/android-icons/ic_launcher-web.png.meta
#	Assets/Resources/1/android-icons/mipmap-hdpi/ic_launcher.png.meta
#	Assets/Resources/1/android-icons/mipmap-hdpi/ic_launcher_foreground.png.meta
#	Assets/Resources/1/android-icons/mipmap-hdpi/ic_launcher_round.png.meta
#	Assets/Resources/1/android-icons/mipmap-ldpi/ic_launcher.png.meta
#	Assets/Resources/1/android-icons/mipmap-mdpi/ic_launcher.png.meta
#	Assets/Resources/1/android-icons/mipmap-mdpi/ic_launcher_foreground.png.meta
#	Assets/Resources/1/android-icons/mipmap-mdpi/ic_launcher_round.png.meta
#	Assets/Resources/1/android-icons/mipmap-xhdpi/ic_launcher.png.meta
#	Assets/Resources/1/android-icons/mipmap-xhdpi/ic_launcher_foreground.png.meta
#	Assets/Resources/1/android-icons/mipmap-xhdpi/ic_launcher_round.png.meta
#	Assets/Resources/1/android-icons/mipmap-xxhdpi/ic_launcher.png.meta
#	Assets/Resources/1/android-icons/mipmap-xxhdpi/ic_launcher_foreground.png.meta
#	Assets/Resources/1/android-icons/mipmap-xxhdpi/ic_launcher_round.png.meta
#	Assets/Resources/1/android-icons/mipmap-xxxhdpi/ic_launcher.png.meta
#	Assets/Resources/1/android-icons/mipmap-xxxhdpi/ic_launcher_foreground.png.meta
#	Assets/Resources/1/android-icons/mipmap-xxxhdpi/ic_launcher_round.png.meta
#	Assets/Resources/1/android-icons/playstore-icon.png.meta
#	Assets/Resources/menu/Emir.png.meta
#	Assets/Resources/menu/HomeBotton.png.meta
#	Assets/Resources/menu/Levell_LineUp.png.meta
#	Assets/Resources/menu/Mats.png.meta
#	Assets/Resources/menu/PlayBtn.png.meta
#	Assets/Resources/menu/Portrait/Improvements.png.meta
#	Assets/Resources/menu/Portrait/MatsLevel.png.meta
#	Assets/Resources/menu/Portrait/Mode.png.meta
#	Assets/Resources/menu/Portrait/PlayButtonBlue.png.meta
#	Assets/Resources/menu/Portrait/PlayButtonGreen.png.meta
#	Assets/Resources/menu/Portrait/PlayButtonRed.png.meta
#	Assets/Resources/menu/Portrait/ScullWhite.png.meta
#	Assets/Resources/menu/Portrait/SettingsIcons.png.meta
#	Assets/Resources/menu/Portrait/SettingsPanelBg.png.meta
#	Assets/Resources/menu/Portrait/WeaponMenu/4. Sprite_Weapons.png.meta
#	Assets/Resources/menu/Portrait/WeaponMenu/MenuBG.png.meta
#	Assets/Resources/menu/Portrait/WeaponMenu/TopBar.png.meta
#	Assets/Resources/menu/Portrait/WeaponMenu/WeaponBG.png.meta
#	Assets/Resources/menu/icon.png.meta
#	Packages/manifest.json
#	Packages/packages-lock.json
 2022-01-05 18:43:24 +03:00
dddushesss
ed38351ba4 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:42:53 +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
6631d3a3a4 inited gitignore and gitattribute 2022-01-05 18:03:57 +03:00
dddushesss
732e184c22 Merge branch 'Alexei' into Prod 2022-01-05 17:55:30 +03:00
dddushesss
6ccb4723cb fixed weapon modified damage 2022-01-05 17:54:11 +03:00
dddushesss
8393a51221 deleted obsolute 2022-01-05 17:49:10 +03:00
dddushesss
0585266d8d merge fixes 2022-01-05 17:48:27 +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
60920c229e Merge branch 'Alexei' of https://github.com/BG-Games/S_Jump-and-grub into Alexei 2022-01-05 17:39:10 +03:00
dddushesss
482a8371a3 fixes item 2022-01-05 17:39:00 +03:00
dddushesss
b4d5b6abe2
Merge pull request #4 from BG-Games/Zakhar 
Zakhar
 2022-01-05 17:17:31 +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
76426859a2
Merge pull request #3 from BG-Games/Alexei 
Items
 2022-01-05 15:48:28 +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
2b78e18398 fixes 2022-01-03 22:38:21 +03:00
dddushesss
38749a4a95 fiexed rounding/cutting. 2022-01-03 19:48:44 +03:00
dddushesss
def871faed fixes. chosen weapon status 2022-01-03 18:47:13 +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
DyatelO
831b007331 Merge branch 'Zakhar' of https://github.com/BG-Games/S_Jump-and-grub into Zakhar 2021-12-30 20:15:40 +03:00
DyatelO
c6391c6441 no message 2021-12-30 20:14:47 +03:00
dddushesss
4d0be05a80
Merge pull request #1 from BG-Games/Zakhar 
Zakhar
 2021-12-30 20:01:03 +03:00
dddushesss
ec9b0b8e17
Merge branch 'Prod' into Zakhar 2021-12-30 20:00:57 +03:00
dddushesss
3ef4b65c69
Merge pull request #2 from BG-Games/Alexei 
Alexei
 2021-12-30 19:59:51 +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
DyatelO
7c43cc8bc3 Merge branch 'Zakhar' of https://github.com/BG-Games/S_Jump-and-grub into Zakhar 2021-12-29 22:36:30 +03:00
DyatelO
077fed3fee Debug forUnity 2021-12-29 22:36:19 +03:00
dddushesss
6bb16f8757 Отрезание 2021-12-29 21:11:12 +03:00