Commit Graph

2687 Commits

Author SHA1 Message Date
tool4ever
ec20b59ff3 Dependency tab (#7013) 2025-02-19 10:31:59 +01:00
Chris H
a49ab150f9 Fix imports 2025-02-17 20:19:41 -05:00
Chris H
4bc07e5311 Disable bulk images from the UI 2025-02-17 20:19:41 -05:00
Chris H
44fca5ee5e Restore flatten library 2025-02-15 18:00:19 -05:00
GitHub Actions
2f33c24414 [maven-release-plugin] prepare for next development iteration 2025-02-15 18:00:19 -05:00
GitHub Actions
380f289887 [maven-release-plugin] prepare release forge-2.0.02 2025-02-15 18:00:19 -05:00
Chris H
a5ab069f5b Temporarily remove flatten library for release 2025-02-15 18:00:19 -05:00
Jetz72
493a8f351b Add Speed Tracker to Command Zone (#6982)
* Add command zone effect displaying speed

* Remove enum counter type for speed.

* Make Start Your Engines an SBA.

* LifeLost -> LifeLostAll per speed rules.

* Use same game event for all speed changes.

* Fix keyword not appearing in detail text

* Cleanup extra createSpeedEffect.

* Add support for arbitrary overlay text. Remove fake counters.

* Text styling.

* Remove extra SBA check.

* Remove speed from PlayerView; localization support.

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
2025-02-10 07:43:48 +03:00
tool4ever
99fd4d9125 AnimateSubAbility rework (#6819)
* AnimateSubAbility rework

* Remove old fix code, it will no longer be needed

* Add zone ordering

* Add labels

* Clean up

* Fix test

* Tweak logic

* Fix Gilraen

* Refactor with counter

* Clean up

* Cleanup effect if card can't ETB

* Update semesters_end.txt

Format abilities

* Return as Aura trickery

* Apply effect before RE

* Update scripts

* Fix order after creating it earlier

* Fix test

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
Co-authored-by: Hans Mackowiak <hanmac@gmx.de>
2025-01-28 13:18:24 +03:00
tool4ever
1e1fa1a5e1 Dependency Graphs (#6869) 2025-01-28 09:16:31 +00:00
Chris H
1c0ca26c89 This list doesn't need to be instantiated like an array 2025-01-13 07:04:12 +01:00
Chris H
2ce91a04f1 This list doesn't need to be instantiated like an array 2025-01-13 06:53:28 +01:00
Hans Mackowiak
995b3f2cf5 Fix addOpen for Exe
Fix AddOpen for launch4j Exe until https://github.com/orphan-oss/launch4j-maven-plugin/issues/423 finds something better
2025-01-07 08:44:03 -05:00
tool4ever
5b76ccbbd2 Cleanup run (#6750) 2025-01-06 20:52:26 +00:00
Hans Mackowiak
6042884bb3 Update pom.xml 2025-01-06 07:28:34 -05:00
Hans Mackowiak
9ee2cfbf18 remove add-opens from mandatory.java.args, use MANIFEST.mf 2025-01-04 10:39:38 +01:00
Justin C
6aa61684df GenerateGitChangelog goal skip. Update se.bjurr.gitchangelog to v2.2.0. (#6703)
* Updates se.bjurr.gitchangelog to v2.2.0. POM changes to skip "GenerateGitChangelog" in android test and debug builds.

* Remove jitpack.io repo

* Update pom.xml
2025-01-02 22:10:58 -05:00
Chris H
cd517fddbb Restore flatten for snapshots 2025-01-02 09:40:50 -05:00
GitHub Actions
7388468ceb [maven-release-plugin] prepare for next development iteration 2025-01-02 09:40:50 -05:00
GitHub Actions
31af1108d3 [maven-release-plugin] prepare release forge-2.0.01 2025-01-02 09:40:50 -05:00
Chris H
b4dd336ca7 Remove flatten temporarily for release 2025-01-02 09:40:50 -05:00
Jetz72
386ed8a082 Contraptions (#6717)
* Start of contraptions

* More contraption work

* More contraption stuff.
Steamflogger Boss implementation

* More Contraption things

* Use AI's preferred target for mandatory animate effects

* Possible fix for Boomflinger's empty target prompt

* Remove nullable low-definition mana pool icon.

* Contraption Predicates

* Desktop extra zone menu

* Remember cranked contraptions

* AnimateAi fallback to AITgts; Bee-Bee Gun

* Fix AI paying optional costs to assemble zero contraptions.

* Override predicted damage for DealDamage effects with random amounts

* Fix double prompt when reassembling other players' contraptions

* All remaining contraptions and support cards!

* Remove unused imports

* Some cleanup

* Implement non-assembled contraption rule.
Fix blank line prefix on card detail text.

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
2025-01-02 09:41:53 +03:00
tool4ever
1c0cb07a2e Remove obsolete GameEvent (#6736) 2025-01-01 17:24:47 +00:00
tool4ever
475020f742 Order hand option (#6729)
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
2024-12-30 08:10:02 +03:00
tool4ever
f50f985e99 Some cleanup (#6728) 2024-12-29 09:27:07 +00:00
tool4ever
9b6203b883 Full Control unleashed (#6700)
* Fix APNAP order
2024-12-26 12:53:46 +00: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
Justin C
e8067d872d Removed unused variable. Some documentation fixes. (#6675) 2024-12-10 20:24:20 +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
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