external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,835 Commits 31 Branches 187 Tags
bada43b901b55a573d245800f1ec53e474917ef1
Commit Graph

2461 Commits

Author SHA1 Message Date
leriomaggio
237a423180 Added caching strategy when (deep) comparing decks 
Deck model comparison may be triggered a certain number of times, and the new deep-comparison on each part may slow down performance in deck editor. Therefore, a caching strategy has been integrated to avoid comparing the same objects multiple times.
 2021-10-29 10:36:34 +01:00
leriomaggio
663ebd4120 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-28 23:20:48 +01:00
leriomaggio
35eca6f038 Better control on Deck save and editor state set + FIX set deck name 
the loadDeck method now has a better handling of the deck (model) status, also wrt. the state of the UI editor.
If the deck is Stored, the editor will be in "modified - not saved" state.
 2021-10-28 23:20:31 +01:00
tool4EvEr
2de6fc476c Fix dropping foil from card when copying 2021-10-28 21:20:45 +02:00
TRT
5e050765a3 Clean up 2021-10-26 13:41:31 +02:00
tool4EvEr
fb88fcfe9c Fix deck loading not restoring foiled status 2021-10-25 23:54:08 +02:00
Michael Kamensky
6ae88ea82b Merge branch 'java-11plus' into 'master' 
Update Forge scripts for Java 11+ and Java 17+

See merge request core-developers/forge!5566
 2021-10-25 09:41:50 +00:00
tool4EvEr
47a1a93625 Fix SA not fizzling when targeting cards that left game 2021-10-24 22:10:22 +02:00
leriomaggio
669a10820e Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-24 16:20:21 +02:00
leriomaggio
d303c0e8ff Saving a Deck is now performed ONLY if there is any actual change to save onto disk. Otherwise, the whole op is skipped. 2021-10-24 16:18:18 +02:00
leriomaggio
1a7288815c Updated resetTable to reuse the code in setEditorMode and to update the DeckSection Dropdown 
This FIXES a bug causing the Deck Editor to not properly restore its state after saving a Deck and not originally in Main Decksection.
This commit also avoids repeating code and reset tables only if necessary.
 2021-10-24 16:17:05 +02:00
leriomaggio
2d40d0135c Added support for new Dungeon DeckSection in Constructed Editor (w/ i18n) 2021-10-23 22:14:15 +02:00
leriomaggio
0343da977c Removed FIXME and added note 2021-10-23 21:48:35 +02:00
leriomaggio
9f97b34a3a Recognise new Dungeon DeckSection Placeholder, and improved support to .dec files 
.Dec files have collector nr//art-index as separated by a Pipe.
RegExps with collector numbers have been extended to further support decks in this format (with simply copy & paste the listing).
Tests updated/added to verify the new regexp & behaviour.
 2021-10-23 21:45:04 +02:00
Anthony Calosa
c1a56f95d2 Update funny cards 
collector number that starts with "F" denotes funny, to filter funny cards from legal sets and exclude them in the card audit
 2021-10-23 17:12:02 +08:00
Anthony Calosa
0d194ba645 [Desktop] Update card audit 
- only display the missing cards and not implemented cards.
 2021-10-23 13:36:00 +08:00
paul_snoops
c409e907c2 Exclude "funny" cards from audit 2021-10-22 12:59:41 +01:00
Anthony Calosa
165a564caf unused imports 2021-10-21 15:45:30 +08:00
tool4EvEr
43019b3881 Add some more modern resolution choices 2021-10-20 22:27:36 +02:00
leriomaggio
87439388db Improved support for Unknown cards in DeckImport 
DeckImport now avoids including non-deck and metadata info in decklist as UnknownText, whilst any line that looks like a card request (i.e. includes a card quantity in the beginning) is interpreted as Unknown card.

This seems a good compromise with showing typo and any mispelling in card list whilst avoiding flooding decklist with unnecessary info.
 2021-10-20 10:47:44 +02:00
Michael Kamensky
0d67e7950e Merge branch 'adventure' into 'master' 
Adventure mode

See merge request core-developers/forge!5584
 2021-10-20 04:54:04 +00:00
