Michael Kamensky
e0165ef99d
Merge branch 'effect' into 'master'
...
move updateStateForView after moveTo Command Zone
See merge request core-developers/forge!5148
2021-07-31 15:04:00 +00:00
Northmoc
5c2b16f35e
move updateStateForView after moveTo Command Zone
2021-07-31 08:12:39 -04:00
Michael Kamensky
ddb4bce2cc
Merge branch 'classcast' into 'master'
...
Fix ClassCastException
See merge request core-developers/forge!5145
2021-07-31 09:34:54 +00:00
tool4EvEr
d46a529c74
Fix ClassCastException
2021-07-31 09:59:19 +02:00
Bug Hunter
d8b376e8b1
Merge branch 'TRT-master-patch-25340' into 'master'
...
Update forge-gui/res/cardsfolder/b/battlefield_scavenger.txt
See merge request core-developers/forge!5144
2021-07-31 07:30:36 +00:00
Bug Hunter
34c98119b3
Update forge-gui/res/cardsfolder/b/battlefield_scavenger.txt
2021-07-31 07:29:51 +00:00
Michael Kamensky
1601afdfc0
Merge branch 'costs' into 'master'
...
Fix CostSacrifice paying from Effect
See merge request core-developers/forge!5138
2021-07-31 04:47:24 +00:00
Bug Hunter
a9f5ab8772
Fix CostSacrifice paying from Effect
2021-07-31 04:47:23 +00:00
Michael Kamensky
74038eefb5
Merge branch 'fixnpe' into 'master'
...
Fix NPE
See merge request core-developers/forge!5141
2021-07-31 04:47:09 +00:00
Michael Kamensky
04174c2cea
Merge branch 'twosat-master-patch-00612' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!5142
2021-07-31 04:46:47 +00:00
Michael Kamensky
fda99c3006
Merge branch 'fix_unknown_token' into 'master'
...
Fix crash when create token with unknown edition
See merge request core-developers/forge!5143
2021-07-31 04:46:39 +00:00
Lyu Zong-Hong
ac516168e4
Fix crash when create token with unknown edition
2021-07-31 13:44:38 +09:00
Sol
71070e66cd
Update birgi_god_of_storytelling_harnfel_horn_of_bounty.txt
2021-07-31 02:31:31 +00:00
Andreas Bendel
d0d220330b
Update de-DE.properties
...
translated new rendering options
2021-07-30 22:02:18 +00:00
tool4EvEr
a2f1b258a3
Small AI fix
2021-07-30 22:24:51 +02:00
tool4EvEr
39bf803a92
Clean up
2021-07-30 21:39:44 +02:00
Northmoc
4fecc76394
fix vengeful_ancestor.txt second trigger
2021-07-30 15:39:19 -04:00
tool4EvEr
3445c65eb5
Fix NPE
2021-07-30 20:42:38 +02:00
Michael Kamensky
33377abc9f
Merge branch 'managorger' into 'master'
...
J21: Managorger Phoenix and support
See merge request core-developers/forge!5140
2021-07-30 17:01:05 +00:00
Michael Kamensky
90fc581d9c
Merge branch 'jhh_29' into 'master'
...
J21 version of Momir and Momir tweak
See merge request core-developers/forge!5139
2021-07-30 17:01:02 +00:00
Northmoc
46efa00f36
add Count$TriggeredManaCostDevotion.<Color>
2021-07-30 11:10:42 -04:00
Northmoc
5ad8efe535
managorger_phoenix.txt
2021-07-30 11:09:01 -04:00
Northmoc
86ed6c7059
momir_vig_simic_visionary_avatar.txt remove unneeded
2021-07-30 11:08:08 -04:00
Michael Kamensky
b17875b5fd
Merge branch 'phase' into 'master'
...
Fix failing triggers when removed from combat
See merge request core-developers/forge!5106
2021-07-30 04:24:51 +00:00
Bug Hunter
358c6986e0
Fix failing triggers when removed from combat
2021-07-30 04:24:48 +00:00
Michael Kamensky
e8113dc203
Merge branch 'costs' into 'master'
...
Some cost fixes
See merge request core-developers/forge!5135
2021-07-30 04:24:45 +00:00
Michael Kamensky
7dd18e9a7b
Merge branch 'fixes' into 'master'
...
Couple small fixes
See merge request core-developers/forge!5137
2021-07-30 04:23:40 +00:00
Michael Kamensky
ce70015d08
Merge branch 'aifix' into 'master'
...
AI fixes
See merge request core-developers/forge!5132
2021-07-30 04:23:12 +00:00
Northmoc
b2fca7c27f
pool_of_vigorous_growth.txt
2021-07-29 22:22:34 -04:00
tool4EvEr
048dd90003
Fix costs
2021-07-29 22:47:15 +02:00
tool4EvEr
39c7c18386
Fix Standstill
2021-07-29 22:01:47 +02:00
tool4EvEr
4980bb235c
Fix Strive check
2021-07-29 20:59:18 +02:00
tool4EvEr
024db5c198
Clean up
2021-07-29 20:59:17 +02:00
tool4EvEr
9148ca3806
AI fixes
2021-07-29 20:59:16 +02:00
tool4EvEr
7d4e9667c0
Turn into cost
2021-07-29 19:06:25 +02:00
tool4EvEr
9bd67d1a17
Support UnlessCost for random Discard
2021-07-29 18:41:37 +02:00
Michael Kamensky
788b34194a
Merge branch 'card_text_rendering_preferences' into 'master'
...
Add preferences for card text rendering
See merge request core-developers/forge!5134
2021-07-29 16:30:51 +00:00
Lyu Zong-Hong
3b690d8c2a
Move label position
2021-07-29 22:19:38 +09:00
Lyu Zong-Hong
72e734faba
Add preferences for card text rendering
2021-07-29 21:47:09 +09:00
leriomaggio
857cf20466
Aligned implementations to add card to pool from cardrequest
...
Implementation aligned with method getting in cardName, setcode and artIndex.
2021-07-29 13:30:17 +01:00
Michael Kamensky
69a65da77c
Merge branch 'fix_phyrexian_mana' into 'master'
...
Fix crash when rendering Phyrexian mana symbols in card text and fix issues for Level up cards
See merge request core-developers/forge!5133
2021-07-29 11:45:34 +00:00
leriomaggio
5cc9ddb041
Accounting for any null in CardEdition - for those cards not having one.
2021-07-29 12:18:44 +01:00
leriomaggio
a9f64a52e0
Updating DeckProxy wit the new method on CardEdition.Collection used to determine the edition of a Deck
...
The edition (set) of a Deck corresponds to the LATEST edition found among the cards in the DECK, considering their ORIGINAL editions.
2021-07-29 12:17:56 +01:00
leriomaggio
e09826a1f0
Improved verification on CardEdition not null for a card (also on date)
...
When this happens, no card update will be issued!
2021-07-29 12:16:19 +01:00
leriomaggio
556894296f
Adding controls on ProgressBar that might avoid sudden NPE with downloading net decks.
...
I am still not sure how to reproduce the issue, but I do sometimes get a NPE on progress bar (directly raised by Java Swing, tbh) when downloading certain net decks.
I have the feeling there might be some sort of concurrency issue//race condition so just in case, any update to the progress bar is now surrounded by a check that's not null.
2021-07-29 12:14:55 +01:00
leriomaggio
e382fd31ef
FIXED collector numbers for lands in Master25
2021-07-29 12:12:30 +01:00
Lyu Zong-Hong
c936b9fed9
Fix some issues when rendering Level up cards
2021-07-29 17:36:16 +09:00
leriomaggio
247fbc57f1
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-07-29 08:00:28 +01:00
Lyu Zong-Hong
35749300ce
Fix crash when rendering Phyrexian mana symbols in card text
2021-07-29 15:59:37 +09:00
Michael Kamensky
43cf318007
Merge branch 'perpetual' into 'master'
...
Jumpstart Historic Horizons – some cards with "perpetual" mechanic
See merge request core-developers/forge!5129
2021-07-29 05:15:15 +00:00
