Commit Graph

1816 Commits

Author SHA1 Message Date
Anthony Calosa
b0411423f6 use Executor, update MatchScreen 2024-11-23 13:22:41 +08:00
Anthony Calosa
78e587b32b handle exception 2024-11-22 19:13:15 +08:00
kevlahnota
f01d03e706 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-22 06:13:37 +08:00
tool4ever
5fa9f5b50e Fix Kentaro (#6600) 2024-11-21 16:58:13 +00:00
Anthony Calosa
dda5afe704 refactor ManaPool
move custom multimap implementation for floating mana since this only covers small section
2024-11-21 13:33:52 +08:00
Chris H
0bc4e5d7b9 Restore flatten and version for now 2024-11-20 20:48:21 -05:00
GitHub Actions
c95afd86d8 [maven-release-plugin] prepare for next development iteration 2024-11-20 20:48:21 -05:00
GitHub Actions
ac37ee1947 [maven-release-plugin] prepare release forge-2.0.00 2024-11-20 20:48:21 -05:00
Chris H
0553eb58ef Temporarily remove flatten to get a release out 2024-11-20 20:48:21 -05:00
Anthony Calosa
0854fbb947 update FCollection
Replace copyonwritearray to a custom implementation for concurrent modification exception. A little bit slower but supports iterator operations.
Added FCollectionTest
2024-11-19 22:32:37 +08:00
Anthony Calosa
619130b519 remove unused import 2024-11-17 08:07:07 +08:00
Anthony Calosa
5dc84a68c4 remove threadsafeIterable
The original purpose which is to create a copy of linkedlist to iterate to avoid concurrent modification, but we use copyonwritearray design and it is already thread safe and iteration while modification is handled internally.
2024-11-17 08:00:29 +08:00
kevlahnota
0247acbd49 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-16 18:52:12 +08:00
Anthony Calosa
95e3304948 add coloridversion check 2024-11-16 18:24:22 +08:00
kevlahnota
b5f96ab8e2 Merge branch 'master' into CrypticSpire 2024-11-16 17:14:51 +08:00
Anthony Calosa
f52b7abe61 create ConcurrentMultiMap, remove unused map 2024-11-15 20:24:20 +08:00
kevlahnota
d9c4c818b5 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-15 16:53:04 +08:00
kevlahnota
4b13e55d83 fix infinite notice for missing tokens 2024-11-15 16:26:05 +08:00
kevlahnota
fc85623343 better to use a linkedqueue 2024-11-15 11:51:26 +08:00
kevlahnota
8a1d25e4e9 fix failing test 2024-11-15 11:46:20 +08:00
kevlahnota
37eed29ad2 try this multimap for manapool 2024-11-15 11:08:17 +08:00
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