kevlahnota
8568498b69
Merge pull request #6412 from kevlahnota/master2
...
display locked room, fix nonrotated card panels
2024-10-23 05:49:21 +08:00
CollinJ
a02a0a25fc
Merge branch 'master' into master
2024-10-22 10:12:12 -07: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
b9a06e14a4
update better fix and replace rotate transform to spiral image (so it will not conflict with the existing rotate transform)
2024-10-22 22:36:05 +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
kevlahnota
b4bffe93f1
Update AudioClip.java
...
Surround audio clip with try catch, seems accessing audio in lwjgl3 produce invalidid, could be thread problem.
2024-10-22 00:15:27 +08:00
Anthony Calosa
21a738e616
delete version.txt if res folder is incomplete to allow redownload
2024-10-21 11:16:55 -04:00
Anthony Calosa
ca5b0683d1
update version code, remove redundant CURRENT_VERSION
2024-10-21 15:01:39 +08:00
CollinJ
94c75f1e71
Merge branch 'master' into master
2024-10-20 22:05:24 -07:00
Anthony Calosa
f82236cc4f
fix updater versionstring
2024-10-21 12:14:17 +08:00
Collin
5de234aacb
Fix the SpellSmith missing some cards.
...
The main issues is that getAllCards returns a card list that is unique
by name. That menas each card only has a single rarity. In this case,
cards like "Forbidden Orchard" and "Choke" de-deuplicate to a version of
the card with 'S' rarity. This means that when filtering by rarity, the
'S' rarity will be filtered out.
Another similar issue is that when a card exists in multiple sets with
different rarities, you might filter to a set in which the card is 'R',
but the de-duped version in allCards has rarity 'U', so using the cardDB
to check the rarity to filter on doesn't work.
When filtering by a specific set, the solution is to use the rarity of
the card in that set.
When not filtering by a set but filtering by rarity, we have to address
the root cause of the de-duping.
WHen de-duping, I changed the logic to ignore 'S' rarities. This fixes
the rarity filter when not filtering by an edition (although if there
are multiple rarities you still have to kind of guess).
This has the side-effect of making the card image used something more
legible. Before 'Choke' de-duped to the MPS_AHK set which has illegible
text. By ignoring 'S' rarities, it not de-dups to 8ED.
More work could probably be done to improve de-duping, but perfect
correctness would probably involve de-duping only after filtering, which
is likely too slow.
2024-10-20 12:29:11 -07:00
Jetz
e52a7b1a53
Remove unused imports
2024-10-20 09:35:52 -04:00
Jetz
c5be6f1b17
Merge branch 'master' into code-cleanup
...
# Conflicts:
# forge-game/src/main/java/forge/game/GameEntityCounterTable.java
# forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
# forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
2024-10-20 09:33:41 -04:00
Jetz
64609b0867
Add some helper methods to StreamUtil;
...
Rewrite `generateParticipants`
2024-10-20 09:26:36 -04:00
Anthony Calosa
c1779a55d5
update to LibGDX 1.13.0, add ForgeAndroidApplication (modified AndroidApplication)
2024-10-18 19:44:30 +08:00
Anthony Calosa
e0639ba33a
Merge branch 'master' into master2
2024-10-18 05:23:38 +08:00
JMAilan
2571aff4c8
Constructed as default mode ( #6358 )
...
Co-authored-by: Agetian <stavdev@mail.ru >
2024-10-17 17:58:01 +02:00
Jetz
9be2c3df8b
Merge branch 'master' into code-cleanup
2024-10-17 08:23:36 -04:00
Anthony Calosa
24638ecfce
Merge branch 'master' into master2
2024-10-17 15:56:46 +08:00
Jetz72
54ecbeef6e
Fix IndexOutOfBoundsException in generateParticipants ( #6359 )
...
Co-authored-by: Jetz <Jetz722@gmail.com >
2024-10-17 08:03:11 +03:00
Anthony Calosa
d66a7ba604
Merge branch 'master' into master2
2024-10-16 20:45:48 +08:00
Hans Mackowiak
a1f425a803
Merge pull request #6337 from nwg5817/rewardRaritySort
...
Adventure: Reward Scene Sort by Rarity
2024-10-16 13:13:32 +02:00
JMAilan
38d8761fe3
Merge branch 'master' into rewardRaritySort
2024-10-15 11:46:19 -04:00
JMAilan
965dd136bb
Merge branch 'master' into boosterQoL
2024-10-15 11:36:57 -04:00
Meta
0a08650393
Booster QoL
...
Remove open confirmation and disable leaving inventory scene when opening boosters.
Change Booster Pack Inventory Name
Old:
Booster Pack: WAR
New:
War of the Sparks Booster
Final
Tweak
2024-10-15 11:26:00 -04:00
Anthony Calosa
8fc3b45b12
quick fix for black texture
2024-10-15 10:55:56 +08: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
Meta
5b62a1ffb5
Fixed non-cards for rarity sorting
...
import
2024-10-14 21:56:30 -04:00
Chris H
0475f4bafa
Manually update files that need to be updated
2024-10-14 21:53:45 -04:00
GitHub Actions
d366bf8ffc
[maven-release-plugin] prepare for next development iteration
2024-10-14 21:53:45 -04:00
GitHub Actions
fa538bd5c9
[maven-release-plugin] prepare release forge-1.6.65
2024-10-14 21:53:45 -04:00
Anthony Calosa
abdff9bb15
update to SDK 35 (Android 15), update versionString
2024-10-09 21:25:29 +08:00
Anthony Calosa
644fa46681
Merge branch 'master' into master2
2024-10-09 16:44:29 +08:00
Anthony Calosa
708fed3350
update and unified version code property
2024-10-09 12:32:09 +08:00
Chris H
dd60a84f40
Add Spell Smith Insurance (reject smithing for 10% cost)
2024-10-08 09:07:15 -04:00
Anthony Calosa
f6f51b916a
Merge branch 'master' into master2
2024-10-08 16:27:50 +08:00
Anthony Calosa
af3ceb3348
fix crash when card defined is missing or invalid
...
these card should be replaced or create a custom card for adventure mode
Power Struggle, Necropolis of Azar
2024-10-08 16:25:52 +08: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
f4671133f3
add splashscreen for mobile-dev
2024-10-06 23:13:51 +08:00
Anthony Calosa
f14de828ea
mobile new summoning sickness icon
2024-10-05 12:20:16 +08:00
Anthony Calosa
5ce506c5ab
update ImageView
2024-10-04 19:19:30 +08:00
Anthony Calosa
deff16b8f4
Merge branch 'master' into master2
2024-10-04 14:40:42 +08:00
kevlahnota
fea8855e0e
prevent NPE
2024-10-04 11:33:36 +08:00
Anthony Calosa
0cb589a905
update generated box display
2024-09-30 20:49:03 +08:00
Anthony Calosa
ea9aab7c4f
mobile -> enable combat arrows on 2 player
2024-09-29 20:41:20 +08:00
Anthony Calosa
7594888f8e
SKIN Update
2024-09-29 15:25:11 +08:00
