Commits · master · Confidential and Proprietary / CryptoSoul / MergeSoul

08 Feb, 2020 1 commit
- Merge branch 'release-1.5.1' into 'master' · 7aa6d0c8
  Vitaliy authored Feb 08, 2020
```
Merge release-1.5.1 into master

See merge request MagestiX/MergeSoul!227
```
  7aa6d0c8
03 Feb, 2020 1 commit
- release 1.5.1 update ios logo image · fd404d41
  Max Shvachko authored Feb 03, 2020
  
  fd404d41
01 Feb, 2020 7 commits
- release 1.5.1 fix pollfish · d4a58f59
  IceNiceV authored Feb 01, 2020
  
  d4a58f59
- release 1.5.1 fix database · 499b2777
  Max Shvachko authored Feb 01, 2020
  
  499b2777
- release 1.5.1 fix popup queue · 1762c4bc
  IceNiceV authored Feb 01, 2020
  
  1762c4bc
- release 1.5.1 fix bugs · f8a7490a
  IceNiceV authored Feb 01, 2020
  
  f8a7490a
- release 1.5.1 fix offer prefabs · 62ae9968
  IceNiceV authored Feb 01, 2020
  
  62ae9968
- release 1.5.1 added display localization currency and price, added pre initialize payment · 610b4459
  IceNiceV authored Feb 01, 2020
  
  610b4459
- release 1.5.1 fix item store · e6b603a4
  IceNiceV authored Feb 01, 2020
  
  e6b603a4
31 Jan, 2020 3 commits
- Merge branch 'feature/SMC-311-chest-auto-opening' into 'develop' · 57b5de23
  Vitaliy authored Jan 31, 2020
```
Merge feature/SMC-311-chest-auto-opening into develop

See merge request MagestiX/MergeSoul!225
```
  57b5de23
- SMC-311 fix dailies push notification · 6d1ce159
  DigIT authored Jan 31, 2020
  
  6d1ce159
- SMC-311 update chest opening flow · eb9dee65
  DigIT authored Jan 31, 2020
  
  eb9dee65
30 Jan, 2020 4 commits
- release 1.5.1 changed version, fix reload after login, fix getting lower cat level · bd1269db
  IceNiceV authored Jan 30, 2020
  
  bd1269db
- release 1.5.1 update soul api, fixed level location confirmation · ca216e08
  IceNiceV authored Jan 30, 2020
  
  ca216e08
- Merge branch 'feature/SMC-310-Add-site-referral-system' into 'develop' · c8a77153
  Max Shvachko authored Jan 30, 2020
```
Merge feature/SMC-310-Add-site-referral-system into develop

See merge request MagestiX/MergeSoul!224
```
  c8a77153
- SMC-310 Added dynamic link strategies, added strategy for site referral id,... · 73d41741
  IceNiceV authored Jan 30, 2020
```
SMC-310 Added dynamic link strategies, added strategy for site referral id, fix text in career setting
```
  73d41741
29 Jan, 2020 1 commit
- Merge branch 'feature/SMC-292-update-rate-us' into 'develop' · b6a766d1
  Vitaliy authored Jan 29, 2020
```
Merge feature/SMC-292-update-rate-us into develop

See merge request MagestiX/MergeSoul!223
```
  b6a766d1
28 Jan, 2020 8 commits
- SMC-292 restore app metrica api key · 2e043e46
  Max Shvachko authored Jan 28, 2020
  
  2e043e46
- SMC-292 move ios rate us showing to popup queue service · 8974403c
  Max Shvachko authored Jan 28, 2020
  
  8974403c
- SMC-292 Added cooldown rate us on android · 9f369474
  IceNiceV authored Jan 28, 2020
  
  9f369474
- Merge remote-tracking branch 'origin/develop' into feature/SMC-292-update-rate-us · 1b9c00b1
  IceNiceV authored Jan 28, 2020
  
  1b9c00b1
- Merge branch 'feature/SMC-306-Add-in-unlink-request' into 'develop' · 5a76f93a
  Vitaliy authored Jan 28, 2020
