Commit Graph

46850 Commits

Author SHA1 Message Date
Northmoc
d4187b4144 azra_oddsmaker.txt typos 2020-07-11 21:39:59 -04:00
Northmoc
437d973400 mausoleum_wanderer.txt improve SVar:X 2020-07-11 21:38:18 -04:00
Michael Kamensky
c3d742278f Merge branch 'annoyance' into 'master'
weird space before DB$

See merge request core-developers/forge!2993
2020-07-11 16:12:34 +00:00
Northmoc
2b55ef9904 weird space before DB$ 2020-07-11 11:54:24 -04:00
Michael Kamensky
d0cd531f8e Merge branch 'forum9jul' into 'master'
The Mimeoplasm :: PutCounters needs ETB$ True

See merge request core-developers/forge!2983
2020-07-11 03:04:31 +00:00
Sol
2cbeb8621e Merge branch 'counterfix' into 'master'
2 cards with Counter effect need TargetType$

See merge request core-developers/forge!2992
2020-07-10 21:08:30 +00:00
Northmoc
752ec6526c Counter effect needs TargetType$ 2020-07-10 16:08:03 -04:00
Michael Kamensky
1c3f028e90 Merge branch 'tainted' into 'master'
tainted_pact.txt empty library case

See merge request core-developers/forge!2982
2020-07-10 19:01:10 +00:00
Tim Mocny
9d9f94fa8a tainted_pact.txt empty library case 2020-07-10 19:01:10 +00:00
Zachary Kline
b535332d14 Add the details text box to the focus order for faster gameplay. 2020-07-10 11:09:43 -07:00
João D. Moreira
263f12066a Filter *.iml independent of path 2020-07-10 15:25:55 +02:00
Northmoc
8fd5ee9e38 the_mimeoplasm.txt counters need ETB$ True 2020-07-10 08:47:19 -04:00
Michael Kamensky
c72d575ebc Merge branch 'master' into 'master'
Check NetCombatDamage instead of NetPower when testing for possible Trample attack

See merge request core-developers/forge!2989
2020-07-10 12:26:28 +00:00
Agetian
faf5ac7728 - Check NetCombatDamage instead of NetPower 2020-07-10 14:23:45 +03:00
Michael Kamensky
16f5ce62f8 Merge branch 'master' into 'master'
Allow the AI to trample over defenders it can't kill.

See merge request core-developers/forge!2988
2020-07-10 10:15:32 +00:00
Agetian
082fd8cf5f - Somewhat more appropriate location for the updated trample AI code. 2020-07-10 12:34:42 +03:00
Agetian
b3857dfcfd - Allow the AI to trample over defenders it can't kill (e.g. Orgg vs. a regenerating blocker). 2020-07-10 12:18:09 +03:00
Michael Kamensky
55ca305077 Merge branch 'FControlsFocusFIx' into 'master'
Allow keyboard focus to land on checkboxes and radio buttons.

See merge request core-developers/forge!2985
2020-07-10 04:14:32 +00:00
Michael Kamensky
cdae6f5afa Merge branch 'master' into 'master'
Fix a crash in the AI ManaPref checking code.

See merge request core-developers/forge!2987
2020-07-10 04:11:22 +00:00
Agetian
276a6ba619 - Fix a crash in the AI ManaPref checking code. 2020-07-10 06:57:09 +03:00
Michael Kamensky
7f67c5f49d Merge branch 'QDeleteTypo' into 'master'
FIx small typo in deletion prompt.

See merge request core-developers/forge!2986
2020-07-10 03:36:28 +00:00
Zachary Kline
85b193084a FIx small typo in deletion prompt. 2020-07-09 19:58:33 -07:00
Zachary Kline
dbd3bcae71 Allow keyboard focus to land on checkboxes and radio buttons. 2020-07-09 13:57:07 -07:00
Michael Kamensky
54c8f251ea Merge branch 'master' into 'master'
Adding Draft Rankings for IKO and M21, adding the July 2020 MTGO Vintage cube.

