Commit Graph

50085 Commits

Author SHA1 Message Date
tool4EvEr
db9e019519 Fix backing out of Suspend 2021-05-01 23:05:52 +02:00
tool4EvEr
3a2ea56c92 Fix NPE 2021-05-01 21:26:49 +02:00
tool4EvEr
df6b552ac1 Fully clear unwanted triggers 2021-05-01 20:36:42 +02:00
Michael Kamensky
9bb4d7ed93 Merge branch 'turns' into 'master'
Update advanceToNextPhase logic

See merge request core-developers/forge!4633
2021-05-01 17:36:38 +00:00
Anthony Calosa
562ef1b147 Merge branch 'kevlahnota-master-patch-03506' into 'master'
Update GuiDownloadZipService.java

See merge request core-developers/forge!4638
2021-05-01 14:27:56 +00:00
Anthony Calosa
6d31a2f656 Update GuiDownloadZipService.java 2021-05-01 14:27:02 +00:00
Bug Hunter
62c16d9f08 Merge branch 'fixcost' into 'master'
Fix typo

Closes #1813

See merge request core-developers/forge!4637
2021-05-01 10:44:55 +00:00
tool4EvEr
db17973ea6 Fix cost 2021-05-01 12:43:26 +02:00
tool4EvEr
8155376c45 Fix multiplayer loop from SA controlled by loser 2021-05-01 12:33:25 +02:00
Anthony Calosa
ae26c7bc7a Merge branch 'master' into 'master'
[Mobile] ExceptionInInitializerError (forge.screens.FScreen in <init>)

See merge request core-developers/forge!4635
2021-05-01 05:17:33 +00:00
Anthony Calosa
fa4e4cb2bb [Mobile] ExceptionInInitializerError (forge.screens.FScreen in <init>)
- it seems it was trying to draw the bug reporter interface while ending the graphics if sentry is not enabled
2021-05-01 13:15:10 +08:00
Hans Mackowiak
7842b7e0fd Merge branch 'ResolvedThisTurn' into 'master'
Fix ResolvedThisTurn

See merge request core-developers/forge!4631
2021-04-30 23:33:44 +00:00
Anthony Calosa
52d6245b4a Merge branch 'master' into 'master'
[Mobile] fix cache capacity initialization

See merge request core-developers/forge!4634
2021-04-30 22:42:19 +00:00
Anthony Calosa
4c03d4f0b4 [Mobile] fix cache capacity initialization 2021-05-01 06:41:04 +08:00
tool4EvEr
de8aaf35a3 Update advanceToNextPhase logic 2021-04-30 23:34:16 +02:00
Anthony Calosa
dda5d8206f Merge branch 'master' into 'master'
[Mobile] fix black image

See merge request core-developers/forge!4632
2021-04-30 18:53:22 +00:00
Anthony Calosa
f8ca2a50b7 [Mobile] fix black image 2021-05-01 02:34:04 +08:00
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