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

57 Commits

Author SHA1 Message Date
DyatelO
ce6d0f8d10 Заменена анимация атаки. 2022-01-06 22:10:25 +03:00
DyatelO
458bd6d67e no message 2022-01-06 19:56:02 +03:00
DyatelO
b5a80f14dd Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/ExternalDependencyManager.meta
#	Assets/ExternalDependencyManager/Editor.meta
#	Assets/ExternalDependencyManager/Editor/1.2.167.meta
#	Assets/GoogleMobileAds.meta
#	Assets/GoogleMobileAds/Editor.meta
#	Assets/GoogleMobileAds/Editor/Resources.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/AdImages.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/AppOpen.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/Banners.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/Interstitials.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/Rewarded.meta
#	Assets/Plugins/Android.meta
#	Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib.meta
#	Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar.meta
#	Assets/Plugins/Android/androidx.arch.core.core-common-2.0.1.jar.meta
#	Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.1.aar.meta
#	Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.browser.browser-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta
#	Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta
#	Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-service-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.room.room-common-2.1.0.jar.meta
#	Assets/Plugins/Android/androidx.room.room-runtime-2.1.0.aar.meta
#	Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.sqlite.sqlite-2.0.1.aar.meta
#	Assets/Plugins/Android/androidx.sqlite.sqlite-framework-2.0.1.aar.meta
#	Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta
#	Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.work.work-runtime-2.1.0.aar
#	Assets/Plugins/Android/androidx.work.work-runtime-2.1.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-20.2.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-20.2.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-17.0.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-20.2.0.aar
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-20.2.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-18.0.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-18.0.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.0.0.aar.meta
#	Assets/Plugins/Android/com.google.android.ump.user-messaging-platform-1.0.0.aar.meta
#	Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar.meta
#	ProjectSettings/GvhProjectSettings.xml
 2022-01-06 19:24:57 +03:00
DyatelO
edee39f5ea no message 2022-01-06 19:23:48 +03:00
dddushesss
315d54a56e add added 2022-01-06 16:17:20 +03:00
dddushesss
43993fb918 fixed rounding 2022-01-06 10:59:47 +03:00
DyatelO
5f50c6aff8 Merge branch 'Prod' into Zakhar 2022-01-06 06:22:40 +03:00
DyatelO
7ff20639de Добавлены новые спрайты. 2022-01-06 06:22:25 +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
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
DyatelO
c6a63f545d Добавлены файлы из Prod. 2022-01-05 18:01:34 +03:00
DyatelO
b9bc49b7db Развёрнута полоска выстрелов. 2022-01-05 17:58:10 +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
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