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

70 Commits

Author SHA1 Message Date
dddushesss
1b6b18e2dc added map editor 2022-02-08 23:10:34 +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
e51a742d2c folder logic and fixes 2022-02-02 19:08:18 +03:00
dddushesss
9ffcc35cf8 fixing light 2022-01-31 19:36:52 +03:00
DyatelO
2c7871b1f3 Правки визуальной части. 2022-01-31 18:51:59 +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
7e09b90397 fixed cheat menu 2022-01-27 13:57:37 +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
1385b54587 fixed items, added resources new abilities 2022-01-25 22:19:59 +03:00
dddushesss
e2017dc339 changed spawn logic. fixed inventory 2022-01-24 05:31:26 +03:00
dddushesss
8e35a15691 added bomb, added capture ability. fixes 2022-01-19 20:56:48 +03:00
dddushesss
3304c858d0 fixes shaders. fixed ai. fixed project size 2022-01-17 11:26:35 +03:00
dddushesss
0ba3d39df9 optimization. changed move joystick to dynamic 2022-01-16 05:54:28 +03:00
dddushesss
74af3ab42d resources optimized 2022-01-16 05:40:49 +03:00
dddushesss
196b483125 final fix for build bug. optimized 2022-01-16 05:38:22 +03:00
dddushesss
d75d52df94 reimported project 2022-01-15 22:31:30 +03:00
dddushesss
212d976b54 cleaned branch 2022-01-15 22:31:25 +03:00
dddushesss
9a20f44447 cleaned branch 2022-01-13 23:23:11 +03:00
dddushesss
2c2fae3b58 Merge remote-tracking branch 'origin/Alexei' into Alexei 
# Conflicts:
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Mana.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Power.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Replace.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Magnet.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab.meta
#	Assets/Resources/Data/ItemData.asset
#	Assets/Scripts/Items/Bonus.cs.meta
#	Assets/Scripts/Items/Building.cs.meta
 2022-01-13 22:59:27 +03:00
dddushesss
03960d7d0b fixes/ latest ai version 2022-01-13 22:58:54 +03:00
dddushesss
6f3baa5a97 AI. Build does not work 2022-01-13 18:56:24 +03:00
dddushesss
2528c3e4dd paint fix, tower fix 2022-01-11 04:57:05 +03:00
dddushesss
6224ac3354 changed tower view and prefab 2022-01-10 22:25:25 +03:00
dddushesss
564d85ae6f mana regen fix. hardcapture fix. mana limit capture 2022-01-10 17:37:20 +03:00
dddushesss
722b8da02b spawn, adsmob, ai, respawn 2022-01-09 00:37:09 +03:00
DyatelO
b197f6d8b2 Лёгкие исправления. 2022-01-08 15:50:03 +03:00
DyatelO
a6c79ba3aa Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/Scripts/Units/Unit.cs
#	Assets/add.cs
 2022-01-08 15:07:40 +03:00
DyatelO
e4a5948115 Класс add переименован в AdsMob 2022-01-07 22:31:39 +03:00
dddushesss
443845a35c ai start 2022-01-07 19:39:47 +03:00
DyatelO
ce6d0f8d10 Заменена анимация атаки. 2022-01-06 22:10:25 +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
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
69f25319a4 no message 2022-01-05 22:06:40 +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
9a0d54ee76 new main menu 2022-01-03 00:41:09 +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