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
6c8ea1de96 Merge branch 'master' into 'master' 
Rudimentary Announcements update, part 2

See merge request core-developers/forge!5569
 2021-10-16 15:46:42 +00:00
Michael Kamensky
8653d97081 - Rudimentary Announcements update, part 2 2021-10-16 18:46:10 +03:00
Michael Kamensky
2d355be51d Merge branch 'master' into 'master' 
- Rudimentary Announcements update.

See merge request core-developers/forge!5568
 2021-10-16 15:44:39 +00:00
Michael Kamensky
0c998f971b - Rudimentary Announcements update. 2021-10-16 18:44:11 +03:00
Michael Kamensky
22469cd604 Merge branch 'master' into 'master' 
Migrate Upcoming (MID/MIC)

See merge request core-developers/forge!5567
 2021-10-16 15:41:24 +00:00
Michael Kamensky
dcb398f195 - Migrate Upcoming (MID/MIC) 2021-10-16 18:40:22 +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
Anthony Calosa
7c150c36b1 Merge branch 'master' into 'master' 
[Mobile] Auto Adjust Zoom Display on local Multiplayer (landscape mode)

See merge request core-developers/forge!5565
 2021-10-16 13:31:11 +00:00
Anthony Calosa
025c195a70 [Mobile] Auto Adjust Zoom Multiplayer Local 
When playing local multiplayer game on landscape mode, adjust zoom display automatically when 3rd/4th player has lost.
 2021-10-16 21:28:55 +08:00
Anthony Calosa
473cd7cfe0 Merge branch 'master' into 'master' 
Announce non doublefaced transform cards only

See merge request core-developers/forge!5564
 2021-10-16 13:24:30 +00:00
Anthony Calosa
c7864ee374 Announce non doublefaced transform cards only 
Doublefaced card transformation has trigger (except daybound/nightbound) when flipping back and forth making announcement redundant.
 2021-10-16 21:23:18 +08:00
Anthony Calosa
e3a1a5b7f4 Merge branch 'master' into 'master' 
[Mobile] fix facedown splitcard showing different cardbacks when zoomed

See merge request core-developers/forge!5563
 2021-10-16 13:06:44 +00:00
Anthony Calosa
9829ed36c7 Merge remote-tracking branch 'core/master' 2021-10-16 21:05:41 +08:00
Anthony Calosa
f5b0e3d068 [Mobile] fix facedown splitcard showing different cardbacks when zoomed 2021-10-16 21:04:46 +08:00
tool4EvEr
c82826cf09 Clean up 2021-10-16 14:39:56 +02:00
Michael Kamensky
d3a94167ab Merge branch 'johnwilliams7-master-patch-23793' into 'master' 
Update Resale Promos.txt

See merge request core-developers/forge!5562
 2021-10-16 09:59:06 +00:00
John Williams
804c1c2961 Update Resale Promos.txt 2021-10-16 09:53:09 +00:00
leriomaggio
2858abd551 reworded method name 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 09:25:28 +01:00
leriomaggio
700e4f1d8e Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-16 08:58:49 +01:00
leriomaggio
842e292537 Restored mobile options for DeckImporter + setup controller game type/format too 
This commit reinstate mobile old options to select card art.
The two components setup options in controller, and their initial state depends on current Card Art Preference Settings.

Moreover, now the dialog support (small) customisation based on current Game type to allow for some automation in DeckImporter to be triggered based on "editorType".

Changes in FDeckEditor reflects this change by passing the extra parameter to the constructor, and to allow checking that current editorType is not Limited (achieved via new public static method)

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 08:56:56 +01:00
leriomaggio
eb7f3d75c3 Restored FDeckImportDialog mobile translation entries 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 08:24:49 +01:00
Anthony Calosa
aaeb387f6c Merge branch 'master' into 'master' 
[Mobile] prevent crash empty deck

See merge request core-developers/forge!5561
 2021-10-16 07:20:28 +00:00
Anthony Calosa
7a25f0b5b8 [Mobile] prevent crash empty deck 2021-10-16 15:19:33 +08:00
leriomaggio
8b58f6caa2 Restored FDeckImportDialog mobile translation entries 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 08:12:16 +01:00
Anthony Calosa
9e29e98e89 Merge branch 'master' into 'master' 
[Mobile] prevent NPE on deck import

See merge request core-developers/forge!5560
 2021-10-16 06:46:36 +00:00
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