Commit Graph

2272 Commits

Author SHA1 Message Date
Hans Mackowiak
2a7db08900 removes compatqual.NullableDecl 2022-03-21 12:34:20 +00:00
Hans Mackowiak
c8e5a02487 Sentry upgrade 2022-03-21 05:11:36 +00:00
Michael Kamensky
6e5df41780 Merge branch 'master' into 'master'
Added NEO/NEC achievements by Marek14.

See merge request core-developers/forge!6393
2022-03-12 19:01:07 +00:00
Anthony Calosa
368acd1c59 [Mobile] Update netcode, fix swapped players
-update CObjectInputStream to use DecompressibleInputStream method
2022-03-08 10:43:53 +08:00
Michael Kamensky
5142549c0d [maven-release-plugin] prepare for next development iteration 2022-03-06 20:30:40 +03:00
Michael Kamensky
587539290c [maven-release-plugin] prepare release forge-1.6.48 2022-03-06 20:30:23 +03:00
Paco Ito
6b24d956f6 feat: make icons scale using SCALE_SMOOTH 2022-02-23 19:52:41 +00:00
Anthony Calosa
1eb4aa5647 Draft Ranking on ImageView
- add an option to show draft card rankings
2022-02-11 14:12:44 +08:00
Tim Mocny
a7f2d8f31e add new Phyrexian/color pair hybrid mana shards 2022-02-11 04:23:04 +00:00
Sol
ba45327912 Merge branch 'paco_unifiedaihintrender' into 'master'
Unified Deck AI Hints

See merge request core-developers/forge!6113
2022-02-03 17:42:09 +00:00
Paco Ito
cde80c9c6e Unified Deck AI Hints 2022-02-03 17:42:08 +00:00
tool4EvEr
63ca64c4cc WithCounters$ -> WithCountersType$ 2022-02-02 21:10:37 +01:00
tool4EvEr
d27552dd25 Clean up 2022-02-01 17:51:19 +01:00
Paco Ito
0a396a44d8 [Desktop] Display which DeckZone the unplayable cards are from 2022-01-29 05:24:16 +00:00
Tim Mocny
fbb7308747 Revert "Merge branch 'paco-aicannotplaybyarea' into 'master'"
This reverts merge request !6085
2022-01-27 21:48:54 +00:00
Paco Ito
2493b08093 [Desktop] Display which DeckZone the unplayable cards are from 2022-01-27 05:08:33 +00:00
Michael Kamensky
70c1e39e2a Merge branch 'assignattackers' into 'master'
Add Skip button to allow arbitrary order when assigning attackers dmg

Closes #2059

See merge request core-developers/forge!6050
2022-01-16 17:46:49 +00:00
tool4EvEr
9e8d366026 Add Skip button to allow arbitrary order when assigning attackers dmg 2022-01-16 11:43:20 +01:00
pakoito
c15109da30 Add cmd file 2022-01-14 17:40:29 +01:00
TRT
94f54f8e71 Fix crash when assigning damage to defender 2022-01-12 13:57:50 +01:00
Bug Hunter
151742f4fd Fix War's Toll + Dueling Grounds 2022-01-12 05:05:24 +00:00
Anthony Calosa
1a57684a44 Disable missingcards cache for desktop
- for compatibility with autodownloader
2022-01-09 19:06:26 +08:00
tool4EvEr
c09301bcea Fix getLethalDamage 2022-01-06 15:43:44 +01:00
Michael Kamensky
f61e4c610f [maven-release-plugin] prepare for next development iteration 2021-12-29 09:09:22 +03:00
Michael Kamensky
08efcfbf79 [maven-release-plugin] prepare release forge-1.6.47 2021-12-29 09:09:11 +03:00
Hans Mackowiak
f2d77ab77b ReplaceAddCounter: do adding multiple counters as one replacement 2021-12-26 16:11:35 +01:00
tool4EvEr
68fe6ec7e3 Remove some redundancy 2021-12-15 22:14:56 +01:00
Hans Mackowiak
aa6f2e3b6c Cost: rework param that says if it's by effect or by Spell/ActivatedAbility cost 2021-12-12 05:36:39 +00:00
Michael Kamensky
67072c96cd Merge branch 'bo1' into 'master'
Add "best of 1 (or 5)" option to Constructed