Grimm
49f7128240 Restore the adventure merge 
This reverts commit e69cf66ec8.
 2021-10-20 04:54:01 +00:00
Michael Kamensky
48f894b1ae - Fix shared params lines. 2021-10-20 07:09:00 +03:00
leriomaggio
a67da59564 Unknown/Unrecognised text is not muted anymore and displayed as unknown card. 
Added new entry in language files (ITA already translated too)
 2021-10-20 00:48:02 +02:00
Michael Kamensky
445d655dd3 - Consolidate shared parameters in a variable. 2021-10-19 19:35:35 +03:00
Michael Kamensky
33566c037c Merge branch 'gauntletfix' into 'master' 
Fix some more NPE related to gauntlets

See merge request core-developers/forge!5583
 2021-10-18 16:27:26 +00:00
TRT
5b72d1f682 Fix some more NPE related to gauntlets 2021-10-18 15:26:09 +02:00
friarsol
399ea54088 Disable in-game uploader for now 2021-10-17 17:40:24 -04:00
Michael Kamensky
1f0e7f7348 Merge branch 'vulns' into 'master' 
update to fix known vulnerabilities

See merge request core-developers/forge!5576
 2021-10-17 13:49:21 +00:00
Jamin W. Collins
086118be07 fix transitive dependency vulnerability 
* https://snyk.io/vuln/SNYK-JAVA-ORGTESTNG-174823

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 21:26:11 -07:00
Jamin W. Collins
dc2fa6a78e update to fix known vulnerability 
* https://snyk.io/vuln/SNYK-JAVA-COMBEUST-174815

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2021-10-16 20:46:12 -07:00
tool4EvEr
fd9ee82b53 Fix NPE when starting Quick Gauntlet with no deck selected 2021-10-16 22:52:28 +02:00
Michael Kamensky
67b4e31a5a - Fix compile and tests 2021-10-16 21:15:09 +03:00
Michael Kamensky
e69cf66ec8 Revert "Merge branch 'adventure' into 'master'" 
This reverts merge request !5318
 2021-10-16 18:09:31 +00:00
Michael Kamensky
87521416b2 Merge branch 'deck-importer-decks-file-format' into 'master' 
NEW Deck Importer

See merge request core-developers/forge!5296
 2021-10-16 16:47:29 +00:00
Michael Kamensky
c89c0181d3 Merge branch 'adventure' into 'master' 
Add Adventure mode

See merge request core-developers/forge!5318
 2021-10-16 16:47:21 +00:00
Michael Kamensky
5520cd2a67 [maven-release-plugin] prepare for next development iteration 2021-10-16 18:52:21 +03:00
Michael Kamensky
340a6b2af5 [maven-release-plugin] prepare release forge-1.6.45 2021-10-16 18:52:12 +03:00
Michael Kamensky
6b94871b78 - A Linux script that tries to detect the Java version and run the game in a way specific to the given version. Seems to work with OpenJDK. 2021-10-16 18:29:18 +03:00
leriomaggio
700e4f1d8e Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-16 08:58:49 +01:00
Anthony Calosa
d364896f98 show indicator when needed 2021-10-16 12:11:38 +08:00
leriomaggio
9590db52b8 included "Special" in Card Rarity examples in Instructions 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 00:44:49 +01:00
leriomaggio
ccf556f01b Setting accept button label properly 
New Deck is set when current deck is empty

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 20:33:45 +01:00
leriomaggio
d056d2a683 Added "Special" placeholder for card rarity 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 19:40:02 +01:00
leriomaggio
30a7c6aed4 Adding support for Dual/Double-sided cards in parsing + patch for commander export from Deckstats 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 19:33:13 +01:00
leriomaggio
f56cf00a6f Adding DB tests for dual and double cards 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 19:32:28 +01:00
leriomaggio
80268e95fd Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-15 19:15:38 +01:00
Hans Mackowiak
997e566af0 Resolve "Daybound & Nightbound" 2021-10-15 13:20:36 +00:00
leriomaggio
e91277f271 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-15 13:39:00 +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