Commit Graph

45146 Commits

Author SHA1 Message Date
Michael Kamensky
3b26ea5084 Merge branch 'master' into 'master'
Prepare Forge for Android publish 1.6.36.001 [incremental].

See merge request core-developers/forge!3000
2020-07-14 09:00:35 +00:00
Agetian
2bc71ea1c6 - Prepare Forge for Android publish 1.6.36.001 [incremental]. 2020-07-14 11:26:53 +03:00
Blacksmith
540d1cef6b Clear out release files in preparation for next release 2020-07-14 02:09:59 +00:00
Blacksmith
5076f19194 [maven-release-plugin] prepare for next development iteration 2020-07-14 02:04:44 +00:00
Blacksmith
90a4cd49e8 [maven-release-plugin] prepare release forge-1.6.36 forge-1.6.36 2020-07-14 02:04:38 +00:00
Blacksmith
2025fa31f8 Update README.txt for release 2020-07-14 02:01:55 +00:00
Sol
fd8cb59289 Merge branch 'ugin' into 'master'
ugin_the_ineffable.txt add ForgetOnMoved$

See merge request core-developers/forge!2999
2020-07-14 00:32:06 +00:00
Sol
246e4a158d Merge branch 'BnR13july' into 'master'
Banned and Restricted - 13 July

See merge request core-developers/forge!2998
2020-07-14 00:31:42 +00:00
Tim Mocny
e2490f4022 Banned and Restricted - 13 July 2020-07-14 00:31:42 +00:00
Northmoc
b3331e22fa ugin_the_ineffable.txt add ForgetOnMoved$ 2020-07-13 14:58:43 -04:00
Zachary Kline
9da6f28bc0 Alternate start button handling. 2020-07-13 09:59:59 -07:00
Zachary Kline
76c093d966 Add several accessible names. 2020-07-12 20:22:52 -07:00
Michael Kamensky
e863fbf77e Merge branch 'hide_unfinished_tutorial' into 'master'
Remove tutorial mode until we're ready for it

See merge request core-developers/forge!2996
2020-07-12 03:48:15 +00:00
friarsol
efa45d61fd Remove tutorial mode until we're ready for it 2020-07-11 22:15:18 -04:00
Sol
cb1749bdfc Merge branch 'wander' into 'master'
mausoleum_wanderer.txt improve SVar:X

See merge request core-developers/forge!2994
2020-07-12 01:58:46 +00:00
Sol
9d4fcfc397 Merge branch 'CardDetailKeyboardFocus' into 'master'
Add the details text box to the focus order for faster gameplay.

See merge request core-developers/forge!2991
2020-07-12 01:58:30 +00:00
Sol
b583d72261 Merge branch 'typo' into 'master'
azra_oddsmaker.txt typos

See merge request core-developers/forge!2995
2020-07-12 01:57:54 +00:00
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
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