Jetz
348447c82d
Re-Fix IndexOutOfBoundsException, sans janky method chain
2024-12-16 10:44:07 -05:00
Chris H
420f862e90
This function wasn't tested. And it seems like it was written not to be maintainable. Reverting.
2024-12-15 20:35:23 -05:00
kevlahnota
1b493b0a2b
Merge pull request #6047 from Jetz72/code-cleanup
...
Migrate Guava Predicates and Functions to Java implementations
2024-12-15 08:51:39 +08:00
Anthony Calosa
63bf2b1a3d
clear bookmarks
...
- closes #6685
2024-12-15 00:53:03 +08:00
Agetian
770f51e891
- Fix draft rankings not showing in Adventure Mode on the first pick of the draft. ( #6674 )
2024-12-09 22:08:58 +03:00
Jetz
931e734bc0
Merge remote-tracking branch 'origin/master' into code-cleanup
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/ComputerUtil.java
# forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
# forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
# forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
2024-12-09 08:52:36 -05:00
Anthony Calosa
40ee86167b
fix typo
2024-12-08 08:47:37 +08:00
Anthony Calosa
7482856dad
prevent NPE on AdventureDeckEditor onClose event
2024-12-08 08:45:57 +08:00
kevlahnota
ea244ec39b
Update CardFaceSymbols.java
...
fix CR -> ColorlessHybrid
2024-12-06 06:03:10 +08:00
Jetz
6c10351d93
Merge remote-tracking branch 'origin/master' into code-cleanup
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/ability/PlayAi.java
# forge-core/src/main/java/forge/util/collect/FCollection.java
# forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
2024-12-05 08:27:25 -05:00
kevlahnota
f637bd970b
update check for ItemManagerConfig
2024-12-05 11:49:34 +08:00
kevlahnota
32ba304d11
Update AdventureDeckEditor.java
...
fix bulk sell menu appearing on other catalogpages
2024-12-05 11:32:45 +08:00
Jetz
44cf7dbbea
Merge remote-tracking branch 'origin/master' into code-cleanup
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/AiAttackController.java
# forge-ai/src/main/java/forge/ai/AiCardMemory.java
# forge-ai/src/main/java/forge/ai/AiController.java
# forge-core/src/main/java/forge/card/ICardDatabase.java
# forge-core/src/main/java/forge/item/generation/BoosterGenerator.java
# forge-core/src/main/java/forge/util/FileSection.java
# forge-core/src/main/java/forge/util/collect/FCollection.java
# forge-game/src/main/java/forge/game/card/CardProperty.java
# forge-game/src/main/java/forge/game/combat/Combat.java
# forge-game/src/main/java/forge/game/spellability/SpellAbility.java
# forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
# forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
# forge-gui-mobile/src/forge/itemmanager/ItemManager.java
# forge-gui/src/main/java/forge/deck/DeckgenUtil.java
# forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java
2024-12-04 08:15:30 -05:00
Chris H
a337fd2aed
Pay cost verbiage
2024-12-03 21:55:54 -05:00
Anthony Calosa
d733b8933e
enable timeout on chooseSpellAbilityToPlayFromList
2024-12-02 10:10:00 +08:00
Anthony Calosa
e8a6d4ce92
prevent crash on Android 11 and below
...
Completablefuture -> completeOnTimeout
2024-12-02 09:44:29 +08:00
kevlahnota
486e8d37b5
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-29 06:03:51 +08:00
kevlahnota
3971d53746
Update TextRenderer.java
...
fix symbol out of bounds
2024-11-28 20:00:17 +08:00
Anthony Calosa
e1d7c4a429
use Guava memoize
2024-11-26 05:48:21 +08:00
Anthony Calosa
08bab22a23
refactor lazy initialization
2024-11-25 20:45:05 +08:00
Anthony Calosa
8fa95a01ae
update arrows
2024-11-23 19:32:03 +08:00
Anthony Calosa
b0411423f6
use Executor, update MatchScreen
2024-11-23 13:22:41 +08:00
Anthony Calosa
0b9fb9f379
Merge remote-tracking branch 'origin/AI_ATTACK_TIMEOUT' into AI_ATTACK_TIMEOUT
2024-11-22 19:13:37 +08:00
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
