Michael Kamensky
d377e88b02
Merge branch 'Xyx-master-patch-68244' into 'master'
...
Update tempt_with_discovery.txt: RepeatOptionalMessage$ fixed (their -> your).
See merge request core-developers/forge!5233
2021-08-17 15:20:37 +00:00
Jochem H
354c9ccb4f
Update tempt_with_discovery.txt: RepeatOptionalMessage$ fixed (their -> your).
2021-08-17 10:09:54 +00:00
Anthony Calosa
ea446db71e
Merge branch 'kevlahnota-master-patch-69962' into 'master'
...
Update ImageKeys.java
See merge request core-developers/forge!5232
2021-08-17 09:11:55 +00:00
Anthony Calosa
96f8dc0791
Update ImageKeys.java
2021-08-17 09:11:10 +00:00
Anthony Calosa
3b058e20ec
Merge remote-tracking branch 'remotes/core/master'
2021-08-17 05:47:09 +08:00
Anthony Calosa
82318426a8
Merge branch 'kevlahnota-master-patch-26283' into 'master'
...
Update J21.txt
See merge request core-developers/forge!5231
2021-08-16 21:44:49 +00:00
Anthony Calosa
9f2911d492
Update J21.txt
2021-08-16 21:44:14 +00:00
Anthony Calosa
511eef9b22
Merge remote-tracking branch 'remotes/core/master'
2021-08-17 01:19:56 +08:00
Anthony Calosa
6545470f09
Merge branch 'twosat-master-patch-40221' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!5230
2021-08-16 17:19:04 +00:00
Andreas Bendel
1bb2326a1d
Update de-DE.properties
...
corrected german translation reffering Preferred Card Art
in this case card art should not be translated as Kartenkunst, Kartenbild is better
not erverything can be translated literally (both ways)
2021-08-16 17:16:58 +00:00
Anthony Calosa
73065e54d7
Merge remote-tracking branch 'remotes/core/master'
2021-08-17 00:22:32 +08:00
Michael Kamensky
6a009977f8
Merge branch 'master' into 'master'
...
Support Set lookup for J21 and other future sets.
See merge request core-developers/forge!5229
2021-08-16 15:12:04 +00:00
Anthony Calosa
7d80a663a4
Merge remote-tracking branch 'remotes/core/master'
2021-08-16 22:39:03 +08:00
Hans Mackowiak
e4625c6306
Update ComputerUtilCost.java : Cherry Pick NPE fix
2021-08-16 11:34:17 +00:00
Anthony Calosa
6a99ee00f1
Simulation test don't need setlookup
2021-08-16 13:42:05 +08:00
Anthony Calosa
4c09b11b63
remove redundant code
2021-08-16 12:48:19 +08:00
Anthony Calosa
3d322e47ee
Support Set lookup for J21 and other future sets.
...
Forge loads all files found on the setlookup folder.
Example J21.txt (J21 set code) contains a list of set codes (sorted from Newest to Oldest beforehand) to lookup for images on other sets.
2021-08-16 12:06:20 +08:00
Michael Kamensky
dfd448a323
Merge branch 'master' into 'master'
...
Set X cost for AnimateAI, add a couple AlwaysOnDiscard logic hints
See merge request core-developers/forge!5227
2021-08-15 11:46:17 +00:00
Michael Kamensky
c1043e3b9d
- Delete an accidentally committed file.
2021-08-15 14:45:47 +03:00
Michael Kamensky
13747b8fd6
- Set X cost for AnimateAi
2021-08-15 14:43:43 +03:00
Michael Kamensky
b5ade0c7bc
- More AlwaysOnDiscard AI logic hints.
2021-08-15 14:40:47 +03:00
Michael Kamensky
4f8055cfdc
Merge branch 'master' into 'master'
...
Improve the CostDiscard logic a little for cases where CARDNAME itself is discarded.
See merge request core-developers/forge!5226
2021-08-15 06:41:36 +00:00
Michael Kamensky
de4072f0c8
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2021-08-15 09:35:33 +03:00
Michael Kamensky
207d8fc97c
Merge branch 'fix_ai_x_cannot_be_zero' into 'master'
...
Adds check for AI when X cost is not allowed to be zero
See merge request core-developers/forge!5224
2021-08-15 06:33:42 +00:00
Michael Kamensky
43c68ddfcb
- Improve the CostDiscard logic a little for cases where CARDNAME itself is discarded.
2021-08-15 09:29:55 +03:00
Michael Kamensky
16f7ac2949
Merge branch 'NPE' into 'master'
...
Fix NPE with Thunderous Might
See merge request core-developers/forge!5223
2021-08-15 04:34:33 +00:00
Wendell Wilkerson
9da3686ecb
Adds check for X cannot be zero for AI player
2021-08-14 23:34:18 -05:00
tool4EvEr
e0e5d212f6
Clean up
2021-08-14 23:28:36 +02:00
tool4EvEr
d304655ecd
Fix NPE with Thunderous Might
2021-08-14 21:19:51 +02:00
Michael Kamensky
afae2ef25a
Merge branch 'manabondCounter' into 'master'
...
moved ManaBond counter into Engine
Closes #1950
See merge request core-developers/forge!5222
2021-08-14 14:14:09 +00:00
Hans Mackowiak
0a46d9ebc8
moved ManaBond counter into Engine
2021-08-14 15:38:56 +02:00
Michael Kamensky
5d51cf468e
Merge branch 'collector-number-in-card-list-and-card-db-refactoring' into 'master'
...
Card Art Preference, New Feature for "Smart Selection" of Card Art in Decks, Refactoring CardDb w/ Tests & Various FIXES
See merge request core-developers/forge!5220
2021-08-14 10:36:39 +00:00
Michael Kamensky
c2ee17050e
Merge branch 'tappay' into 'master'
...
Fix TapXType & CostSacrifice payment fails
See merge request core-developers/forge!5213
2021-08-14 10:35:26 +00:00
Bug Hunter
b7eaca6483
Fix TapXType & CostSacrifice payment fails
2021-08-14 10:35:25 +00:00
Michael Kamensky
e0435aa309
Merge branch 'gamestate' into 'master'
...
Fix GameState for partner commanders
See merge request core-developers/forge!5221
2021-08-14 10:34:26 +00:00
tool4EvEr
65de007894
Fix GameState for partner commanders
2021-08-14 10:04:44 +02:00
leriomaggio
838f817be7
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-08-14 08:27:09 +01:00
Michael Kamensky
f6b8a41775
Merge branch 'small_fixes' into 'master'
...
Small edition fixes
See merge request core-developers/forge!5219
2021-08-14 04:27:39 +00:00
Michael Kamensky
01da67676d
Merge branch 'lost' into 'master'
...
Fix life lost triggers
See merge request core-developers/forge!5218
2021-08-14 04:27:08 +00:00
Michael Kamensky
f919f90974
Merge branch 'TRT-master-patch-72745' into 'master'
...
Fixes for Grist
See merge request core-developers/forge!5217
2021-08-14 04:26:31 +00:00
Bug Hunter
c9d88ae384
Fixes for Grist
2021-08-14 04:26:30 +00:00
leriomaggio
d72d48a11f
FIXED bug for unique filter with missing break statement and reverse for correct iteration
2021-08-14 01:10:02 +01:00
leriomaggio
017a4c579e
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-08-14 00:12:27 +01:00
paul_snoops
d9411ae2a2
Small edition fixes
2021-08-13 23:27:07 +01:00
tool4EvEr
be81ba5e15
Fix life lost triggers
2021-08-13 21:25:24 +02:00
Michael Kamensky
33959fc087
Merge branch 'conspiracy' into 'master'
...
Fix Conspiracy Theorist
See merge request core-developers/forge!5216
2021-08-13 11:46:55 +00:00
Bug Hunter
1084a972c1
Fix Conspiracy Theorist
2021-08-13 11:46:55 +00:00
leriomaggio
9e3d97b452
Finally added option in settings for smart card art selection in Mobile Settings pane too.
2021-08-13 11:37:17 +01:00
leriomaggio
258f57e080
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-08-13 11:25:38 +01:00
leriomaggio
6d8e935203
FIX a but that avoided Brawl card catalog to properly distribute art indices of cards
...
This FIX relies on the new method in CardDb to query cards by also using collector numbers.
This has solved the issue of repeated card index/images in card catalog for Brawl (or any other limited game format in the future)
2021-08-13 11:16:02 +01:00
