Anthony Calosa
|
4698c2d014
|
prevent NPE
|
2024-12-08 08:34:49 +08:00 |
|
Paul Hammerton
|
4172256ded
|
Merge pull request #6673 from paulsnoops/edition-updates
Edition updates: DCI, INR, PMEI, PRES
|
2024-12-07 12:08:06 +00:00 |
|
Paul Hammerton
|
303a3ebf58
|
Edition updates: DCI, INR, PMEI, PRES
|
2024-12-07 12:03:03 +00:00 |
|
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 |
|
Agetian
|
95e5b7afca
|
Improve AI for First Responder, improve evaluation for self-sac abilities e.g. Sakura-Tribe Elder. (#6668)
|
2024-12-06 12:45:51 +01:00 |
|
Hans Mackowiak
|
9370e6fa61
|
Update remove-stale-branches.yml
Bump version
|
2024-12-06 05:46:16 +01:00 |
|
kevlahnota
|
ea244ec39b
|
Update CardFaceSymbols.java
fix CR -> ColorlessHybrid
|
2024-12-06 06:03:10 +08:00 |
|
Hans Mackowiak
|
933ff78b64
|
Update osseous_sticktwister.txt
fix AI for now until my PR is ready
|
2024-12-05 16:04:05 +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 |
|
Jetz
|
fa94754c91
|
Some Java 11 migrations
|
2024-12-05 08:05:17 -05:00 |
|
Anthony Calosa
|
13fbfe866e
|
Merge remote-tracking branch 'origin/master'
|
2024-12-05 21:00:57 +08:00 |
|
Anthony Calosa
|
ebffb83932
|
prevent NPE on old skin/theme
|
2024-12-05 21:00:39 +08:00 |
|
tool4ever
|
45c9442330
|
Fix ConcurrentModificationException (#6664)
|
2024-12-05 13:15:46 +01:00 |
|
Anthony Calosa
|
b858b48fde
|
remove Collections.synchronized
|
2024-12-05 16:39:10 +08:00 |
|
kevlahnota
|
d06673e401
|
Update FCollectionTest.java
prior to the threadsafeiterable restoration
|
2024-12-05 12:50:53 +08: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 |
|
Paul Hammerton
|
6867a0eaba
|
Merge pull request #6663 from paulsnoops/edition-updates
Edition updates: INR, PIO
|
2024-12-04 19:32:44 +00:00 |
|
Paul Hammerton
|
9c4333d608
|
Edition updates: INR, PIO
|
2024-12-04 19:28:51 +00:00 |
|
Agetian
|
32fc681726
|
- Add puzzle PS_FDN2. (#6662)
|
2024-12-04 21:18:18 +03:00 |
|
Anthony Calosa
|
8e16456b2e
|
update comments
|
2024-12-04 22:12:22 +08:00 |
|
Anthony Calosa
|
36f0021cae
|
revert threadsafeiterable
|
2024-12-04 22:04:29 +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 |
|
Chris H
|
a337fd2aed
|
Pay cost verbiage
|
2024-12-03 21:55:54 -05:00 |
|
Paul Hammerton
|
9fc971c2fb
|
Merge pull request #6659 from paulsnoops/pio_formats
Add PIO to Explorer, Historic & Timeless formats
|
2024-12-03 09:38:39 +00:00 |
|
Paul Hammerton
|
22ed570cb9
|
Merge pull request #6658 from paulsnoops/edition-updates
Edition updates: PF25, PIO, PMEI
|
2024-12-03 09:34:34 +00:00 |
|
Paul Hammerton
|
14ef18ae96
|
Add PIO to Explorer, Historic & Timeless formats
|
2024-12-03 09:34:25 +00:00 |
|
Paul Hammerton
|
a94dc8d94f
|
Edition updates: PF25, PIO, PMEI
|
2024-12-03 09:27:41 +00:00 |
|
tool4EvEr
|
e6deda205c
|
Fully unlocked room traits should still be the same (for once per turn)
|
2024-12-03 06:30:16 +01:00 |
|
tool4ever
|
739a4ef0bd
|
Fix RollDice (#6653)
|
2024-12-02 20:44:11 +00:00 |
|
tool4ever
|
560f660925
|
Update revitalizing_repast_old_growth_grove.txt
|
2024-12-02 12:51:51 +00:00 |
|
tool4ever
|
ecd2577770
|
Update embereth_veteran.txt
|
2024-12-02 12:50:50 +00:00 |
|
tool4ever
|
eb2a584f68
|
Update treetop_snarespinner.txt
|
2024-12-02 12:44:34 +00:00 |
|
tool4ever
|
b0fdd39371
|
Update touch_of_moonglove.txt
|
2024-12-02 12:43:51 +00:00 |
|
tool4ever
|
c88bdc2e1d
|
Update protect_serve.txt
|
2024-12-02 12:42:14 +00:00 |
|
tool4ever
|
5008c519a1
|
Update pollen_shield_hare_hare_raising.txt
|
2024-12-02 12:28:19 +00:00 |
|
kevlahnota
|
b1c754499d
|
Merge pull request #6651 from kevlahnota/master2
enable timeout on chooseSpellAbilityToPlayFromList
|
2024-12-02 10:13:17 +08:00 |
|
Anthony Calosa
|
d733b8933e
|
enable timeout on chooseSpellAbilityToPlayFromList
|
2024-12-02 10:10:00 +08:00 |
|
kevlahnota
|
d1d14c196a
|
Merge pull request #6650 from kevlahnota/master2
prevent crash on Android 11 and below
|
2024-12-02 09:55:46 +08:00 |
|
Anthony Calosa
|
e8a6d4ce92
|
prevent crash on Android 11 and below
Completablefuture -> completeOnTimeout
|
2024-12-02 09:44:29 +08:00 |
|
Hans Mackowiak
|
53541e8f5f
|
Update remove-stale-branches.yml (#6645)
|
2024-12-01 08:54:58 +01:00 |
|
kevlahnota
|
23d0868e0a
|
Merge pull request #6577 from Card-Forge/AI_ATTACK_TIMEOUT
AI Attack & getSpellAbilityToPlay Timeout
|
2024-12-01 13:12:24 +08:00 |
|
kevlahnota
|
c6c55a5a6a
|
Merge branch 'master' into AI_ATTACK_TIMEOUT
|
2024-12-01 12:12:31 +08:00 |
|
tool4ever
|
4fb110939a
|
Update commander_liara_portyr.txt
|
2024-11-30 19:31:26 +00:00 |
|
tool4ever
|
947d19078b
|
Fix cheating class level 3 by copying level 2 activation (#6643)
|
2024-11-29 12:22:23 +01:00 |
|
tool4ever
|
4b1ca2449c
|
Update mana_drain.txt
|
2024-11-29 12:21:08 +01:00 |
|
Agetian
|
143e3c8c75
|
- Add new genetic decks for Standard and Modern as of November 2024. (#6647)
|
2024-11-29 13:13:11 +03:00 |
|