external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 31 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

53916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
f1f907a532 Merge branch 'fixup' into 'master' 
Fix TargetsWithRelatedProperty

See merge request core-developers/forge!5551
 2021-10-15 17:21:30 +00:00
tool4EvEr
ce016180a7 Fix TargetsWithRelatedProperty 2021-10-15 15:49:36 +02:00
Sol
0e97d822bb Merge branch '1978-daybound-nightbound' into 'master' 
Resolve "Daybound & Nightbound"

Closes #1978

See merge request core-developers/forge!5462
 2021-10-15 13:20:37 +00:00
Hans Mackowiak
997e566af0 Resolve "Daybound & Nightbound" 2021-10-15 13:20:36 +00:00
leriomaggio
eef331b589 Fixed typo in Translation 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 14:14:27 +01:00
leriomaggio
e3eafb0b4f Fixed typo in Translation 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 14:08:33 +01:00
leriomaggio
e91277f271 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-15 13:39:00 +01:00
leriomaggio
30628db5ed Finalised all translations (DeckImport welcome text, and DeckImportController Dialog) 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 13:38:33 +01:00
leriomaggio
f35164c0d6 Full updates with latest translations and Token types 
This commit introduces major refactoring to code of Deck Import to extend support to all DeckRecognizer.Token types, as well as better-organised methods for message and status display. On this note, the CSS has been updated, along with decklist HTML which now leverages on HTML-table to display tokens and status messages separately and all well-aligned.
Card Preview has been also refined, with proper CSS classes and messages.
Finally, the HTML_WELCOME_TEXT now reflects the latest changes in translation file (e.g. included an additional example, and extra paragraph in Options)

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 13:15:18 +01:00
leriomaggio
9ef6c05396 Added deck name token retrieval and warning msg before saving. 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 13:12:21 +01:00
leriomaggio
a012b236a5 Few changes to Deck Name and CC tokens trimmed and uppercase (resp). 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 13:11:25 +01:00
Michael Kamensky
fa09c3fa7b Merge branch 'fix-mantleoftheancients' into 'master' 
Fix Mantle of the Ancients allowing to target stuff in other graveyards

See merge request core-developers/forge!5550
 2021-10-15 11:30:31 +00:00
Michael Kamensky
60cbfa4739 Merge branch 'edition_fixes' into 'master' 
New SLD cards and PPRO fixes

See merge request core-developers/forge!5549
 2021-10-15 09:30:35 +00:00
Michael Kamensky
602027be0f - Fix Mantle of the Ancients. 2021-10-15 12:29:26 +03:00
paul_snoops
a35b82e6b5 rarity_fixes 2021-10-15 09:14:10 +01:00
paul_snoops
66b20b4800 oops 2021-10-15 09:02:01 +01:00
paul_snoops
bc932ba039 New SLD cards and PPRO fixes 2021-10-15 08:58:31 +01:00
Michael Kamensky
5fd4c2e3d2 Merge branch 'aifix' into 'master' 
Fix NPE with Mount Velus Manticore

See merge request core-developers/forge!5548
 2021-10-14 13:31:25 +00:00
tool4EvEr
3b86f4f0c2 Fix NPE with Mount Velus Manticore 2021-10-14 13:26:31 +02:00
Anthony Calosa
8dca774d95 Merge branch 'master' into 'master' 
unused imports

See merge request core-developers/forge!5547
 2021-10-14 08:28:44 +00:00
Anthony Calosa
18eddce33a unused imports 2021-10-14 16:28:15 +08:00
Anthony Calosa
1d74e27ee7 Merge branch 'master' into 'master' 
[Mobile] fix NPE

See merge request core-developers/forge!5546
 2021-10-14 08:21:15 +00:00
Anthony Calosa
40ea769ac5 [Mobile] fix NPE 2021-10-14 16:19:53 +08:00
Michael Kamensky
e00c4da560 Merge branch 'master' into 'master' 
Fix Split the Party AI

See merge request core-developers/forge!5544
 2021-10-14 05:28:00 +00:00
Michael Kamensky
3f6a7c2d12 - Fix Split the Party AI 2021-10-14 08:27:24 +03:00
Michael Kamensky
cf0221554c Merge branch 'master' into 'master' 
October 13, 2021 Banned and Restricted announcement

