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
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
Anthony Calosa
6334c9f922
update AtomReader, add support releaseTag on android
2024-10-25 18:03:46 +08:00
Anthony Calosa
8c085bbd33
add mobile updater, update gdx natives
2024-10-25 11:41:06 +08:00
Anthony Calosa
a0c865b4b3
add snapshot notification button
2024-10-24 20:44:22 +08:00
Anthony Calosa
fa974504b9
format release notes
2024-10-24 18:38:24 +08:00
Anthony Calosa
7a976291ba
add desktop RSSReader, update autoupdater
2024-10-24 18:12:04 +08:00
Chris H
76ac1e2534
Revert "gui-desktop : add keyboard shortcut to press OK/Yes button"
2024-10-23 12:57:32 -04:00
kevlahnota
8568498b69
Merge pull request #6412 from kevlahnota/master2
...
display locked room, fix nonrotated card panels
2024-10-23 05:49:21 +08:00
Chris H
2bab2f6c2b
Merge branch 'master' into ok_shortcut
2024-10-22 15:40:18 -04:00
Anthony Calosa
310f0ea352
incorporate emptyroom
2024-10-22 23:28:49 +08:00
Anthony Calosa
f7f9943436
update code as suggested
2024-10-22 23:05:47 +08:00
Anthony Calosa
1b3e3f7f7c
display locked room, fix nonrotated card panels
2024-10-22 21:38:23 +08:00
Anthony Calosa
2aa6d9a6e6
add manifest entries to forge desktop/mobile jar
...
allow launching the jar without launcher if possible
2024-10-22 10:18:07 +08:00
Anthony Calosa
a09de0294f
replacer token -> mandatory.java.args
2024-10-19 07:05:10 +08:00
Anthony Calosa
3455045f2e
update scripts
2024-10-18 23:16:00 +08:00
fanch
be6f353867
Merge branch 'master' into ok_shortcut
...
# Conflicts:
# forge-gui-desktop/src/main/java/forge/toolbox/FOptionPane.java
2024-10-18 15:47:10 +02:00
Jetz
6b93e628ac
Merge branch 'master' into code-cleanup
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/ComputerUtil.java
# forge-core/src/main/java/forge/card/DeckHints.java
# forge-game/src/main/java/forge/game/ability/AbilityFactory.java
# forge-game/src/main/java/forge/game/cost/CostUntapType.java
# forge-gui/src/main/java/forge/player/HumanCostDecision.java
2024-10-14 22:36:07 -04:00
Jetz
31547c6bbb
Merge branch 'master' into code-cleanup
...
# Conflicts:
# forge-game/src/main/java/forge/game/phase/PhaseHandler.java
2024-10-14 22:20:44 -04:00
Anthony Calosa
644fa46681
Merge branch 'master' into master2
2024-10-09 16:44:29 +08:00
Jetz72
48adeb357d
Show chosen mana for mana abilities as symbols ( #6256 )
...
* Support for icons in dialogs.
Mana abilities show chosen mana via icons.
Thread safety for showOptionDialog
* Ensure EventDispatchThread for showInputDialog
---------
Co-authored-by: Jetz <Jetz722@gmail.com >
2024-10-08 22:17:18 +03:00
Anthony Calosa
eada2c6d4f
Merge branch 'master' into master2
2024-10-07 06:06:05 +08:00
Hans Mackowiak
80b30d9a6a
Room: First Spell Part ( #6044 )
...
* Room: First Spell
----
Co-authored-by: tool4ever <therealtoolkit@hotmail.com >
Co-authored-by: tool4EvEr <tool4EvEr@192.168 .0.59>
Co-authored-by: TRT <>
Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com >
2024-10-06 20:11:28 +02:00
Anthony Calosa
4dfd344298
add JVM check
2024-10-06 15:29:51 +08:00
