Commit Graph

51951 Commits

Author SHA1 Message Date
Michael Kamensky
b049c8c09b Merge branch 'narfi' into 'master'
Narfi round 2

See merge request core-developers/forge!5206
2021-08-10 16:09:07 +00:00
Michael Kamensky
80154de19d Merge branch 'update_skyshroud_ambush' into 'master'
Update Skyshroud Ambush implementation

See merge request core-developers/forge!5207
2021-08-10 16:08:53 +00:00
Alumi
8c1a1da2ee Update Skyshroud Ambush implementation 2021-08-10 16:08:52 +00:00
Northmoc
9c47e7fd36 support "Optional"/"OptionPrompt" in RepeatEachEffect 2021-08-09 19:04:50 -04:00
Northmoc
05fa2bb7be king_narfis_betrayal.txt v 2.0 2021-08-09 19:04:10 -04:00
Sol
eacda0596c Update toralf_god_of_fury_toralfs_hammer.txt 2021-08-09 15:18:37 +00:00
Anthony Calosa
97e69e70a7 Merge branch 'kevlahnota-master-patch-18734' into 'master'
Update VStack.java

See merge request core-developers/forge!5205
2021-08-09 11:48:00 +00:00
Anthony Calosa
4986b31a50 Update VStack.java 2021-08-09 11:47:08 +00:00
Hans Mackowiak
6ca9f1b195 fix CARDNAME enters the battlefield tapped description 2021-08-09 07:27:20 +02:00
Michael Kamensky
ab3a410026 Merge branch 'fix' into 'master'
Fix ArithmeticException

See merge request core-developers/forge!5204
2021-08-09 04:05:35 +00:00
tool4EvEr
9db88b6d62 Fix ArithmeticException 2021-08-08 23:01:53 +02:00
Michael Kamensky
723c38e7bd Merge branch 'reset' into 'master'
Clear manaPaid before Targeting

See merge request core-developers/forge!5203
2021-08-08 16:53:44 +00:00
Michael Kamensky
e3e201ddc0 Merge branch 'narfi' into 'master'
king_narfis_betrayal.txt tidy up Exile process

See merge request core-developers/forge!5199
2021-08-08 16:52:16 +00:00
Michael Kamensky
512b6e78d7 Merge branch 'master' into 'master'
fix translations

See merge request core-developers/forge!5201
2021-08-08 16:51:25 +00:00
Michael Kamensky
a36f935144 Merge branch 'charm' into 'master'
Fix missing Charm triggers

See merge request core-developers/forge!5202
2021-08-08 16:50:26 +00:00
Michael Kamensky
76e7bb9530 Merge branch 'blockfix' into 'master'
Fix onlyOneBlockerPerOpponent

See merge request core-developers/forge!5200
2021-08-08 16:48:24 +00:00
tool4EvEr
7afc17b514 Clean up 2021-08-08 17:09:58 +02:00
tool4EvEr
aae01f913e Fix chooser 2021-08-08 16:55:58 +02:00
tool4EvEr
daf2075075 Fix missing Charm triggers 2021-08-08 15:44:49 +02:00
tool4EvEr
3bdbb5bfbf Clear manaPaid before Targeting 2021-08-08 15:09:51 +02:00
CCTV-1
e77c869ae7 fix translate key:'lblNetArchivePauperDecks' missspell. 2021-08-08 20:50:15 +08:00
tool4EvEr
e5f53febf8 Fix onlyOneBlockerPerOpponent 2021-08-08 14:42:43 +02:00
Northmoc
64cbeec265 king_narfis_betrayal.txt tidy up Exile process 2021-08-08 08:35:42 -04:00
Michael Kamensky
0b08b15617 Merge branch 'ambush' into 'master'
J21: Skyshroud Ambush

See merge request core-developers/forge!5191
2021-08-08 02:10:22 +00:00
Michael Kamensky
2987ebd974 Merge branch 'changeszoneLKI' into 'master'
support a tag for use of LKI with any ChangesZone triggers with any Origin/Destination

