Anthony Calosa
e2c37d11e7
AI Attack Timeout
2024-11-14 19:11:25 +08:00
Anthony Calosa
58e4b7e2df
Merge remote-tracking branch 'origin/CrypticSpire' into CrypticSpire
2024-11-14 10:31:11 +08:00
Anthony Calosa
b161502595
update setting colorID
2024-11-14 10:30:33 +08:00
kevlahnota
65c74b2009
Merge branch 'master' into CrypticSpire
2024-11-14 09:05:37 +08:00
Anthony Calosa
8d9dabf7d7
remove uncommited changes
2024-11-14 06:06:26 +08:00
Anthony Calosa
60cfd97162
remove unused imports
2024-11-14 06:02:38 +08:00
Anthony Calosa
71ecf91bb5
from list to set
2024-11-14 06:00:02 +08:00
Anthony Calosa
85913a3d6c
load from deck
2024-11-13 23:42:08 +08:00
Jetz
c347ff5810
Merge remote-tracking branch 'origin/master' into code-cleanup
...
# Conflicts:
# forge-core/src/main/java/forge/StaticData.java
2024-11-13 09:20:00 -05:00
Jetz
d81c5a40cf
Revert .toList() for Android compatibility
2024-11-13 09:17:33 -05:00
Anthony Calosa
88613c555a
refactor some vars, and save to deck file
...
todo validate
2024-11-13 22:13:18 +08:00
Anthony Calosa
5afaff814a
update deck editor for spire
2024-11-13 10:29:18 +08:00
kevlahnota
82555babd8
Update StaticData.java
...
remove concurrency for token audit
2024-11-12 22:48:15 +08:00
kevlahnota
d7fd20ec5f
add note
2024-11-11 23:49:26 +08:00
Anthony Calosa
71480e63df
Support older Android
...
- missing toList from stream
2024-11-11 23:36:54 +08:00
Anthony Calosa
cb2ddf39f8
update auditer
2024-11-11 17:00:04 +08:00
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
