Commit Graph

51386 Commits

Author SHA1 Message Date
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
Michael Kamensky
4d7126d3c3 Merge branch 'growth' into 'master'
AI & Exponential Growth: Fix illegal target

See merge request core-developers/forge!4599
2021-04-26 07:20:13 +00:00
Anthony Calosa
87ab6c1de2 Merge branch 'master' into 'master'
[Mobile-Dev] Fix alt-tab when fullscreen

See merge request core-developers/forge!4602
2021-04-26 02:35:58 +00:00
Anthony Calosa
e649c9128e [Mobile-Dev] Fix alt-tab when fullscreen 2021-04-26 10:34:44 +08: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
Michael Kamensky
ab2d0771ab Merge branch 'punch' into 'master'
Gravitic Punch: Add DamageSource

See merge request core-developers/forge!4596
2021-04-25 09:10:21 +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
Michael Kamensky
8202c4abe3 Merge branch 'fixstack' into 'master'
removeInstancesControlledBy - also filter simultaneousStackEntryList

See merge request core-developers/forge!4587
2021-04-25 05:45:44 +00:00
Michael Kamensky
4de73cebe0 Merge branch 'AImdfc' into 'master'
AI: basic support playing MDFC lands

See merge request core-developers/forge!4589
2021-04-25 05:45:34 +00:00
Anthony Calosa
9bb6e833fb Merge branch 'master' into 'master'
refactor getStartingPlaneswalkerOptions

See merge request core-developers/forge!4595
2021-04-25 03:51:39 +00:00
Anthony Calosa
d227da0c10 refactor getStartingPlaneswalkerOptions 2021-04-25 11:49:05 +08:00
tool4EvEr
962330d491 Fix ETB 2021-04-25 00:00:09 +02: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
Michael Kamensky
8a7d0d4242 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-04-24 10:23:45 +03:00
Michael Kamensky
45440adc01 Merge branch 'master' into 'master'
Prepare Forge for Android publish 1.6.40.001 [incremental].

See merge request core-developers/forge!4592
2021-04-24 07:22:29 +00:00
Michael Kamensky
8feaf9ed3e [maven-release-plugin] prepare for next development iteration 2021-04-24 08:26:10 +03:00
Michael Kamensky
636020d870 [maven-release-plugin] prepare release forge-1.6.40 forge-1.6.40 2021-04-24 08:25:57 +03:00
Michael Kamensky
3150aa2e7c - Prepare Forge for Android publish 1.6.40.001 [incremental]. 2021-04-24 08:13:13 +03: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
swordshine
0493104beb Merge branch 'master' into 'master'
update translations

See merge request core-developers/forge!4591
2021-04-24 03:02:56 +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
tool4EvEr
7c934d29ac always remove counter 2021-04-23 23:41:24 +02:00
tool4EvEr
bccbf3e55e Add more logic 2021-04-23 23:04:05 +02:00
tool4EvEr
8196ee531a AI: basic support playing MDFC lands 2021-04-23 22:43:14 +02:00
tool4EvEr
39729cb3da placer is target 2021-04-23 22:00:40 +02:00
tool4EvEr
cdc1f6014e also filter simultaneousStackEntryList 2021-04-23 21:25:58 +02:00
Michael Kamensky
aadfdac4c5 Merge branch 'Williams-master-patch-36117' into 'master'
SLD Dr Lair Secretorium Super Drop

See merge request core-developers/forge!4583
2021-04-23 19:17:23 +00:00
John
2e358116c2 Update Secret Lair Drop Series.txt 2021-04-23 14:50:59 +00:00
swordshine
71d88523b2 Merge branch 'update_japanese_localization_mana_value' into 'master'
Update Mana Value in Japanese Localization

See merge request core-developers/forge!4582
2021-04-23 10:12:14 +00:00
swordshine
65e702aed7 Merge branch 'patch' into 'master'
More cleanup

See merge request core-developers/forge!4585
2021-04-23 10:07:58 +00:00
sowrdshine
99bb45d96a More cleanup 2021-04-23 18:07:04 +08:00
swordshine
4f41be641a Merge branch 'patch' into 'master'
Fixed Leyline Invocation

See merge request core-developers/forge!4584
2021-04-23 09:18:45 +00:00
sowrdshine
5ab030242b Fixed Leyline Invocation 2021-04-23 17:17:34 +08:00
John
736d9bbd98 Update Secret Lair Drop Series.txt 2021-04-23 08:23:48 +00:00
Lyu Zong-Hong
6295ebdb09 Update Mana Value in Japanese Localization 2021-04-23 13:35:44 +09:00
Michael Kamensky
380a27b83d Merge branch 'update_in_game_text' into 'master'
Update in-game text and also English and Japanese localization (CMC -> mana value and etc.)

See merge request core-developers/forge!4581
2021-04-23 04:30:06 +00:00
Michael Kamensky
691af037a4 Merge branch 'phoenix' into 'master'
Retriever Phoenix: Fix check

See merge request core-developers/forge!4577
2021-04-23 04:29:03 +00:00
Michael Kamensky
70cb78a67d Merge branch 'scrollmenu' into 'master'
Support scrolling when abilities Popup has too many entries

See merge request core-developers/forge!4567
2021-04-23 04:28:50 +00:00
Michael Kamensky
4bd5fe0178 Merge branch 'changetargetsai' into 'master'
ChangeTargetsAI: Improve decision making

See merge request core-developers/forge!4569
2021-04-23 04:27:57 +00:00
Michael Kamensky
babd80edd9 Merge branch 'update_oracle_stx' into 'master'
Update Oracle after STX release

See merge request core-developers/forge!4564
2021-04-23 04:27:30 +00:00
Alumi
74e4efba52 Update Oracle after STX release 2021-04-23 04:27:27 +00:00