Agetian
a7ee1fa5b1
- Added puzzle PS_WAR4.
2019-05-28 07:38:26 +03:00
swordshine
477f2d4ea6
Merge branch 'mulligans' into 'master'
...
Extract mulligans from GameAction
See merge request core-developers/forge!1724
2019-05-28 03:55:20 +00:00
Chris H
2f2acea1dd
Even more warnings
2019-05-27 21:14:27 -04:00
swordshine
d7cad9fa83
Merge branch 'patch-19' into 'master'
...
Orim's Thunder Update
Closes #1013
See merge request core-developers/forge!1720
2019-05-28 00:48:18 +00:00
swordshine
fc1768d3b5
Merge branch 'patch-21' into 'master'
...
Talisman of Conviction
See merge request core-developers/forge!1723
2019-05-28 00:47:14 +00:00
Sol
6371e708b0
Merge branch 'master' into 'mulligans'
...
# Conflicts:
# forge-game/src/main/java/forge/game/GameAction.java
2019-05-28 00:39:05 +00:00
Charles Baker
4e48b42b17
Update talisman_of_conviction.txt
2019-05-27 19:58:30 +00:00
Chris H
220e75a81b
Extract mulligans from GameAction
...
- Add a few different types of Mulliganing that should be expandable
- To finish the work, we need the AI to better handle London mulligans
- And have the UI make this option selectable
2019-05-27 15:58:20 -04:00
Charles Baker
cf29a85af3
Talisman of Conviction
2019-05-27 19:13:30 +00:00
austinio7116
de21a14a77
Added new cards to MH1 editions file
2019-05-27 18:22:55 +01:00
austinio7116
f71b4cc739
Some MH1 spoilers from forgescribe
2019-05-27 18:19:40 +01:00
Charles Baker
f4d5e337a2
Yawgmoth, Thran Physician
2019-05-27 15:55:18 +00:00
Charles Baker
cba21451c1
Orim's Thunder Update
2019-05-27 04:54:23 +00:00
swordshine
25620ec33c
Merge branch 'patch-17' into 'master'
...
Sword of Sinew and Steel
See merge request core-developers/forge!1717
2019-05-26 06:14:16 +00:00
swordshine
37325b8a9e
Merge branch 'patch-16' into 'master'
...
Sword of Truth and Justice
See merge request core-developers/forge!1716
2019-05-26 06:13:42 +00:00
swordshine
d8593cff8f
Merge branch 'patch-15' into 'master'
...
Archmage's Charm
See merge request core-developers/forge!1715
2019-05-26 06:11:29 +00:00
swordshine
de0149dace
Merge branch 'patch-18' into 'master'
...
Update Modern Horizons edition file
See merge request core-developers/forge!1718
2019-05-26 06:07:07 +00:00
Charles Baker
8b561bacfd
Update Modern Horizons edition file
2019-05-26 03:06:52 +00:00
Charles Baker
427d23dfa4
Sword of Sinew and Steel
2019-05-26 03:02:21 +00:00
Charles Baker
17bb054bc4
Sword of Truth and Justice
2019-05-26 02:45:44 +00:00
Charles Baker
af935f96ce
Archmage's Charm
2019-05-26 02:28:34 +00:00
Charles Baker
94c21f7fff
Condemn update
2019-05-26 02:08:23 +00:00
swordshine
d6f32071e3
Update more scripts
2019-05-26 00:41:07 +08:00
swordshine
c3ff31f078
Update more scripts
2019-05-26 00:13:00 +08:00
swordshine
3659bd6777
Update some scripts
2019-05-26 00:02:29 +08:00
swordshine
4fc93a3f71
Merge branch 'mh1spoilers' into 'master'
...
Mh1spoilers
See merge request core-developers/forge!1695
2019-05-25 15:57:59 +00:00
Agetian
da0e89fde9
- Added puzzle PS_WAR3.
2019-05-25 17:52:20 +03:00
austinio7116
46bfb76a84
Updated modern horizons edition file tokens
2019-05-25 15:05:19 +01:00
austinio7116
8a59d00423
Updated modern horizons edition file
2019-05-25 15:05:19 +01:00
austinio7116
bd23f13dbc
More spoilers from forgescribe
2019-05-25 15:05:19 +01:00
austinio7116
7ce5f9a94c
Remove unsupported Slice onto instant/sorcery for now
2019-05-25 15:01:18 +01:00
austinio7116
4306c16e57
Updated modern horizons edition file
2019-05-25 15:01:18 +01:00
austinio7116
36db4d8d14
Some of today's spoilers from forgescribe - untested
2019-05-25 15:01:18 +01:00
Agetian
8caf66ecea
- AnimateAllAi: implement an "Always" logic hook for cards that are generally beneficial to activate.
2019-05-25 08:05:03 +03:00
Agetian
9cd92946b0
- Fix Ob Nixilis's Cruelty.
2019-05-25 07:00:41 +03:00
swordshine
e020fce608
Update some scripts
2019-05-24 11:52:20 +08:00
swordshine
ca8cb7c312
Merge branch 'patch-13' into 'master'
...
Umezawa's Charm
See merge request core-developers/forge!1703
2019-05-24 03:45:38 +00:00
swordshine
dccb60c541
Merge branch 'patch-12' into 'master'
...
Feaster of Fools
See merge request core-developers/forge!1701
2019-05-24 03:45:32 +00:00
swordshine
112ba12e6d
Merge branch 'patch-11' into 'master'
...
Mother Bear
See merge request core-developers/forge!1700
2019-05-24 03:45:10 +00:00
swordshine
2e175c3adb
Merge branch 'patch-9' into 'master'
...
Bazaar Trademage
See merge request core-developers/forge!1698
2019-05-24 03:44:16 +00:00
Charles Baker
96fedcea5c
Umezawa's Charm
2019-05-24 02:59:30 +00:00
Agetian
2b04494256
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2019-05-24 05:45:24 +03:00
Charles Baker
dd7f3f008c
Feaster of Fools
2019-05-24 02:45:13 +00:00
Agetian
4c98b135be
- Fix Defined declaration on Liliana's Triumph (also takes care of the AI issues with it).
2019-05-24 05:44:00 +03:00
Charles Baker
fa711fb1e1
Mother Bear
2019-05-24 02:32:41 +00:00
swordshine
69be7a0f7a
Merge branch 'patch-10' into 'master'
...
Mox Tantalite
See merge request core-developers/forge!1699
2019-05-24 02:29:57 +00:00
Charles Baker
08706e17f4
Mox Tantalite
2019-05-24 02:25:10 +00:00
Charles Baker
4b0a80adaf
Bazaar Trademage
2019-05-24 02:24:06 +00:00
Charles Baker
619bf7bd02
Update collected_conjuring.txt
2019-05-24 02:17:36 +00:00
Charles Baker
e31856994f
Collected Conjuring
2019-05-24 02:03:47 +00:00