See merge request core-developers/forge!2984
2020-07-09 15:33:14 +00:00
Agetian
1cc57d9963 - Add MTGO Vintage Cube July 2020 (ported from XMage) 2020-07-09 18:08:17 +03:00
Agetian
387fc7ef0a - Added Draft Rankings for IKO and M21. 2020-07-09 17:53:30 +03:00
Michael Kamensky
bd67deb809 Merge branch 'forum-jul-8' into 'master'
Forum fixes - July 8

See merge request core-developers/forge!2979
2020-07-09 14:40:27 +00:00
Tim Mocny
10e9db7bc7 Forum fixes - July 8 2020-07-09 14:40:27 +00:00
Michael Kamensky
67f4798f61 Merge branch 'remnoncommander' into 'master'
Initial implementation for the RemoveDeck:NonCommander hint.

See merge request core-developers/forge!2981
2020-07-09 13:57:35 +00:00
Agetian
5148e8109c - Add RemNonCommanderDeck hint to Tome of Legends. 2020-07-09 16:42:33 +03:00
Agetian
9d43443ca4 - Add a FIXME comment for consideration. 2020-07-09 09:28:43 +03:00
Agetian
5df4902d3c - Minor stylistic fix. 2020-07-09 09:25:25 +03:00
Agetian
448de9b4a2 - Initial implementation for the RemoveDeck:NonCommander hint. 2020-07-09 09:22:47 +03:00
Michael Kamensky
6567aa1b88 Merge branch 'adamant-ai' into 'master'
Adamant AI: initial implementation

See merge request core-developers/forge!2980
2020-07-09 06:13:11 +00:00
Agetian
33e0911abc - Adamant: improve the algorithm, make AIManaPref customizable when it comes to preferred shard count. 2020-07-09 08:54:35 +03:00
Michael Kamensky
716fca512a Merge branch 'patch-8' into 'master'
Update worlds.txt

See merge request core-developers/forge!2978
2020-07-09 04:32:15 +00:00
Agetian
1ae2055f5a - Adamant AI: initial implementation, needs refining. 2020-07-08 21:21:41 +03:00
Gabriel Franco
2fc077c04a Update worlds.txt to include more worlds and to update some worlds who doesn't had the newer collections yet 2020-07-08 13:46:29 +00:00
Michael Kamensky
03e15a4156 Merge branch 'battlelandsfix' into 'master'
Player.java Land play state update (fixes battle lands bug)

Closes #1498

See merge request core-developers/forge!2976
2020-07-08 02:40:51 +00:00
swordshine
61a99a3614 Merge branch 'typotorment' into 'master'
Everlasting Torment - no apostrophe in global rule change

See merge request core-developers/forge!2977
2020-07-08 01:01:54 +00:00
Northmoc
494eec1cb9 no apostrophe! 2020-07-07 16:37:52 -04:00
Northmoc
9382d4e33e Player.java Land play state update (fixes battle lands bug) 2020-07-07 11:26:48 -04:00
Michael Kamensky
5aba451750 Merge branch 'master' into 'master'
Fix Prying Questions.

See merge request core-developers/forge!2974
2020-07-07 12:18:40 +00:00
Agetian
9d2bbaf18b - Fixed Prying Questions. 2020-07-07 15:01:55 +03:00
Michael Kamensky
505530f15c Merge branch '1495-morph-x-costs-x-is-not-being-remembered' into 'master'
Resolve "Morph X costs - X is not being remembered"

Closes #1496 and #1495

See merge request core-developers/forge!2969
2020-07-07 09:58:08 +00:00
Hans Mackowiak
4a11157019 Resolve "Morph X costs - X is not being remembered" 2020-07-07 09:58:08 +00:00
swordshine
5d8b701f55 Merge branch 'woolly' into 'master'
woolly_razorback.txt source not target

See merge request core-developers/forge!2972
2020-07-07 07:12:25 +00:00
swordshine
16200e480a Merge branch 'bloodhound' into 'master'
Blood Hound overhaul

See merge request core-developers/forge!2971
2020-07-07 07:11:15 +00:00
Tim Mocny
5a6055a9d6 Blood Hound overhaul 2020-07-07 07:11:15 +00:00
swordshine
0c1809a68d Merge branch 'maddening' into 'master'
Maddening Imp!!!

See merge request core-developers/forge!2563
2020-07-07 07:09:43 +00:00