tool4ever
a9c5839217
Refactor SpellAbilityView canPlay ( #6671 )
2024-12-06 19:58:52 +00:00
Justin C
6c1f4c7ffe
Fix for noted types for Volo's journal ( #6665 )
2024-12-06 15:13:22 +01: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
Anthony Calosa
ebffb83932
prevent NPE on old skin/theme
2024-12-05 21:00:39 +08:00
kevlahnota
d06673e401
Update FCollectionTest.java
...
prior to the threadsafeiterable restoration
2024-12-05 12:50:53 +08:00
kevlahnota
a0cad5fa48
fix FCollection ( #6657 )
2024-12-04 14:45:05 +01:00
Jetz
db2764f1ce
Fix Build Errors
2024-12-04 08:27:37 -05: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
Anthony Calosa
e8a6d4ce92
prevent crash on Android 11 and below
...
Completablefuture -> completeOnTimeout
2024-12-02 09:44:29 +08:00
Anthony Calosa
7c3354cf70
Merge remote-tracking branch 'origin/AI_ATTACK_TIMEOUT' into AI_ATTACK_TIMEOUT
2024-11-22 12:46:26 +08:00
kevlahnota
f918ae5978
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-22 12:46:13 +08:00
Anthony Calosa
afb062e770
revert ManaPool
...
remove ManaPoolTest for concurrency
refactor timeout for chooseSpellAbilityToPlayFromList
2024-11-22 12:44:51 +08:00
kevlahnota
29ce2e01fd
Update ImageView.java
2024-11-22 06:04:25 +08:00
Anthony Calosa
259247c842
update ManaMultiMap clear
...
update ManaPoolTest
2024-11-21 14:37:32 +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
81777761f5
add ManaPoolTest
2024-11-20 22:02:25 +08: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
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
kevlahnota
d9c4c818b5
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-15 16:53:04 +08:00
kevlahnota
dcd4fac927
update desktop logic
2024-11-15 09:51:04 +08:00
Anthony Calosa
8dbb648638
add user setting for AI Timeout
2024-11-14 22:06:23 +08:00
Anthony Calosa
e2c37d11e7
AI Attack Timeout
2024-11-14 19:11:25 +08:00
tool4ever
ac96890f44
Some fixes ( #6575 )
2024-11-14 09:34:05 +00:00
kevlahnota
919832cc06
Update pom.xml
...
remove duplicate plugin
2024-11-14 16:11:14 +08:00
Anthony Calosa
b161502595
update setting colorID
2024-11-14 10:30:33 +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
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
Anthony Calosa
4012469910
refactor var name
2024-11-13 19:12:34 +08:00
Anthony Calosa
f814292de7
update comment
2024-11-13 13:45:09 +08:00
Anthony Calosa
8fd521b949
update desktop editor
2024-11-13 13:43:47 +08:00
Anthony Calosa
cb2ddf39f8
update auditer
2024-11-11 17:00:04 +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
kevlahnota
f47870a698
Update CCombat.java
...
- closes #6548
2024-11-09 06:34:47 +08:00
Anthony Calosa
74f9d05b08
update NPE prevention
2024-11-03 12:14:43 +08:00
Anthony Calosa
8d9f17fbac
move key indicators
2024-11-02 11:08:30 +08:00
Chris H
5f5e871840
Add a toggle to reenable declaring combatant ordering ( #6467 )
...
* Add a toggle to reenable declaring combatant ordering
* update translation
---------
Co-authored-by: kevlahnota <anthonycalosa@gmail.com >
2024-10-30 12:27:25 +03:00
Anthony Calosa
b3c867e326
prevent NPE
2024-10-29 14:41:25 +08:00
Anthony Calosa
51e0f37a14
update constant name
2024-10-28 20:10:33 +08:00
Anthony Calosa
ad9b6e57bd
move hardcoded url to ForgeConstants
2024-10-28 19:27:41 +08:00
Anthony Calosa
750d41a2d3
filter commit messages
2024-10-28 12:34:48 +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
89bc9c126f
update snapshot notification message
2024-10-27 13:00:39 +08:00
Anthony Calosa
9bde207575
add settings for snapshot notification, removed obsolote java 8 check
2024-10-27 11:39:28 +08:00
