Commit Graph

16315 Commits

Author SHA1 Message Date
Michael Kamensky
a246257eff Merge branch 'master' into 'master'
Update simplified chinese translation

See merge request core-developers/forge!4652
2021-05-04 18:17:55 +00:00
Michael Kamensky
b6bab552be Merge branch 'fix-auto-updater' into 'master'
Fix AutoUpdater to point to the new snapshot location

See merge request core-developers/forge!4651
2021-05-04 18:17:44 +00:00
Michael Kamensky
9ddfdf3638 Merge branch 'master' into 'master'
Better AI logic for Boltlands and more

Closes #1573

See merge request core-developers/forge!4654
2021-05-04 18:17:03 +00:00
Hythonia
cac7ac2a8a Remove UnlessAI from shocklands and boltlands 2021-05-04 12:12:26 +02:00
Hythonia
fbbe4f5579 Magus of the Scroll AI 2021-05-04 10:34:38 +02:00
Hythonia
97bf88421e Better AI logic for Boltlands 2021-05-04 09:24:41 +02:00
CCTV-1
c067ab7cc9 translate new setting 2021-05-04 09:38:03 +08:00
friarsol
b21e4f5296 Fix AutoUpdater to point to the new snapshot location 2021-05-03 21:32:55 -04: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
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
9a21a3e2a4 Fix Cost 2021-05-02 11:04:59 +02:00
Anthony Calosa
6d31a2f656 Update GuiDownloadZipService.java 2021-05-01 14:27:02 +00:00
tool4EvEr
db17973ea6 Fix cost 2021-05-01 12:43:26 +02: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
Anthony Calosa
9fee1fda1e update order Message 2021-04-30 22:21:56 +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
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
Lyu Zong-Hong
3384c773da Update Eureka and Hypergenesis to put chosen permanent on battlefield sequentially 2021-04-29 10:51:03 +09: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
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
Hans Mackowiak
178f98c82f CardProperty: add SharesColorWithOther to stop comparing cards with themselves 2021-04-27 15:15:08 +02: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
Lyu Zong-Hong
135f043b60 Fix Grindstone and Sphinx's Tutelage 2021-04-27 18:38:59 +09:00
Michael Kamensky
702b473453 Merge branch 'fixghired' into 'master'
Fix some cards failing to target for X=0

See merge request core-developers/forge!4601
2021-04-27 04:50:01 +00:00
tool4EvEr
228d929a5c Add AffectedZone 2021-04-26 21:05:17 +02:00
tool4EvEr
be89397e48 Fix targeting for spells with DividedValue and X=0 2021-04-26 17:44:46 +02:00
Churrufli
b8b5561850 Update net-decks-archive-standard.txt 2021-04-26 09:11:54 +00:00
Churrufli
88694f4256 Net Deck Archive Updates 2021-04-26 10:33:45 +02:00
tool4EvEr
9b774734c3 Fix some cards failing to target for X=0 2021-04-25 22:47:54 +02:00
tool4EvEr
841164bafb Fix illegal target 2021-04-25 21:28:13 +02:00
Michael Kamensky
bc61ec0495 Merge branch 'kozilek' into 'master'
Fix Kozilek, the Great Distortion

See merge request core-developers/forge!4598
2021-04-25 10:36:06 +00:00
tool4EvEr
c37bc213e5 Fix Kozilek, the Great Distortion 2021-04-25 11:49:09 +02:00
Michael Kamensky
080639d2d9 Merge branch 'shusher' into 'master'
Fix Vexing Shusher

See merge request core-developers/forge!4597
2021-04-25 09:10:33 +00:00
tool4EvEr
204d502c24 Fix Vexing Shusher 2021-04-25 10:59:36 +02:00
tool4EvEr
985b60a565 Add DamageSource 2021-04-25 10:44:19 +02:00
Anthony Calosa
d227da0c10 refactor getStartingPlaneswalkerOptions 2021-04-25 11:49:05 +08:00
Tim McFadden
c5d9a98549 Upload New File 2021-04-24 11:09:04 +00:00
Michael Kamensky
9b83c78346 Merge branch 'conquest' into 'master'
Allow cards from precon products in Planar Conquest

See merge request core-developers/forge!4573
2021-04-24 07:36:12 +00:00
swordshine
ce22449f41 Merge branch 'shadrix' into 'master'
Shadrix Silverquill: placer is target

See merge request core-developers/forge!4588
2021-04-24 03:04:02 +00:00
swordshine
1c938b5d29 Merge branch 'arix' into 'master'
Arixmethes: always remove counter

See merge request core-developers/forge!4590
2021-04-24 03:03:39 +00:00
CCTV-1
9786d9f927 update cmc translation,add missing translation. 2021-04-24 10:39:37 +08:00
CCTV-1
73e5254e2b add missing string 2021-04-24 10:38:51 +08:00