See merge request core-developers/forge!5871
2021-11-25 18:18:48 +00:00
Northmoc
eecb7a120e VLobby - add option for # of matches 2021-11-22 15:50:05 -05:00
leriomaggio
6c8427bfe6 Updated Oracle for MaxArtCount test for Island
This time the test consider a lower-bound to avoid similar cases in the future :)
2021-11-19 19:18:20 +00:00
Hans Mackowiak
53b000515b Token Scripts: add Token to Name 2021-11-19 10:26:46 +01:00
Northmoc
e141ceb3c3 add VOW/VOC to formats 2021-11-15 11:48:01 -05:00
Michael Kamensky
299e737716 [maven-release-plugin] prepare for next development iteration 2021-11-15 07:33:57 +03:00
Michael Kamensky
13b1a4150c [maven-release-plugin] prepare release forge-1.6.46 2021-11-15 07:33:45 +03:00
Anthony Calosa
bc02725dcf update name
- -old.exe to -java8.exe
2021-11-10 07:19:07 +08:00
Anthony Calosa
6454fd579d Add "Deck: " string for deck export
- fixes exporting a deck and re importing
2021-11-09 22:04:58 +08:00
Anthony Calosa
40d7b89823 Update minimum Java version for Forge Desktop executable
- forge.exe and forge-adventure.exe needs at least Java 11.0.1
- for Java 8, user should use forge-old.exe for Forge Desktop, and forge-adventure-old.exe for Forge Adventure
2021-11-09 21:46:42 +08:00
Anthony Calosa
d5462db931 unused import 2021-11-09 13:42:14 +08:00
Michael Kamensky
dafee0535f Merge branch 'daynight' into 'master'
Move daynight prompt where it should be

See merge request core-developers/forge!5765
2021-11-09 03:53:28 +00:00
friarsol
bbbf7ec53c Move daynight prompt where it should be 2021-11-08 22:08:34 -05:00
leriomaggio
e86745fb34 Merge remote-tracking branch 'upstream/master' into smart-card-art-deck-import-desktop-and-mobile 2021-11-08 07:20:07 +00:00
Michael Kamensky
d942f89162 - Add support for multiple music sets. 2021-11-04 08:09:36 +03:00
leriomaggio
9f563616e4 Card Art optimisation algorithm for DeckImport
The card art optimisation algorithm integrated into DeckImportController leverages (in terms of general logic) on the card art optimisation in Deck.
However, several are differences in terms of context and interactions so a specialised implementation is needed.

First, the smart card art optimisation has been added as an option in DeckImport. Therefore, smart card art is not a static game option to be used when loading decks with cards with no edition, but also as an option to tweak the deck list.

The second specialisation required is that this implementation takes into account any game format constraint (in terms of allowed sets for optimisation).

Last but not least, the current deck in editor (if any) will be also considered during optimisation.
In particular, when _importing cards_ in current deck (therefore, when not creating a new deck with the deck list) will also take into account the pools of current deck so that harmonisation will already consider where cards will be imported to.
2021-11-03 16:46:30 +00:00
leriomaggio
3184f90e62 Created new method in DeckController to return current deck in editor.
This method will be invoked by DeckImport (desktop) to pass on current deck in editor (if any) to the DeckImportController.

This deck will be eventually used as part of the smart card optimisation.
2021-11-03 16:39:51 +00:00
Michael Kamensky
bd0191e63e Merge branch 'sound-profiles' into 'master'
Selectable sound sets

See merge request core-developers/forge!5724
2021-11-03 10:08:09 +00:00
Michael Kamensky
778d714ccd - Don't require restart when changing sound sets. 2021-11-03 12:27:44 +03:00
Anthony Calosa
de74c9e62d Minor Performance
- Clear image cache if necessary (prevent clearing if the downloaded data is not image)
- Cache missing cards (prevent finding missing cards unless the user has fetched/downloads an image)
- Clear preselected options for New Gauntlet Match (easier to filter decks for Gauntlet)
2021-11-03 15:50:07 +08:00
Michael Kamensky
a4c21c623f - Fix imports.
- Add the sound set announcement and a couple other announcements as well.
2021-11-03 09:39:46 +03:00
Michael Kamensky
61ce25f2dd - Change the name "sound profile" to "sound set", which makes more sense.
- Reset to Default profile in absence of custom sound sets.
2021-11-03 09:33:01 +03:00