Bug Hunter
754e2a7aa7
Merge branch 'TRT-master-patch-29542' into 'master'
...
Update forge-gui/res/cardsfolder/upcoming/flamescroll_celebrant_revel_in_silence.txt
See merge request core-developers/forge!4647
2021-05-03 14:27:36 +00:00
Bug Hunter
731f375332
Update forge-gui/res/cardsfolder/upcoming/flamescroll_celebrant_revel_in_silence.txt
2021-05-03 14:27:12 +00:00
Michael Kamensky
90afe81856
Merge branch 'modaloption' into 'master'
...
Add preference how to display alternate card states in deck views
See merge request core-developers/forge!4625
2021-05-02 14:25:36 +00:00
Bug Hunter
c13e379908
Add preference how to display alternate card states in deck views
2021-05-02 14:25:35 +00:00
Michael Kamensky
689d3bb9b5
Merge branch 'fixloop' into 'master'
...
Fix multiplayer loop from SA controlled by loser
See merge request core-developers/forge!4636
2021-05-02 14:25:27 +00:00
Michael Kamensky
9ae8fcf3bc
Merge branch 'killing_wave' into 'master'
...
payCostToPreventEffect ignores X amount
See merge request core-developers/forge!4645
2021-05-02 14:25:16 +00:00
tool4EvEr
74f3a0a5ed
Fix payCostToPreventEffect for X amount
2021-05-02 14:38:19 +02:00
Anthony Calosa
d51e20bffe
Merge branch 'master' into 'master'
...
fix localizer
See merge request core-developers/forge!4644
2021-05-02 11:47:15 +00:00
Anthony Calosa
c5d6214ab2
fix localizer
2021-05-02 19:44:19 +08:00
Michael Kamensky
898921ea4f
Merge branch 'untapall' into 'master'
...
UntapAllAi: improve logic (Najeela)
See merge request core-developers/forge!4643
2021-05-02 10:42:12 +00:00
tool4EvEr
8c6194da35
improve logic (Najeela)
2021-05-02 11:55:04 +02:00
Michael Kamensky
8b2a3ccb42
Merge branch 'costfix' into 'master'
...
Restore Balance: Fix Cost
Closes #1814
See merge request core-developers/forge!4642
2021-05-02 09:47:43 +00:00
tool4EvEr
820c869e2c
Avoid clearTriggers
2021-05-02 11:44:41 +02:00
tool4EvEr
9a21a3e2a4
Fix Cost
2021-05-02 11:04:59 +02:00
Hans Mackowiak
03e47cee56
Merge branch 'suspend' into 'master'
...
AI: Fix backing out of Suspend
See merge request core-developers/forge!4640
2021-05-02 08:55:10 +00:00
Michael Kamensky
1a28f15f75
Merge branch 'NPE' into 'master'
...
viewDeckList: Fix NPE
See merge request core-developers/forge!4639
2021-05-02 03:55:14 +00:00
Anthony Calosa
72d5c74631
Merge branch 'master' into 'master'
...
[Mobile] Fix ExceptionInInitializerError forge.screens.home.NewGameMenu$NewGameScreen
See merge request core-developers/forge!4641
2021-05-02 01:20:52 +00:00
Anthony Calosa
322ebdf8a6
Update spacing
2021-05-02 09:16:55 +08:00
Anthony Calosa
3d3296d1b7
[Mobile] Fix ExceptionInInitializerError forge.screens.home.NewGameMenu$NewGameScreen
...
- some mobile issues reported via Sentry is related to Translation errors and it should return the default original value from English locale.
2021-05-02 09:13:49 +08:00
tool4EvEr
e3715c3f81
Update ceasetoExist check
2021-05-02 00:02:49 +02:00
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
