Hans Mackowiak
|
1c9cfbc4bb
|
Merge branch 'card-fixes' into 'master'
Fix Zurzoth, Akiri
See merge request core-developers/forge!4519
|
2021-04-16 07:15:29 +00:00 |
|
Adam Pantel
|
65093b0388
|
Fix Zurzoth, Akiri
|
2021-04-16 07:15:29 +00:00 |
|
Michael Kamensky
|
59f414f707
|
Merge branch 'fixmp' into 'master'
Fix Multiplayer LTB triggers
Closes #1324
See merge request core-developers/forge!4511
|
2021-04-16 04:59:35 +00:00 |
|
Michael Kamensky
|
2a2c12cf77
|
Merge branch 'titan' into 'master'
ChangeZoneTable for Triplicate Titan
See merge request core-developers/forge!4522
|
2021-04-16 04:58:41 +00:00 |
|
Michael Kamensky
|
5fd34dc967
|
Merge branch 'twosat-master-patch-34511' into 'master'
Update de-DE.properties
See merge request core-developers/forge!4523
|
2021-04-16 04:58:26 +00:00 |
|
Michael Kamensky
|
65df6765da
|
Merge branch 'shamans_trance' into 'master'
Add Shaman's Trance
See merge request core-developers/forge!4526
|
2021-04-16 04:56:57 +00:00 |
|
Lyu Zong-Hong
|
a1f69f0732
|
Add Shaman's Trance
|
2021-04-16 08:22:37 +09:00 |
|
Andreas Bendel
|
8174b883a0
|
Update de-DE.properties
added line and translation lblRandomHistoricArchetypeDecks
translated lblInvalidTargetSpecification
|
2021-04-15 19:38:32 +00:00 |
|
tool4EvEr
|
337065271e
|
ChangeZoneTable for Triplicate Titan
|
2021-04-15 21:27:31 +02:00 |
|
Anthony Calosa
|
f3ee08ab9a
|
Merge branch 'master' into 'master'
add tokenscript
Closes #1803
See merge request core-developers/forge!4521
|
2021-04-15 19:09:34 +00:00 |
|
Anthony Calosa
|
ba08c09607
|
fix triplicate titan
|
2021-04-15 19:09:29 +00:00 |
|
tool4EvEr
|
237b0324c1
|
Clean up
|
2021-04-15 20:26:28 +02:00 |
|
tool4EvEr
|
5aaf39f40b
|
LTB triggers for opponents
|
2021-04-15 20:20:52 +02:00 |
|
austinio7116
|
7a4ed29945
|
Merge branch 'historicsanctionfix' into 'master'
Historic GA fix
See merge request core-developers/forge!4520
|
2021-04-15 17:59:59 +00:00 |
|
austinio7116
|
84014ce9b5
|
Historic GA fix
|
2021-04-15 18:56:25 +01:00 |
|
austinio7116
|
08c8e84d72
|
Merge branch 'ldabuildonly2' into 'master'
LDA module build fixes
See merge request core-developers/forge!4476
|
2021-04-15 16:55:40 +00:00 |
|
tool4EvEr
|
43171879a0
|
Fix logic
|
2021-04-15 18:54:58 +02:00 |
|
tool4EvEr
|
2f7a30f920
|
Fix Multiplayer LTB triggers
|
2021-04-15 18:54:57 +02:00 |
|
Anthony Calosa
|
27a93b318d
|
Merge branch 'master' into 'master'
update zip decompression
Closes #1802
See merge request core-developers/forge!4518
|
2021-04-15 15:27:08 +00:00 |
|
Anthony Calosa
|
816bb2008a
|
update zip decompression
closes #1802
|
2021-04-15 23:18:40 +08:00 |
|
Anthony Calosa
|
8eb430dffd
|
Merge branch 'kevlahnota-master-patch-49827' into 'master'
Update CardArchetypeLDAGenerator.java
See merge request core-developers/forge!4517
|
2021-04-15 10:08:11 +00:00 |
|
Anthony Calosa
|
641b5af8eb
|
Update CardArchetypeLDAGenerator.java
|
2021-04-15 10:06:33 +00:00 |
|
Anthony Calosa
|
38ef1e4ed9
|
Merge branch 'revert-ed5f5d3c' into 'master'
Revert "Update LDAModelGenetrator.java"
See merge request core-developers/forge!4516
|
2021-04-15 09:48:01 +00:00 |
|
Anthony Calosa
|
123c41b4e3
|
Revert "Update LDAModelGenetrator.java"
This reverts commit ed5f5d3c6b
|
2021-04-15 09:47:31 +00:00 |
|
Anthony Calosa
|
7001f17c88
|
Merge branch 'master' into 'master'
update simplified chinese translation
See merge request core-developers/forge!4514
|
2021-04-15 09:42:53 +00:00 |
|
Anthony Calosa
|
1f10191bc7
|
Merge branch 'kevlahnota-master-patch-10151' into 'master'
Update LDAModelGenetrator.java
See merge request core-developers/forge!4515
|
2021-04-15 09:42:23 +00:00 |
|
Anthony Calosa
|
ed5f5d3c6b
|
Update LDAModelGenetrator.java
|
2021-04-15 09:42:04 +00:00 |
|
CCTV-1
|
a03bb7a353
|
translate new string.
|
2021-04-15 16:49:58 +08:00 |
|
Michael Kamensky
|
22ffcf5660
|
Merge branch 'historicLDA' into 'master'
Historic Archetype Random Deck Generation
See merge request core-developers/forge!4488
|
2021-04-15 06:30:19 +00:00 |
|
Michael Kamensky
|
f40ea6cc8d
|
Merge branch 'rainbow' into 'master'
Fix DelayedTriggers running when card owner left game
See merge request core-developers/forge!4512
|
2021-04-15 06:30:05 +00:00 |
|
Hans Mackowiak
|
adfcb2b4bf
|
Merge branch 'facedownYedoraMutate' into 'master'
Card: changed some logic with facedown and copy states
See merge request core-developers/forge!4506
|
2021-04-15 05:59:29 +00:00 |
|
Hans Mackowiak
|
8d42be3bac
|
Card: changed some logic with facedown and copy states
|
2021-04-15 05:59:28 +00:00 |
|
tool4EvEr
|
e2036a5203
|
Clean delayedTriggers from player who lost
|
2021-04-14 22:58:08 +02:00 |
|
tool4EvEr
|
7107f05adb
|
Fix DelayedTriggers running when card owner left game
|
2021-04-14 22:12:14 +02:00 |
|
austinio7116
|
529fc42b72
|
Merge branch 'coremaster' into historicLDA
# Conflicts:
# forge-gui/res/formats/Sanctioned/Historic.txt
|
2021-04-14 19:09:01 +01:00 |
|
Michael Kamensky
|
7808605a8c
|
Merge branch 'fix' into 'master'
Some fixes
See merge request core-developers/forge!4508
|
2021-04-14 18:08:07 +00:00 |
|
Michael Kamensky
|
0930013cc2
|
Merge branch 'card-fixes' into 'master'
Adrix and Nev only applies to you.
See merge request core-developers/forge!4509
|
2021-04-14 18:07:58 +00:00 |
|
Michael Kamensky
|
51054b70d6
|
Merge branch 'codie' into 'master'
[C21] Codie tweaks
See merge request core-developers/forge!4507
|
2021-04-14 18:07:20 +00:00 |
|
Michael Kamensky
|
471fb621e5
|
Merge branch 'flagbearer' into 'master'
Add Flagbearer
See merge request core-developers/forge!4495
|
2021-04-14 18:06:56 +00:00 |
|
Alumi
|
1e0c3e7621
|
Check if chosen targets meets MustTarget requirements in setupTargets() too. (For spell that has multiple targeting SAs)
|
2021-04-14 18:06:55 +00:00 |
|
Northmoc
|
a75d312770
|
oversimplify.txt - RememberLKI needed
|
2021-04-14 13:21:52 -04:00 |
|
austinio7116
|
0fd2ec58be
|
Merge remote-tracking branch 'Core/master' into coremaster
|
2021-04-14 18:13:19 +01:00 |
|
Northmoc
|
be484a8077
|
fix oversimplify.txt
|
2021-04-14 13:07:06 -04:00 |
|
Adam Pantel
|
3d8388ad92
|
Adrix and Nev only applies to you.
|
2021-04-14 12:52:00 -04:00 |
|
Northmoc
|
7a5eac3621
|
support "an opponent" choosing for multiplayer (and add AI hint)
|
2021-04-14 12:19:31 -04:00 |
|
Hans Mackowiak
|
ce34e937d6
|
CostExile: fixed exile cost with mana value X
|
2021-04-14 17:48:42 +02:00 |
|
Northmoc
|
c8646208f0
|
codie_vociferous_codex.txt add AI hints
|
2021-04-14 11:39:20 -04:00 |
|
Northmoc
|
3ed83e4f59
|
codie_vociferous_codex.txt - add ThisTurn$ to delayed trigger - add MayPlay Effect
|
2021-04-14 11:33:20 -04:00 |
|
Northmoc
|
ebe6a12555
|
allow no reordering on zones other than library
|
2021-04-14 11:28:59 -04:00 |
|
Northmoc
|
1727456487
|
digsite_engineer.txt DB -> AB
|
2021-04-14 10:37:29 -04:00 |
|