Jetz
4bbc165460
Guava migration - Use .toList()
2024-11-08 19:33:45 -05:00
Jetz
c9ba926f45
Guava migration - Replace .negate() with Predicate.not(...) in compound predicates.
2024-11-08 19:21:25 -05:00
Jetz
d6c8e9a692
Merge remote-tracking branch 'origin/master' into code-cleanup
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/ability/ChooseCardAi.java
# forge-ai/src/main/java/forge/ai/ability/ScryAi.java
# forge-core/src/main/java/forge/card/DeckHints.java
# forge-core/src/main/java/forge/util/TextUtil.java
# forge-gui-mobile/src/forge/itemmanager/ItemManager.java
# forge-gui/src/main/java/forge/download/AutoUpdater.java
# forge-gui/src/main/java/forge/player/HumanCostDecision.java
2024-11-08 18:37:02 -05:00
Anthony Calosa
95ca1673b8
update ImageView
...
show NoSell overlay
2024-11-07 10:34:34 +08:00
tool4ever
3e49ec6c88
Fix unattach logic ( #6522 )
2024-11-03 09:14:17 +00:00
Anthony Calosa
7f16956942
increase allowance for update
2024-11-01 08:57:49 +08:00
Anthony Calosa
00a401de0e
try to fix keyboardinput
2024-10-31 06:51:08 +08:00
Anthony Calosa
a2419137e1
fix timestamp differences on build.txt
2024-10-30 00:57:56 +08:00
tool4ever
de4b35cc1d
King of the Oathbreakers should trigger for Changeling (Discord post) ( #6453 )
...
* Fix NPE with Street Spasm
2024-10-29 12:02:32 +00:00
Anthony Calosa
b3c867e326
prevent NPE
2024-10-29 14:41:25 +08:00
Anthony Calosa
420f6964ff
update desktop timestamp check
2024-10-28 10:51:17 +08:00
Anthony Calosa
6d77e0cff4
check snapshot update by timestamp
2024-10-27 23:49:14 +08:00
Anthony Calosa
5d1e780beb
prevent crash audit
2024-10-26 06:31:36 +08:00
Anthony Calosa
e9aed24c8b
update rssreader dependency
2024-10-25 18:18:07 +08:00
Anthony Calosa
6334c9f922
update AtomReader, add support releaseTag on android
2024-10-25 18:03:46 +08:00
Anthony Calosa
9897c85559
use release tag for downloading latest github releases...
2024-10-25 17:24:48 +08:00
Anthony Calosa
8c085bbd33
add mobile updater, update gdx natives
2024-10-25 11:41:06 +08:00
Anthony Calosa
bf3111ba03
update TextUtil
2024-10-24 18:26:56 +08:00
Anthony Calosa
7a976291ba
add desktop RSSReader, update autoupdater
2024-10-24 18:12:04 +08:00
CollinJ
a02a0a25fc
Merge branch 'master' into master
2024-10-22 10:12:12 -07:00
tool4ever
031cd4176d
Fix logic for Henzie ( #6402 )
2024-10-22 10:14:43 +02:00
CollinJ
94c75f1e71
Merge branch 'master' into master
2024-10-20 22:05:24 -07:00
Collin
5de234aacb
Fix the SpellSmith missing some cards.
...
The main issues is that getAllCards returns a card list that is unique
by name. That menas each card only has a single rarity. In this case,
cards like "Forbidden Orchard" and "Choke" de-deuplicate to a version of
the card with 'S' rarity. This means that when filtering by rarity, the
'S' rarity will be filtered out.
Another similar issue is that when a card exists in multiple sets with
different rarities, you might filter to a set in which the card is 'R',
but the de-duped version in allCards has rarity 'U', so using the cardDB
to check the rarity to filter on doesn't work.
When filtering by a specific set, the solution is to use the rarity of
the card in that set.
When not filtering by a set but filtering by rarity, we have to address
the root cause of the de-duping.
WHen de-duping, I changed the logic to ignore 'S' rarities. This fixes
the rarity filter when not filtering by an edition (although if there
are multiple rarities you still have to kind of guess).
This has the side-effect of making the card image used something more
legible. Before 'Choke' de-duped to the MPS_AHK set which has illegible
text. By ignoring 'S' rarities, it not de-dups to 8ED.
More work could probably be done to improve de-duping, but perfect
correctness would probably involve de-duping only after filtering, which
is likely too slow.
2024-10-20 12:29:11 -07:00
Jetz
c5be6f1b17
Merge branch 'master' into code-cleanup
...
# Conflicts:
# forge-game/src/main/java/forge/game/GameEntityCounterTable.java
# forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
# forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
2024-10-20 09:33:41 -04:00
Jetz
64609b0867
Add some helper methods to StreamUtil;
...
Rewrite `generateParticipants`
2024-10-20 09:26:36 -04:00
Anthony Calosa
426e63598f
Merge branch 'master' into master2
2024-10-20 18:38:41 +08:00
tool4ever
98c0959d8f
Fix Embodiment of Agonies counting Asmoranomardicadaistinaculdacar ( #6388 )
2024-10-20 10:02:48 +00:00
Jetz
6b93e628ac
Merge branch 'master' into code-cleanup
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/ComputerUtil.java
# forge-core/src/main/java/forge/card/DeckHints.java
# forge-game/src/main/java/forge/game/ability/AbilityFactory.java
# forge-game/src/main/java/forge/game/cost/CostUntapType.java
# forge-gui/src/main/java/forge/player/HumanCostDecision.java
2024-10-14 22:36:07 -04:00
Jetz
31547c6bbb
Merge branch 'master' into code-cleanup
...
# Conflicts:
# forge-game/src/main/java/forge/game/phase/PhaseHandler.java
2024-10-14 22:20:44 -04:00
GitHub Actions
d366bf8ffc
[maven-release-plugin] prepare for next development iteration
2024-10-14 21:53:45 -04:00
GitHub Actions
fa538bd5c9
[maven-release-plugin] prepare release forge-1.6.65
2024-10-14 21:53:45 -04:00
Anthony Calosa
4af8061824
Merge branch 'master' into master2
2024-10-14 20:46:23 +08:00
tool4ever
0df84b91f2
Support recursive check for tokens that create others ( #6315 )
2024-10-14 06:33:41 +00:00
Anthony Calosa
1da3e298e1
Merge branch 'master' into master2
2024-10-10 19:34:39 +08:00
TwentyToedToad
96d065189b
Add Demonic Covenant and supporting changes ( #6257 )
...
* Add Demonic Covenant and supporting changes
* Updated changes
* Update demonic_covenant.txt
* Addressing PR comments
---------
Co-authored-by: loperjchris <christopher.loper1990@gmail.com >
2024-10-10 10:13:19 +03:00
Anthony Calosa
644fa46681
Merge branch 'master' into master2
2024-10-09 16:44:29 +08:00
Anthony Calosa
708fed3350
update and unified version code property
2024-10-09 12:32:09 +08:00
Jetz72
48adeb357d
Show chosen mana for mana abilities as symbols ( #6256 )
...
* Support for icons in dialogs.
Mana abilities show chosen mana via icons.
Thread safety for showOptionDialog
* Ensure EventDispatchThread for showInputDialog
---------
Co-authored-by: Jetz <Jetz722@gmail.com >
2024-10-08 22:17:18 +03:00
Anthony Calosa
eada2c6d4f
Merge branch 'master' into master2
2024-10-07 06:06:05 +08:00
Hans Mackowiak
80b30d9a6a
Room: First Spell Part ( #6044 )
...
* Room: First Spell
----
Co-authored-by: tool4ever <therealtoolkit@hotmail.com >
Co-authored-by: tool4EvEr <tool4EvEr@192.168 .0.59>
Co-authored-by: TRT <>
Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com >
2024-10-06 20:11:28 +02:00
Jetz
2e769ac279
Bug fix in RandomReservoir accumulator
2024-09-29 11:03:12 -04:00
Jetz
871947a540
Guava migration - Optimize imports
2024-09-26 09:59:26 -04:00
Jetz
6a04fcd500
Guava migration - Remove migration scaffold
2024-09-26 09:36:50 -04:00
Anthony Calosa
56400d4444
JAVA17 Update
2024-09-26 11:52:42 +08:00
Jetz
0278f5817b
Guava migration - Create IterableUtil to house iterable helper methods dependent on Java predicates
2024-09-25 09:26:41 -04:00
Jetz
f636910ebb
Guava migration - Rename StreamUtils -> StreamUtil for consistency
2024-09-25 09:01:46 -04:00
Jetz
1395baa2ff
Guava migration - Fix build error
2024-09-25 08:59:21 -04:00
Jetz
d01c4e056b
Guava migration - Remove unused imports
2024-09-25 08:48:28 -04:00
Jetz
52112e671c
Guava migration - Slight cleanup
2024-09-25 08:46:07 -04:00
Jetz
a57bab1dac
Guava migration - Remove single use Predicate implementations
...
Remove unused parameters of other predicates
2024-09-24 09:33:23 -04:00