```
Merge feature/SMC-306-Add-in-unlink-request into develop

See merge request MagestiX/MergeSoul!222
```
  5a76f93a
- SMC-306 Updated drop boxes · 781d2fc5
  IceNiceV authored Jan 28, 2020
  
  781d2fc5
- SMC-292 fix iOS namespaces · 18998733
  Max Shvachko authored Jan 28, 2020
  
  18998733
- SMC-292 add ios rate us show via rate us api, add don't ask me again button to android rate us view · 5f9fa7c0
  DigIT authored Jan 28, 2020
  
  5f9fa7c0
27 Jan, 2020 5 commits
- Merge remote-tracking branch 'origin/develop' into feature/SMC-306-Add-in-unlink-request · eae8bd05
  IceNiceV authored Jan 27, 2020
```
# Conflicts:
#	Assets/Scripts/Game/Models/GameSetting/GameSettingVo.cs
#	Assets/Scripts/Ui/Controllers/LoginGame/LoginGameController.cs
```
  eae8bd05
- SMC-306 Updated soul api · e83fad4c
  IceNiceV authored Jan 27, 2020
  
  e83fad4c
- SMC-306 Added clear prefs after unlink · 03a8423c
  IceNiceV authored Jan 27, 2020
  
  03a8423c
- Merge branch 'feature/SMC-297-hide-low-level-cats' into 'develop' · ccf0efdb
  Vitaliy authored Jan 27, 2020
```
Merge feature/SMC-297-hide-low-level-cats into develop

See merge request MagestiX/MergeSoul!221
```
  ccf0efdb
- SMC-297 move constants to game settings, invert hide/show slider · f99f290e
  DigIT authored Jan 27, 2020
  
  f99f290e
26 Jan, 2020 1 commit
- SMC-297 add low level cats hiding · 1781494f
  Dig_IT authored Jan 26, 2020
  
  1781494f
24 Jan, 2020 9 commits
- SMC-306 Added unlink price, updated soul api · 5950a52f
  IceNiceV authored Jan 24, 2020
  
  5950a52f
- Merge branch 'feature/SMC-294-update-daily-quests-push-notification' into 'develop' · 291c905f
  Vitaliy authored Jan 24, 2020
```
Merge feature/SMC-294-update-daily-quests-push-notification into develop

See merge request MagestiX/MergeSoul!220
```
  291c905f
- SMC-294 Update daily quests push notification · 914f08c9
  DigIT authored Jan 24, 2020
  
  914f08c9
- Merge branch 'feature/SMC-288-Display-coins-amount-in-starter-pack' into 'develop' · 6d40ecfb
  Max Shvachko authored Jan 24, 2020
```
Merge feature/SMC-288-Display-coins-amount-in-starter-pack into develop

See merge request MagestiX/MergeSoul!219
```
  6d40ecfb
- SMC-288 Fix after merge · 649ecbd4
  IceNiceV authored Jan 24, 2020
  
  649ecbd4
- Merge remote-tracking branch 'origin/develop' into... · 0a02567e
  IceNiceV authored Jan 24, 2020
```
Merge remote-tracking branch 'origin/develop' into feature/SMC-288-Display-coins-amount-in-starter-pack
```
  0a02567e
- Merge branch 'feature/SMC-287-new-multiplicator-animation' into 'develop' · 5f343c63
  Vitaliy authored Jan 24, 2020
```
Merge feature/SMC-287-new-multiplicator-animation into develop

See merge request MagestiX/MergeSoul!218
```
  5f343c63
- Merge remote-tracking branch 'origin/develop' into feature/SMC-287-new-multiplicator-animation · d4a7d938
  DigIT authored Jan 24, 2020
```
# Conflicts:
#	Assets/Resources/Game/UiPrefabsInstaller.asset
#	Assets/Scripts/Game/Installers/UiInstaller.cs
#	Assets/Scripts/Game/Installers/UiPrefabsInstaller.cs
```
  d4a7d938
- SMC-288 Display coins amount in Timer wrap item bonus · 4a641050
  IceNiceV authored Jan 24, 2020
  
  4a641050