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

53641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
b7e6d51f97 [Mobile] prevent NPE on deck import 2021-10-16 14:45:13 +08:00
Michael Kamensky
3a7878f182 Merge branch 'master' into 'master' 
Minor tweaks to DayTimeAi

See merge request core-developers/forge!5559
 2021-10-16 04:38:18 +00:00
Michael Kamensky
037b8250cf - Minor tweaks to DayTimeAi 2021-10-16 07:35:22 +03:00
Anthony Calosa
6a7dd633d9 Merge branch 'master' into 'master' 
show indicator when needed

See merge request core-developers/forge!5558
 2021-10-16 04:13:06 +00:00
Anthony Calosa
d364896f98 show indicator when needed 2021-10-16 12:11:38 +08:00
leriomaggio
7c386b5ddf Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-16 00:47:30 +01:00
leriomaggio
ef03ea37d8 Finalised full Italian Translation for DeckImport 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 00:47:10 +01: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
TRT
dffd95dd08 Fix hasManaAbility 2021-10-15 23:36:40 +02:00
Michael Kamensky
2aec1b7609 Merge branch 'attach' into 'master' 
ChangeZoneAi: Fix NPE for attaching cards

See merge request core-developers/forge!5557
 2021-10-15 20:04:18 +00: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
350c6a6fa4 Added translations for VStatisticsImporter 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 20:33:44 +01:00
leriomaggio
672014ce8a Setting up all new translation entries as they are in English for DeckImport and DeckImport Controller 
Note: Translation NEEDED

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-15 20:33:44 +01:00
tool4EvEr
99c5cf87d2 Fix NPE for ChangeZone Attach 2021-10-15 21:14:07 +02:00
Michael Kamensky
ad1c08c0d8 Merge branch 'fix' into 'master' 
arlinn fix

See merge request core-developers/forge!5555
 2021-10-15 18:55:30 +00: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
Northmoc
c06cc29075 arlinn fix 2021-10-15 14:15:03 -04:00
Michael Kamensky
1234c6c04e Merge branch 'master' into 'master' 
Add (mostly stubbed) DaytimeAi

See merge request core-developers/forge!5554
 2021-10-15 18:13:09 +00:00
Michael Kamensky
7892be0269 - Add (mostly stubbed) DaytimeAi 2021-10-15 21:12:09 +03:00
Anthony Calosa
815edd5c87 Merge branch 'master' into 'master' 
update bg

See merge request core-developers/forge!5553
 2021-10-15 17:51:29 +00:00
Anthony Calosa
b3c3b82fe5 Merge remote-tracking branch 'core/master' 2021-10-16 01:48:54 +08:00
Anthony Calosa
94add3ad09 update bg 
add credits to artist
 2021-10-16 01:48:05 +08:00
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