external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,880 Commits 31 Branches 187 Tags
64131f15e56cc7c470764a34e7d3258e987f1dcc
Commit Graph

45880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tim Mocny
902c653bd4 Maddening Imp!!! 2020-07-07 07:09:42 +00:00
Michael Kamensky
f2f6c432b9 Merge branch 'newBranch' into 'master' 
Fix flash ability outline on card panel

Closes #1489

See merge request core-developers/forge!2970
 2020-07-06 17:35:46 +00:00
Northmoc
d75e80f548 woolly_razorback.txt source not target 2020-07-06 11:53:29 -04:00
Anthony Calosa
e9ad010993 Fix flash ability outline on card panel 2020-07-06 20:44:37 +08:00
swordshine
420842003b Merge branch 'mons' into 'master' 
pashalik_mons.txt typo and AI

See merge request core-developers/forge!2967
 2020-07-06 01:00:24 +00:00
swordshine
fcfcf282c1 Merge branch 'rinseri' into 'master' 
rin_and_seri_inseparable.txt add T to ability

See merge request core-developers/forge!2968
 2020-07-06 00:59:56 +00:00
Northmoc
9e9e4dd398 pashalik_mons.txt typo and AI 2020-07-05 17:25:02 -04:00
Northmoc
a8caa1e14c rin_and_seri_inseparable.txt add T to ability 2020-07-05 17:02:56 -04:00
Hans Mackowiak
0ba4a52c37 Update erebos_bleak_hearted.txt 2020-07-05 20:40:17 +00:00
Sol
7bfb560e19 Merge branch 'typo' into 'master' 
teferis_tutelage.txt mill not draw

See merge request core-developers/forge!2966
 2020-07-05 18:08:49 +00:00
Northmoc
a08a937720 teferis_tutelage.txt mill not draw 2020-07-05 13:10:09 -04:00
Michael Kamensky
23ace9ad74 Merge branch 'master' into 'master' 
Checking static abilities makes no difference for grantsUsefulExtraBlockOpts.

See merge request core-developers/forge!2965
 2020-07-05 14:33:23 +00:00
Agetian
1c73050e72 - Checking static abilities makes no difference for grantsUsefulExtraBlockOpts. 2020-07-05 17:21:01 +03:00
Michael Kamensky
e402df9010 Merge branch 'master' into 'master' 
Improve logic for grantsUsefulExtraBlockOpts, fix an issue with AI spam-activating pump abilities when low on life.

See merge request core-developers/forge!2964
 2020-07-05 12:43:12 +00:00
Agetian
fc8922e271 - Improve logic for grantsUsefulExtraBlockOpts, fix an issue where the AI would start spam-activating pump abilities randomly when about to lose. 2020-07-05 13:47:16 +03:00
Michael Kamensky
b2ee13cadc Merge branch 'BasicLandsAccessibility' into 'master' 
Basic Lands Accessibility

See merge request core-developers/forge!2962
 2020-07-05 06:55:41 +00:00
Zachary Kline
a973bf0c29 Merge branch 'BasicLandsAccessibility' of git.cardforge.org:elwin/forge into BasicLandsAccessibility 2020-07-04 21:15:11 -07:00
Zachary Kline
9fc24faf15 ADd accessible names to the basic land buttons 2020-07-04 21:14:35 -07:00
Michael Kamensky
6c76b9e948 Merge branch 'deckChooserAccessibility' into 'master' 
Deck Chooser keyboard accessibility fix

See merge request core-developers/forge!2957
 2020-07-05 04:04:43 +00:00
swordshine
9df9fcfb6d Merge branch 'rgm' into 'master' 
raven_guild_master.txt typo fix

See merge request core-developers/forge!2963
 2020-07-05 02:58:51 +00:00