See merge request core-developers/forge!5198
2021-08-08 02:08:43 +00:00
Michael Kamensky
6e90ccf579 Merge branch 'maylook' into 'master'
Fix looking at cards too early

See merge request core-developers/forge!5189
2021-08-08 02:07:43 +00:00
Michael Kamensky
007a0b9797 Merge branch 'deathtouchFix' into 'master'
GameAction: fix deathtouch with wither

See merge request core-developers/forge!5197
2021-08-08 02:07:01 +00:00
Northmoc
efbca3ac49 support a tag for use of LKI with any ChangesZone triggers with any Origin/Destination 2021-08-07 16:40:28 -04:00
tool4EvEr
8f62c5f8f0 Clean up 2021-08-07 21:11:22 +02:00
Hans Mackowiak
15d28ed5ce GameAction: fix deathtouch with wither 2021-08-07 19:16:33 +02:00
Michael Kamensky
88a94fb137 Merge branch 'historic' into 'master'
Update Historic format

See merge request core-developers/forge!5195
2021-08-07 15:14:44 +00:00
tool4EvEr
32cdb0b0f2 Clean up 2021-08-07 16:30:27 +02:00
tool4EvEr
f78c3ba441 Fix drawn card being revealed during ability resolve 2021-08-07 16:30:26 +02:00
tool4EvEr
058ad2b1dd Clean up 2021-08-07 16:30:25 +02:00
tool4EvEr
d805393514 Remove useless SVar 2021-08-07 16:30:24 +02:00
tool4EvEr
d5fd5e5077 Fix MayLook revealing new library top before cast finishes 2021-08-07 16:30:23 +02:00
paul_snoops
351e23818c Update Historic format 2021-08-07 12:20:59 +01:00
paul_snoops
e392e8e213 Merge remote-tracking branch 'origin/master' 2021-08-07 11:08:42 +01:00
Bug Hunter
4a850c8808 Merge branch 'card_fix' into 'master'
fix planar_ally.txt

See merge request core-developers/forge!5194
2021-08-07 06:51:46 +00:00
CCTV-1
c09cf436f1 fix trigger description. 2021-08-07 12:47:46 +08:00
Michael Kamensky
21d0614e62 Merge branch 'mid_edition' into 'master'
Add Innistrad: Midnight Hunt edition file and cards

See merge request core-developers/forge!5185
2021-08-07 04:12:06 +00:00
Michael Kamensky
6687ad0b76 Merge branch 'eldrainequest' into 'master'
Eldraine Quest World! – by Xyx

See merge request core-developers/forge!5186
2021-08-07 04:11:41 +00:00
Michael Kamensky
a4af507992 Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.44.001

See merge request core-developers/forge!5193
2021-08-07 03:43:08 +00:00
Michael Kamensky
1ef490bf5e - Preparing Forge for Android publish 1.6.44.001 [incremental]. 2021-08-07 06:42:00 +03:00
Michael Kamensky
1a7845117b [maven-release-plugin] prepare for next development iteration 2021-08-07 06:30:54 +03:00
Michael Kamensky
5c768baf64 [maven-release-plugin] prepare release forge-1.6.44 forge-1.6.44 2021-08-07 06:30:45 +03:00
Michael Kamensky
789ed51ca6 Merge branch 'command' into 'master'
Resolve "Word of Command: crash when trying to play card outside of timing restriction (e. g. Chaotic Strike)"

Closes #1857

See merge request core-developers/forge!5190
2021-08-07 03:20:56 +00:00
Michael Kamensky
307c8e5dd1 Merge branch 'prey' into 'master'
prey_upon.txt cleanup descs

See merge request core-developers/forge!5192
2021-08-07 03:20:36 +00:00
Northmoc
4d4c427ca9 prey_upon.txt cleanup descs 2021-08-06 20:47:01 -04:00
Northmoc
8ea2cae285 Support "winning" Fights 2021-08-06 19:52:52 -04:00