tool4EvEr
329f4072be
Fix ResolvedThisTurn
2021-04-30 19:36:29 +02:00
Anthony Calosa
a88b392a43
Merge branch 'kevlahnota-master-patch-90708' into 'master'
...
unused Import
See merge request core-developers/forge!4630
2021-04-30 14:47:01 +00:00
Anthony Calosa
28ec418c76
unused Import
2021-04-30 14:46:49 +00:00
Anthony Calosa
ce56b87b16
Merge branch 'master' into 'master'
...
minor fixes
See merge request core-developers/forge!4629
2021-04-30 14:37:18 +00:00
Anthony Calosa
6d3155dff9
prevent NPE
2021-04-30 22:27:07 +08:00
Anthony Calosa
9fee1fda1e
update order Message
2021-04-30 22:21:56 +08:00
Anthony Calosa
1e1c5fa139
update Filter
2021-04-30 22:20:26 +08:00
Anthony Calosa
70fb1090ca
Merge branch 'master' into 'master'
...
[Android] Android 11+ mandatory use of app-specific directory (obb)
See merge request core-developers/forge!4628
2021-04-30 13:32:57 +00:00
Anthony Calosa
6f13aa4724
[Android] Android 11+ mandatory use of app-specific directory (obb)
...
- before migration to obb folder, run Forge first and let it download and install necessary files. If Forge is not running (after Android 11 update, white screen bug), disable storage permission and enable storage permission again for Forge. After succesful run, exit Forge then copy your existing Forge folder to Android/obb/forge.app (as suggested by CptKird).
2021-04-30 21:27:46 +08:00
Anthony Calosa
584f923c4c
Merge branch 'master' into 'master'
...
[Android] Enable Sentry
See merge request core-developers/forge!4627
2021-04-30 05:47:31 +00:00
Anthony Calosa
3d1c39da30
[Android] Enable Sentry
2021-04-30 13:45:13 +08:00
Anthony Calosa
a3148c9825
Merge branch 'master' into 'master'
...
[Mobile] Swap Main Tab and Commander Tab on portrait mode
See merge request core-developers/forge!4626
2021-04-30 05:36:27 +00:00
Anthony Calosa
40e33a43a9
[Mobile] Swap Main Tab and Commander Tab on portrait mode
2021-04-30 13:34:44 +08:00
Michael Kamensky
a3fc74c44e
Merge branch 'plague_of_vermin' into 'master'
...
Add Plague of Vermin
See merge request core-developers/forge!4623
2021-04-29 17:48:39 +00:00
Michael Kamensky
3b28b5fa1c
Merge branch 'fixseal' into 'master'
...
Fix Seal of the Guildpact
See merge request core-developers/forge!4624
2021-04-29 17:47:54 +00:00
tool4EvEr
6070dc9db9
Fix Seal of the Guildpact
2021-04-29 19:41:07 +02:00
Lyu Zong-Hong
7608f02c21
Add Plague of Vermin
2021-04-29 16:10:58 +09:00
Hans Mackowiak
cec5ec0a78
Merge branch 'cards' into 'master'
...
Fix some Counterspells not exiling when target can't be countered
See merge request core-developers/forge!4616
2021-04-29 06:45:29 +00:00
Michael Kamensky
c72c683915
Merge branch 'update_eureka' into 'master'
...
Update Eureka and Hypergenesis to put chosen permanent on battlefield sequentially
See merge request core-developers/forge!4622
2021-04-29 05:11:52 +00:00
Lyu Zong-Hong
3384c773da
Update Eureka and Hypergenesis to put chosen permanent on battlefield sequentially
2021-04-29 10:51:03 +09:00
Anthony Calosa
8dfc16880e
Merge branch 'kevlahnota-master-patch-06695' into 'master'
...
unused import
See merge request core-developers/forge!4621
2021-04-28 22:01:07 +00:00
Anthony Calosa
5d65861c49
unused import
2021-04-28 22:00:46 +00:00
Hans Mackowiak
179b1419ab
Merge branch 'bracers' into 'master'
...
Battlemage's Bracers: Fix Cost
See merge request core-developers/forge!4615
2021-04-28 21:15:13 +00:00
Hans Mackowiak
4bebc8486c
Merge branch 'fixbandingnpe' into 'master'
...
Fix Banding NPE
See merge request core-developers/forge!4617
2021-04-28 21:14:51 +00:00
Hans Mackowiak
fd0f6e4113
Merge branch 'fixNPE' into 'master'
...
getTargetableCards: Fix AI NPE
See merge request core-developers/forge!4611
2021-04-28 21:13:19 +00:00
Bug Hunter
8e4c40ba2a
getTargetableCards: Fix AI NPE
2021-04-28 21:13:19 +00:00
Hans Mackowiak
abf1a92977
Merge branch 'fixcrash' into 'master'
...
GameLossAi: Fix crash with Slaughter Pact
See merge request core-developers/forge!4620
2021-04-28 21:12:52 +00:00
Hans Mackowiak
e9ff6ece35
Merge branch 'fixtrig' into 'master'
...
Fix Karmic Justice
See merge request core-developers/forge!4613
2021-04-28 21:12:08 +00:00
Bug Hunter
ba02ce9261
Fix Karmic Justice
2021-04-28 21:12:07 +00:00
Hans Mackowiak
0ece4427b6
Merge branch 'mana' into 'master'
...
ManaEffect: Skip producing mana from nothing
See merge request core-developers/forge!4593
2021-04-28 21:00:57 +00:00
Bug Hunter
9afc192154
Revert "Check all RE order quietly"
...
This reverts commit 0ad6552f8ac900f24f6756bb42973e4b4cbf7a2a.
2021-04-28 21:00:56 +00:00
tool4EvEr
27691d8563
GameLossAi: Fix crash with Slaughter Pact
2021-04-28 21:48:11 +02:00
Anthony Calosa
0ebc6dd2d8
Merge branch 'master' into 'master'
...
[Desktop] remove unnecessary codes
See merge request core-developers/forge!4619
2021-04-28 18:24:58 +00:00
Anthony Calosa
5a2f57172f
[Desktop] remove unnecessary codes
2021-04-29 02:22:26 +08:00
Anthony Calosa
47d30c81b6
Merge branch 'master' into 'master'
...
[Desktop] update image reader
See merge request core-developers/forge!4618
2021-04-28 17:55:31 +00:00
Anthony Calosa
b80f78d12e
[Desktop] update reader
2021-04-29 01:50:37 +08:00
tool4EvEr
835ffaafd4
Fix Banding NPE
2021-04-28 19:28:22 +02:00
tool4EvEr
66f0d580b9
Fix uncounterable
2021-04-28 19:17:04 +02:00
tool4EvEr
524998811c
Fix Cost
2021-04-28 18:39:03 +02:00
Anthony Calosa
1b3a8d0cf5
Merge branch 'master' into 'master'
...
[Desktop] IIOException: Unsupported Image Type
See merge request core-developers/forge!4614
2021-04-28 14:14:16 +00:00
Anthony Calosa
0134d343b2
[Desktop] IIOException: Unsupported Image Type
2021-04-28 22:12:09 +08:00
Michael Kamensky
202ddd8157
Merge branch 'clone' into 'master'
...
Fix temporary clones keeping Remembered on Self
Closes #1810
See merge request core-developers/forge!4612
2021-04-28 04:09:01 +00:00
Michael Kamensky
76159b2cc4
Merge branch 'undefined' into 'master'
...
Revised King Goldemar 2 version 2
See merge request core-developers/forge!4594
2021-04-28 04:08:38 +00:00
tool4EvEr
620e95cebf
Fix temporary clones keeping Remembered on Self
2021-04-27 21:52:12 +02:00
Michael Kamensky
5f5357d28a
Merge branch 'cosmos' into 'master'
...
Glimpse the Cosmos: Fix AltCost
See merge request core-developers/forge!4604
2021-04-27 19:04:26 +00:00
Michael Kamensky
faee08bb90
Merge branch 'sharesColorWithOther' into 'master'
...
CardProperty: add SharesColorWithOther to stop comparing cards with themselves
See merge request core-developers/forge!4610
2021-04-27 19:04:20 +00:00
Hans Mackowiak
178f98c82f
CardProperty: add SharesColorWithOther to stop comparing cards with themselves
2021-04-27 15:15:08 +02:00
Anthony Calosa
d0dc16aa6f
Merge branch 'master' into 'master'
...
[Android] don't load forge.profile.properties when the user is using the obb directory
See merge request core-developers/forge!4609
2021-04-27 13:07:13 +00:00
Anthony Calosa
77e56e8da9
[Android] don't load forge.profile.properties when the user is using the obb directory
...
- until google permits unrestricted access outside the app-specific directory on certain apps via flag, the option to use obb as entrypoint is required since accessing outside the scoped storage is really not recommended (https://issuetracker.google.com/issues?q=scoped%20storage%20slow ).
2021-04-27 21:04:51 +08:00
Michael Kamensky
045d7bb5ae
Merge branch 'fix_grindstone' into 'master'
...
Fix Grindstone and Sphinx's Tutelage
See merge request core-developers/forge!4608
2021-04-27 12:12:43 +00:00
