Commit Graph

11706 Commits

Author SHA1 Message Date
Michael Kamensky
0bbdddada1 Merge branch 'master' into 'master'
internationalization works

See merge request core-developers/forge!1820
2019-06-11 05:36:06 +00:00
Michael Kamensky
391c81101f - Improved London Mulligan UI (visually highlight selected cards, don't allow to select more cards than necessary) 2019-06-11 05:33:25 +00:00
Hans Mackowiak
1b138b11f8 cards: refactor Reveal the first card you draw into Static Trigger 2019-06-11 05:33:12 +00:00
Michael Kamensky
1c22f8cc60 Merge branch 'M15-Prerelease-Challenge' into 'master'
Added M15 Prerelease Challenge Edition

See merge request core-developers/forge!1822
2019-06-11 04:36:37 +00:00
Michael Kamensky
08e2ba54ea UI for choosing the Mulligan type 2019-06-11 04:02:16 +00:00
Michael Kamensky
dad052fa07 Merge branch 'london-mulligan-feature-flag' into 'master'
Fix LondonMulligan not actually working

See merge request core-developers/forge!1825
2019-06-11 04:02:05 +00:00
Chris H
aa5851329d Fix LondonMulligan not actually working 2019-06-10 22:55:50 -04:00
apantel
dd404b678e MH1 misc fixes 2019-06-10 19:35:16 -04:00
Agetian
f9f710f9b9 - Fixed Spark Double. 2019-06-10 20:01:39 +03:00
Dagin Svezek
ab813e7327 Added M15 Prerelease Challenge Edition 2019-06-10 07:33:42 +00:00
Michael Kamensky
b45ef60ed2 Fix Lavinia, Azorius Renegade 2019-06-10 03:06:25 +00:00
churrufli
5a98eafacb internationalization works 2019-06-09 23:08:45 +02:00
Michael Kamensky
caf6c73b7d Fix Sorin, Vengeful Bloodlord and implement a basic AI for it. 2019-06-09 14:08:32 +00:00
Agetian
d985e37bc7 - Fix Deliver unto Evil. 2019-06-09 14:46:01 +03:00
Agetian
a9328d2961 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-06-09 12:23:23 +03:00
Hans Mackowiak
3644b8f74f MH1 Slice onto instance or sorcery 2019-06-09 09:22:57 +00:00
Agetian
fb12dd30b2 - Fix copying SVars for SAs with Original Host.
- Add a missing reference to Cobra Trap.
2019-06-09 10:32:15 +03:00
Agetian
6c19f39279 - Fix Soulherder EOT trigger targeting. 2019-06-09 10:02:23 +03:00
Michael Kamensky
d099be187f Merge branch 'gideonstriumphfix' into 'master'
Adding missing references

See merge request core-developers/forge!1810
2019-06-09 06:45:31 +00:00
austinio7116
30e38538e2 Split Churrufli's mtggoldfish metagame netdecks by format to allow for format specific quick gauntlets 2019-06-09 07:30:54 +01:00
austinio7116
6bd9cced6e Split Churrufli's mtggoldfish metagame netdecks by format to allow for format specific quick gauntlets 2019-06-09 07:26:56 +01:00
austinio7116
93d0820216 Adding missing references 2019-06-09 07:24:11 +01:00
austinio7116
9d1ea5a6c7 Adding netdeck for Churrufli's top deck lists 2019-06-08 17:09:34 +01:00
swordshine
1772696181 Merge branch 'master' into 'master'
Moving hard-coded text to en-US.properties file

See merge request core-developers/forge!1805
2019-06-08 07:46:12 +00:00
Agetian
cdb091ad8b - Added MH1 achievements. 2019-06-08 09:44:39 +03:00
Agetian
260acd5403 - MH1 AI hints
- Tweaked some AI hints for various older cards (similar to how they are on newer cards)
- Added MH1 to Time Vault in Planar Conquest
2019-06-08 09:35:27 +03:00
churrufli
1059666444 Moving hard-coded text to en-US.properties file 2019-06-08 07:55:27 +02:00
Agetian
9b1ed633f5 - Fix and improve AI for Band Together and Courage in Crisis 2019-06-08 07:08:59 +03:00
churrufli
f44c6ac1a5 Moving hard-coded text to en-US.properties file 2019-06-07 20:56:15 +02:00
churrufli
6783f4e700 Moving hard-coded text to en-US.properties file 2019-06-07 20:50:04 +02:00
churrufli
6ddbadd339 Moving hard-coded text to en-US.properties file 2019-06-07 20:36:59 +02:00
churrufli
a63d02ff00 Moving hard-coded text to en-US.properties file 2019-06-07 20:34:14 +02:00
churrufli
4589f783b6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	forge-gui/res/languages/es-es.properties
2019-06-07 20:26:40 +02:00
churrufli
55721fb5d3 Moving hard-coded text to en-US.properties file 2019-06-07 20:26:02 +02:00
Churrufli
aafad639a6 Update es-es.properties 2019-06-07 20:25:45 +02:00
Churrufli
233e6d7794 Update en-US.properties 2019-06-07 20:25:38 +02:00
Churrufli
83df3e507f Update de-DE.properties 2019-06-07 20:25:38 +02:00
churrufli
bd4eace538 Moving hard-coded text to en-US.properties file 2019-06-07 20:25:38 +02:00
churrufli
1afc657ce6 updating res files 2019-06-07 20:25:15 +02:00
Churrufli
0f46f8c5e5 Update es-es.properties 2019-06-07 20:24:51 +02:00
Churrufli
1c1bbcebcb Update en-US.properties 2019-06-07 20:24:51 +02:00
Churrufli
f92edc3c3d Update de-DE.properties 2019-06-07 20:24:51 +02:00
churrufli
cefffc5d90 Moving hard-coded text to en-US.properties file 2019-06-07 20:24:51 +02:00
churrufli
821e345861 updating res files 2019-06-07 20:24:51 +02:00
Agetian
f145569292 - Fix a missing reference. 2019-06-07 19:07:17 +03:00
Agetian
90276e1217 - Some additional logic for Return from Extinction. 2019-06-07 18:58:20 +03:00
Agetian
fd59807413 - Fix Reap the Past card name. 2019-06-07 18:23:56 +03:00
Hans Mackowiak
6d09f2a278 Update w_5_5_giant_warrior.txt 2019-06-07 12:39:27 +00:00
Agetian
47cfa67c09 - Fix AI for Karn, the Great Creator. 2019-06-07 08:17:09 +03:00
Michael Kamensky
41abad1131 Merge branch 'war-cards' into 'master'
Fix Winds of Abandon

See merge request core-developers/forge!1795
2019-06-07 03:13:47 +00:00