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

65 Commits

Author SHA1 Message Date
dddushesss
1b6b18e2dc added map editor 2022-02-08 23:10:34 +03:00
dddushesss
8a32e9c2dd added odin, Added LevelSettings.cs for adding new LevelS 2022-02-07 19:57:50 +03:00
dddushesss
e574b0294a added rocket 2022-02-07 13:16:46 +03:00
dddushesss
53ffc3a8f6 fixes 2022-02-05 22:15:01 +03:00
dddushesss
dae27aa6b8 light 2022-01-31 20:06:47 +03:00
dddushesss
82a6ed79bc Merge branch 'Prod' into Alexei 2022-01-31 20:01:48 +03:00
dddushesss
9ffcc35cf8 fixing light 2022-01-31 19:36:52 +03:00
dddushesss
5ea371e08d optimization and bugs fixed 2022-01-31 18:39:13 +03:00
DyatelO
562572beb0 Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/Prefab/Canvas.prefab
#	Assets/Scripts/Controller/GameInit.cs
#	Assets/Scripts/GameUI/UIController.cs
#	Assets/Scripts/Units/PlayerControl.cs
 2022-01-28 18:21:28 +03:00
dddushesss
f222ed4bec added CheatMenu.cs, optimized canvas 2022-01-26 18:17:42 +03:00
DyatelO
5f9a16e4bb Цветокоррекция и мелкие исправления. 2022-01-26 00:10:39 +03:00
dddushesss
4e3cfd2cd7 fixes. heal item 2022-01-26 00:01:04 +03:00
dddushesss
e2017dc339 changed spawn logic. fixed inventory 2022-01-24 05:31:26 +03:00
dddushesss
784b1d3c17 fixes. added editorbutton 2022-01-20 01:03:49 +03:00
dddushesss
e8fdc6c5b5 optimization. fixed mana regen, towers only on own territory, destroing buildings, changed bar canvas look at camera, fixed move(cannot move to hex, where is another character). fixed spawn. fixed random weapon to enemies 2022-01-18 02:48:30 +03:00
dddushesss
3304c858d0 fixes shaders. fixed ai. fixed project size 2022-01-17 11:26:35 +03:00
dddushesss
74af3ab42d resources optimized 2022-01-16 05:40:49 +03:00
dddushesss
9a20f44447 cleaned branch 2022-01-13 23:23:11 +03:00
dddushesss
6f3baa5a97 AI. Build does not work 2022-01-13 18:56:24 +03:00
dddushesss
722b8da02b spawn, adsmob, ai, respawn 2022-01-09 00:37:09 +03:00
DyatelO
99bd500107 Добавлен респавн игрока после просмотра рекламы. (Нет спавна гексов цвета игрока при репавне.) 2022-01-08 03:57:28 +03:00
DyatelO
832807ae6d Добавлена кнопка повторной попытки. 2022-01-08 01:29:43 +03:00
DyatelO
2f1c81b4d6 Исправлена ошибка закрытия окна рекламы. 2022-01-06 20:24:34 +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
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
a55a386104 Добавлены файлы AdMob 2022-01-06 06:51:09 +03:00
dddushesss
0fea04df39 no message 2022-01-05 21:44:24 +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
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
16852906d3 changed menu, added weapon choose,added music controller, settings save 2021-12-28 17:17:47 +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
f2f6abcdbc added attacking, seted attack animation, updating mana canvas 2021-12-21 21:22:55 +03:00
dddushesss
594635d9e7 minor fixes 2021-12-21 14:58:27 +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
fbd54e36ec edited light, changed material on cell prefab 2021-12-17 22:30:16 +03:00
dddushesss
bcc2b7e133 added menu 2021-12-17 17:15:18 +03:00
dddushesss
0692435c2a Added main menu 2021-12-17 17:14:58 +03:00
dddushesss
143e28fd6e camera fix 2021-12-17 14:12:00 +03:00
dddushesss
313331f6b2 move animation 2021-12-16 14:52:07 +03:00
dddushesss
6b656a6486 Convert joystick to HexDirection.cs, player move 2021-12-15 18:41:43 +03:00