Michael Kamensky
8c65965669
Merge branch 'london-mulligan-ui' into 'master'
...
Improved London Mulligan UI (visually highlight selected cards, don't allow to select more cards than needed)
See merge request core-developers/forge!1826
2019-06-11 05:33:25 +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
Michael Kamensky
b5d12c809a
Merge branch 'revealFirstTrigger' into 'master'
...
cards: refactor Reveal the first card you draw into Static Trigger
See merge request core-developers/forge!1827
2019-06-11 05:33:12 +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
a6bce235f1
Merge branch 'mulligan-ui' into 'master'
...
UI for choosing the Mulligan type
See merge request core-developers/forge!1821
2019-06-11 04:02:16 +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
swordshine
37fabf33a6
Merge branch 'support-fixes' into 'master'
...
MH1 misc fixes
See merge request core-developers/forge!1824
2019-06-11 00:36:30 +00:00
apantel
dd404b678e
MH1 misc fixes
2019-06-10 19:35:16 -04:00
Michael Kamensky
92ca339c64
Merge branch 'master' into 'master'
...
Fixed Spark Double
Closes #1047
See merge request core-developers/forge!1823
2019-06-10 17:02:28 +00: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
Agetian
e3ee75bd39
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2019-06-10 06:19:04 +03:00
Michael Kamensky
ef7e23d131
Merge branch 'fix-lavinia' into 'master'
...
Fix Lavinia, Azorius Renegade
See merge request core-developers/forge!1819
2019-06-10 03:06:25 +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
Agetian
09a91bd8d2
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2019-06-09 17:57:49 +03:00
Michael Kamensky
3300ebafb1
Merge branch 'master' into 'master'
...
Fix Sorin, Vengeful Bloodlord and implement a basic AI for it.
See merge request core-developers/forge!1818
2019-06-09 14:08:32 +00:00
Michael Kamensky
caf6c73b7d
Fix Sorin, Vengeful Bloodlord and implement a basic AI for it.
2019-06-09 14:08:32 +00:00
Agetian
6588c2d6d3
- Remove the Announce mechanism for X.
2019-06-09 17:07:16 +03:00
Agetian
0252e346c3
- Fix Sorin, Vengeful Bloodlord and implement an AI for it.
2019-06-09 17:03:22 +03:00
Michael Kamensky
8ed4126893
Merge branch 'master' into 'master'
...
Fix Deliver unto Evil.
Closes #1044
See merge request core-developers/forge!1817
2019-06-09 11:46:32 +00:00
Agetian
d985e37bc7
- Fix Deliver unto Evil.
2019-06-09 14:46:01 +03:00
Michael Kamensky
7122b666a2
Merge branch 'master' into 'master'
...
Assorted AI improvements (RearrangeTopOfLibraryAi, attack AI logic, WithSameCreatureType targeting)
See merge request core-developers/forge!1816
2019-06-09 11:38:44 +00:00
Agetian
86d7880df7
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2019-06-09 14:37:38 +03:00
Agetian
597bcd17c8
- Fix the AI incorrectly considering valid targets in RearrangeTopOfLibraryAi.
2019-06-09 14:37:10 +03:00
Agetian
3dc6cc9795
- Various AI attack logic improvements (consider only valid blockers when evaluating shouldAttack, don't judge by canKillAllDangerous if dangerous creatures aren't among the potential defenders)
2019-06-09 14:36:44 +03:00
Agetian
d622e6c8fc
- ChangeZoneAi: use the new targeting restriction
2019-06-09 14:35:06 +03:00
Michael Kamensky
0a8a0f67d8
Merge branch 'targetSameCreatureType2' into 'master'
...
SpellAbility: add isWithoutSameCreatureType and isWithSameCreatureType to canTarget
See merge request core-developers/forge!1815
2019-06-09 11:34:58 +00:00
Hans Mackowiak
ae19b12844
SpellAbility: add isWithoutSameCreatureType and isWithSameCreatureType to canTarget
2019-06-09 11:34:58 +00:00
Michael Kamensky
6ef6189177
Merge branch 'master' into 'master'
...
Fix copying SVars for SAs with Original Host
Closes #1043
See merge request core-developers/forge!1813
2019-06-09 11:30:57 +00:00
Agetian
a9328d2961
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2019-06-09 12:23:23 +03:00
Michael Kamensky
48d61922f6
Merge branch 'sliceMH1' into 'master'
...
MH1 Slice onto instance or sorcery
See merge request core-developers/forge!1814
2019-06-09 09:22:57 +00:00
Hans Mackowiak
3644b8f74f
MH1 Slice onto instance or sorcery
2019-06-09 09:22:57 +00:00
Agetian
5db867009d
- Some more checks for OriginalHost.
2019-06-09 12:09:42 +03: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
Michael Kamensky
6ea96baf0a
Merge branch 'master' into 'master'
...
Fix Soulherder EOT trigger targeting.
Closes #1042
See merge request core-developers/forge!1812
2019-06-09 07:02:54 +00: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
Michael Kamensky
25f52185bf
Merge branch 'currentmetagamenetdeck' into 'master'
...
Split Churrufli's net decks by format
See merge request core-developers/forge!1811
2019-06-09 06:45:24 +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
Michael Kamensky
1d00cc3fff
Merge branch 'currentmetagamenetdeck' into 'master'
...
Adding netdeck for Churrufli's top deck lists
See merge request core-developers/forge!1809
2019-06-09 03:41:33 +00: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
Michael Kamensky
9d64e1a4f7
Merge branch 'master' into 'master'
...
Added MH1 achievements by Marek14.
See merge request core-developers/forge!1808
2019-06-08 06:45:23 +00:00
Agetian
cdb091ad8b
- Added MH1 achievements.
2019-06-08 09:44:39 +03:00