Commit Graph

4652 Commits

Author SHA1 Message Date
Anthony Calosa
78e587b32b handle exception 2024-11-22 19:13:15 +08:00
kevlahnota
8486dbbd02 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-22 16:08:21 +08:00
Anthony Calosa
66045c0c0a .. 2024-11-22 15:45:44 +08:00
kevlahnota
f918ae5978 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-22 12:46:13 +08:00
kevlahnota
6f59c0d2ce prevent NPE 2024-11-22 05:58:49 +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
kevlahnota
39fc1415aa Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-19 05:49:27 +08:00
kevlahnota
cbe48d0892 Update VPlayerPanel.java
should display error for null icons on VPlayerPanel Infotab. If pointer is still null then the icon seems to be disposed (probably on android) or just deliberately missing.
2024-11-18 15:09:10 +08:00
Anthony Calosa
f48cf951db .. 2024-11-18 11:23:00 +08:00
kevlahnota
f5e024bf63 Update ItemManager.java
it seems this is controlled via preference and would fail the logic for the view index
2024-11-18 06:11:42 +08:00
kevlahnota
b8a2903617 NPE prevention
- closes #6588
2024-11-18 05:11:48 +08:00
Hans Mackowiak
73940c584e ColorSet: use Stream to map ManaSymbol 2024-11-17 10:48:27 +01:00
kevlahnota
c9e733ecbd Update ImageView.java
isempty missing in streambuffer on android
2024-11-17 14:26:08 +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
54266e8914 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-16 20:27:05 +08:00
Anthony Calosa
f46e22cc54 minor cleanup 2024-11-16 20:13:17 +08:00
kevlahnota
cb645670d4 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-16 19:50:55 +08:00
Anthony Calosa
5597d0bf31 fix arrows drawing out of bounds 2024-11-16 19:50:09 +08:00
kevlahnota
0247acbd49 Merge branch 'master' into AI_ATTACK_TIMEOUT 2024-11-16 18:52:12 +08:00
kevlahnota
b5f96ab8e2 Merge branch 'master' into CrypticSpire 2024-11-16 17:14:51 +08:00
Anthony Calosa
8dbb648638 add user setting for AI Timeout 2024-11-14 22:06:23 +08:00
kevlahnota
88ca1d509f Update VAssignGenericAmount.java
support double tapping the mana symbols for max amount
2024-11-14 15:28:43 +08:00
Anthony Calosa
b161502595 update setting colorID 2024-11-14 10:30:33 +08:00
Anthony Calosa
71ecf91bb5 from list to set 2024-11-14 06:00:02 +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
e879abca85 Merge remote-tracking branch 'origin/master' into code-cleanup 2024-11-13 09:17:45 -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
4012469910 refactor var name 2024-11-13 19:12:34 +08:00
Anthony Calosa
8fd521b949 update desktop editor 2024-11-13 13:43:47 +08:00
Anthony Calosa
31abd61a3f fix render for ImageView 2024-11-13 11:10:27 +08:00
Anthony Calosa
5afaff814a update deck editor for spire 2024-11-13 10:29:18 +08:00
Anthony Calosa
cb2ddf39f8 update auditer 2024-11-11 17:00:04 +08:00
Anthony Calosa
b130f45fe1 update watermark
- show watermark on catalogpage only
2024-11-09 10:17:40 +08:00
Jetz
2b5fc37232 Remove unused imports 2024-11-08 20:02:02 -05:00
Jetz
c6ad1226b0 Guava migration - Swap in StreamUtil.stream 2024-11-08 19:49:03 -05:00
Jetz
4bbc165460 Guava migration - Use .toList() 2024-11-08 19:33:45 -05:00
Anthony Calosa
ac15b32f32 fix SealedScreen
bind directly the back button to open the LoadSealedScreen on Sealed Editor
2024-11-09 08:21:19 +08: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
e9e14360f7 fix room choicelist render 2024-11-08 10:31:15 +08:00
Anthony Calosa
2ada458bf5 update filter description, add prompt option 2024-11-07 13:46:08 +08:00
Anthony Calosa
66e64995e3 add confirm dialog to autosell 2024-11-07 11:51:06 +08:00
Anthony Calosa
95ca1673b8 update ImageView
show NoSell overlay
2024-11-07 10:34:34 +08:00
Anthony Calosa
7f7248f825 fix sellAll 2024-11-06 23:24:01 +08:00
Anthony Calosa
a8bc8d42e1 format 2024-11-06 21:30:43 +08:00
Anthony Calosa
6b31d101db prevent townPriceModifier NPE 2024-11-06 21:29:38 +08:00
Anthony Calosa
d85d00fbfb include ADVENTURE_SIDEBOARD config 2024-11-06 20:11:06 +08:00