Michael Kamensky
|
2b8f5991f3
|
Merge branch 'master' into 'master'
Improve Maze's End AI.
See merge request core-developers/forge!2938
|
2020-06-29 19:47:57 +00:00 |
|
Zachary Kline
|
26a56ba764
|
Add announcement about the keyboard change.
|
2020-06-29 12:31:04 -07:00 |
|
Agetian
|
ad202355b2
|
- Improve Maze's End AI.
|
2020-06-29 22:18:05 +03:00 |
|
Michael Kamensky
|
9377bc5177
|
Merge branch 'master' into 'master'
Catch exceptions when disposing ImageCache textures, otherwise certain modes crash (e.g. Quest Draft Tournaments)
See merge request core-developers/forge!2936
|
2020-06-29 18:19:40 +00:00 |
|
Agetian
|
d1a63442c2
|
- Catch exceptions when disposing ImageCache textures, otherwise certain modes crash (e.g. Quest Draft Tournaments)
|
2020-06-29 21:12:34 +03:00 |
|
Michael Kamensky
|
5f7acbad2f
|
Merge branch 'm21translations' into 'master'
M21 Card Translations
See merge request core-developers/forge!2935
|
2020-06-29 18:01:51 +00:00 |
|
Michael Kamensky
|
779155e27a
|
Merge branch 'useControllersPhaseIndicator' into 'master'
Use the union of both players phase stops when Mindslavering an opponent
See merge request core-developers/forge!2931
|
2020-06-29 18:01:10 +00:00 |
|
Zachary Kline
|
19e6deae37
|
Merge remote-tracking branch 'upstream/master'
|
2020-06-29 10:36:27 -07:00 |
|
klaxnek
|
0710a8ff56
|
M21 cardnames translations
Fixed script (big json from Scryfall changed its url)
|
2020-06-29 19:26:58 +02:00 |
|
Michael Kamensky
|
97cfe3f2d6
|
Merge branch 'fix' into 'master'
eliminate.txt fix
See merge request core-developers/forge!2934
|
2020-06-29 16:57:21 +00:00 |
|
klaxnek
|
5949c4b4ef
|
Merge remote-tracking branch 'core-developers/master'
|
2020-06-29 18:48:38 +02:00 |
|
Northmoc
|
2d331843dd
|
eliminate.txt fix
|
2020-06-29 11:48:15 -04:00 |
|
swordshine
|
6da3c6dd4b
|
Merge branch 'companion2.0' into 'master'
Update companion rules to move to hand for 3 mana
See merge request core-developers/forge!2933
|
2020-06-29 09:58:39 +00:00 |
|
swordshine
|
13350eee68
|
Merge branch 'JMP.28' into 'master'
JMP - 28 June
See merge request core-developers/forge!2932
|
2020-06-29 09:58:21 +00:00 |
|
Tim Mocny
|
c7137d952a
|
JMP - 28 June
|
2020-06-29 09:58:20 +00:00 |
|
Blacksmith
|
7f6943bd4f
|
Clear out release files in preparation for next release
|
2020-06-29 02:52:55 +00:00 |
|
Blacksmith
|
91bc90f819
|
[maven-release-plugin] prepare for next development iteration
|
2020-06-29 02:47:45 +00:00 |
|
friarsol
|
3c171b2cbc
|
Update companion rules to move to hand for 3 mana
|
2020-06-28 22:47:44 -04:00 |
|
Blacksmith
|
4049d23562
|
[maven-release-plugin] prepare release forge-1.6.35
forge-1.6.35
|
2020-06-29 02:47:40 +00:00 |
|
Blacksmith
|
50e2cf1f88
|
Update README.txt for release
|
2020-06-29 02:44:57 +00:00 |
|
friarsol
|
ba1533e8e8
|
Use the union of both players phase stops when Mindslavering an opponent
|
2020-06-28 22:29:40 -04:00 |
|
swordshine
|
7f5a56fe4f
|
Merge branch 'migrate-m21' into 'master'
Migrate m21 cards
See merge request core-developers/forge!2929
|
2020-06-29 01:40:00 +00:00 |
|
friarsol
|
bf74bd2f09
|
Update announcements
|
2020-06-28 21:29:42 -04:00 |
|
Sol
|
8f20aa39ca
|
Merge branch 'm21' into 'master'
Updated deck legality
See merge request core-developers/forge!2925
|
2020-06-29 01:23:30 +00:00 |
|
friarsol
|
922c1fb541
|
Update block data for M21
|
2020-06-28 21:06:53 -04:00 |
|
friarsol
|
55973e8c75
|
Migrate new cards
|
2020-06-28 21:00:39 -04:00 |
|
swordshine
|
54e8c6f0ec
|
Merge branch 'patch' into 'master'
Add Ormos, Archive Keeper
See merge request core-developers/forge!2927
|
2020-06-29 01:00:15 +00:00 |
|
friarsol
|
0837e0de8c
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
|
2020-06-28 20:57:59 -04:00 |
|
swordshine
|
da6188e61c
|
Update es-ES
|
2020-06-29 08:54:14 +08:00 |
|
Zachary Kline
|
a5ad010381
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
|
2020-06-28 17:31:29 -07:00 |
|
Michael Kamensky
|
52fef4b724
|
Merge branch 'heartPiecerTrigger' into 'master'
ImmediateTrigger: use this trigger for heart-piercer manticore and get rid of CauseParam
See merge request core-developers/forge!2928
|
2020-06-28 16:20:09 +00:00 |
|
Hans Mackowiak
|
f29cd22926
|
ImmediateTrigger: use this trigger for heart-piercer manticore and get rid of CauseParam
|
2020-06-28 17:53:47 +02:00 |
|
swordshine
|
ab6a322f98
|
Fix a line in AiCostDecision
|
2020-06-28 22:35:32 +08:00 |
|
swordshine
|
e44125ec1c
|
Update zh-CN
|
2020-06-28 21:53:51 +08:00 |
|
swordshine
|
558fbd3946
|
Add Ormos, Archive Keeper
|
2020-06-28 20:40:56 +08:00 |
|
austinio7116
|
1051fc676b
|
Some Theros data added
(cherry picked from commit 0d48d99)
|
2020-06-28 13:05:41 +01:00 |
|
Zachary Kline
|
2a604e9d13
|
Make browsing the deck editor a little more keyboard friendly.
|
2020-06-28 03:46:49 -07:00 |
|
austinio7116
|
23737aa21a
|
Updated deck legality
(cherry picked from commit c2f19b0)
|
2020-06-28 10:12:34 +01:00 |
|
swordshine
|
47f527b3ff
|
Merge branch 'patch' into 'master'
Add Towering Titan
See merge request core-developers/forge!2924
|
2020-06-28 07:07:08 +00:00 |
|
swordshine
|
b06add33d2
|
Update the script
|
2020-06-28 14:44:17 +08:00 |
|
swordshine
|
24d2c8dc2f
|
Add Towering Titan
|
2020-06-28 14:06:42 +08:00 |
|
swordshine
|
2fb6849ae2
|
Merge branch 'patch' into 'master'
Add Inniaz, the Gale Force
See merge request core-developers/forge!2921
|
2020-06-28 01:44:50 +00:00 |
|
swordshine
|
f5de946830
|
Merge branch 'mill2' into 'master'
Remove Mill effect from non-mill cards
See merge request core-developers/forge!2908
|
2020-06-28 01:44:43 +00:00 |
|
Tim Mocny
|
39deffdc56
|
Remove Mill effect from non-mill cards
|
2020-06-28 01:44:43 +00:00 |
|
swordshine
|
85062cba83
|
Merge branch 'JMP.27' into 'master'
JMP - 27 June
See merge request core-developers/forge!2922
|
2020-06-28 01:36:00 +00:00 |
|
Tim Mocny
|
17392a29ab
|
JMP - 27 June
|
2020-06-28 01:35:59 +00:00 |
|
Zachary Kline
|
fffe75c133
|
Merge remote-tracking branch 'upstream/master'
|
2020-06-27 10:13:45 -07:00 |
|
swordshine
|
aa21883049
|
Add Inniaz, the Gale Force
|
2020-06-27 22:28:20 +08:00 |
|
Michael Kamensky
|
ca7691adee
|
Merge branch 'sanctumOfAll' into 'master'
M21: add Sanctum of All
Closes #1471
See merge request core-developers/forge!2920
|
2020-06-27 13:18:25 +00:00 |
|
Hans Mackowiak
|
51fdf21d1e
|
M21: add Sanctum of All
|
2020-06-27 14:53:01 +02:00 |
|