See merge request core-developers/forge!5542
 2021-10-14 04:01:02 +00:00
Hythonia
1d014b6a63 Update subversive_acolyte.txt 2021-10-13 17:37:46 +00:00
Hythonia
fc901735c3 Update sarkhan_wanderer_to_shiv.txt 2021-10-13 17:35:44 +00:00
Hythonia
780cd830e0 Update faceless_agent.txt 2021-10-13 17:34:12 +00:00
Hythonia
a4dd05efec Update davriel_soul_broker.txt 2021-10-13 17:33:46 +00:00
Hythonia
adbd51f05e Update davriels_withering.txt 2021-10-13 17:32:16 +00:00
Hythonia
ce3ef1544b October 13, 2021 Banned and Restricted Announcement 2021-10-13 17:30:53 +00:00
Michael Kamensky
cf86688b61 Merge branch 'brawl' into 'master' 
Brawl Pithing Needle banned and HTR20 update

See merge request core-developers/forge!5541
 2021-10-13 17:24:08 +00:00
paul_snoops
20cecd0985 Brawl Pithing Needle banned and HTR20 update 2021-10-13 14:35:50 +01:00
Michael Kamensky
1617c433d0 Merge branch 'panhar' into 'master' 
Panharmonicon: Fix missing trigger due to ETB with old state

Closes #1986

See merge request core-developers/forge!5540
 2021-10-13 09:06:04 +00:00
TRT
fa9dd99f6e Fix missing trigger due to ETB with old state 2021-10-12 17:13:53 +02:00
Bug Hunter
09900d112f Merge branch 'TRT-master-patch-53744' into 'master' 
Update forge-gui/res/cardsfolder/r/rousing_of_souls.txt

See merge request core-developers/forge!5539
 2021-10-12 08:41:16 +00:00
Bug Hunter
fed312a862 Update forge-gui/res/cardsfolder/r/rousing_of_souls.txt 2021-10-12 08:40:56 +00:00
Michael Kamensky
53dd6d6933 Merge branch 'cleanup' into 'master' 
CardLists.filter(*).isEmpty -> Iterables.any

See merge request core-developers/forge!5538
 2021-10-11 20:14:42 +00:00
tool4EvEr
091cb077e9 Clean up 2021-10-11 21:42:38 +02:00
tool4EvEr
1280cb384a CardLists.filter(*).isEmpty -> Iterables.any 2021-10-11 20:20:32 +02:00
Michael Kamensky
e224d8790d Merge branch 'aifix' into 'master' 
staticDamagePrevention: fix check

See merge request core-developers/forge!5537
 2021-10-11 04:19:59 +00:00
Michael Kamensky
a855979d06 Merge branch 'counters' into 'master' 
CountersAi: skip for only one against Vorinclex

See merge request core-developers/forge!5536
 2021-10-11 04:19:30 +00:00
tool4EvEr
72d0de96e2 Improve poison combat checks 2021-10-10 23:57:02 +02:00
tool4EvEr
76f7fbbb08 staticDamagePrevention: fix check 2021-10-10 23:14:23 +02:00
tool4EvEr
f0a3d19d38 CountersAi: skip for only one against Vorinclex 2021-10-10 19:17:35 +02:00
Michael Kamensky
a5016c4afc Merge branch 'klaxnek-master-patch-24357' into 'master' 
Update es-ES.properties (UseLaserArrows and ReplaceCard)

See merge request core-developers/forge!5535
 2021-10-10 10:06:09 +00:00
klaxnek
a7fc9b0882 Update es-ES.properties (UseLaserArrows and ReplaceCard) 2021-10-10 08:27:34 +00:00
leriomaggio
1718ca9020 Added full support to card preview with foil and correct updates 
Now all cards displayed in cardpreview panel will automatically adapt to any change in the decklist.
That is, the panel will be reset only if current-displayed card is not in decklist anymore. In all other cases, the preview will adjust depending on the new token status, and/or whether the card is/was foiled!

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-10 09:10:19 +01:00
leriomaggio
44cfc76552 Added support for Foiled cards in Token Key (w. tests) 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-10 08:24:47 +01:00