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
swordshine
d8ce8e4ab3
Merge branch 'ugin' into 'master'
...
ugin_the_ineffable.txt +1 fix
See merge request core-developers/forge!2959
2020-07-05 02:57:33 +00:00
Tim Mocny
a40ff0e71a
ugin_the_ineffable.txt +1 fix
2020-07-05 02:57:32 +00:00
Northmoc
80b26333b6
raven_guild_master.txt typo fix
2020-07-04 21:50:12 -04:00
Zachary Kline
4e797f3ad1
ADd accessible names to the basic land buttons
2020-07-04 18:44:14 -07:00
swordshine
057e0b0fb1
Merge branch 'splinteringfix' into 'master'
...
splintering_wind.txt fix with Effect!
See merge request core-developers/forge!2923
2020-07-04 12:02:52 +00:00
Tim Mocny
27f26aff49
splintering_wind.txt fix with Effect!
2020-07-04 12:02:52 +00:00
Hans Mackowiak
0da29359c0
Update silversmote_ghoul.txt
2020-07-04 10:37:15 +00:00
Zachary Kline
26ba4dffab
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2020-07-03 21:40:41 -07:00
swordshine
da1fb00602
Merge branch 'rielle' into 'master'
...
rielle_the_everwise.txt trigger fix
See merge request core-developers/forge!2958
2020-07-04 01:54:31 +00:00
swordshine
7f755ac45c
Merge branch 'forum.3' into 'master'
...
dread_wight.txt TriggerZones
See merge request core-developers/forge!2960
2020-07-04 01:51:37 +00:00
Northmoc
7b4b01bdf7
dread_wight.txt TriggerZones
2020-07-03 19:37:12 -04:00
Zachary Kline
d1bdb0a670
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2020-07-03 11:32:42 -07:00
Northmoc
ff37b7aef7
rielle_the_everwise.txt trigger fix
2020-07-03 12:15:49 -04:00
Michael Kamensky
dd5734c2a8
Merge branch 'master' into 'master'
...
fix:missing some translation.
See merge request core-developers/forge!2956
2020-07-03 13:41:06 +00:00
Michael Kamensky
3d2b6e7008
Merge branch 'vessel' into 'master'
...
archfiends_vessel.txt trigger fix
See merge request core-developers/forge!2954
2020-07-03 05:03:38 +00:00
Michael Kamensky
2e3721e19d
Merge branch 'fix-repeat-each' into 'master'
...
Fix repeat each not looping over cards
See merge request core-developers/forge!2955
2020-07-03 05:02:56 +00:00
CCTV-1
92928d4a5b
fix:missing some translation.
2020-07-03 10:05:59 +08:00
friarsol
6388ac84a1
Fix repeat each not looping over cards
2020-07-02 21:56:31 -04:00
Zachary Kline
6b7eb0422f
Remove event listeners which cause issues with keyboard accessibility.
2020-07-02 17:23:01 -07:00
Northmoc
6f5be80b6b
archfiends_vessel.txt trigger fix
2020-07-02 20:01:23 -04:00
Sol
e3da34061c
Merge branch 'ogw_ed' into 'master'
...
More edition file token corrections
See merge request core-developers/forge!2953
2020-07-02 20:44:57 +00:00
Tim Mocny
b3803e7b4f
More edition file token corrections
2020-07-02 20:44:57 +00:00
Sol
81cdf186c5
Merge branch 'tutorial-prototype' into 'master'
...
Add Tutorial mode
See merge request core-developers/forge!2949
2020-07-02 20:44:37 +00:00
Michael Kamensky
9a03ff7dd3
Merge branch 'patch-6' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!2946
2020-07-02 18:21:16 +00:00
Sol
c503c7c500
Merge branch 'drudge' into 'master'
...
Drudge Spell with CostDesc
See merge request core-developers/forge!2952
2020-07-02 17:12:12 +00:00
Sol
605cf618e7
Merge branch 'garrukchtypo' into 'master'
...
garruk_cursed_huntsman.txt typo fix
See merge request core-developers/forge!2951
2020-07-02 17:11:49 +00:00
Northmoc
fc4446bb9e
drudge_spell.txt with CostDesc
2020-07-02 12:58:20 -04:00
Northmoc
6a01128eb7
garruk_cursed_huntsman.txt typo fix
2020-07-02 12:31:22 -04:00
Michael Kamensky
8e66e4910e
Merge branch 'C20ed' into 'master'
...
Commander 2020.txt token fix
See merge request core-developers/forge!2950
2020-07-02 14:55:42 +00:00
Michael Kamensky
fe355551a8
Merge branch 'fix-companion-ai' into 'master'
...
Companion AI was broken
See merge request core-developers/forge!2948
2020-07-02 14:55:16 +00:00