Commit Graph

3490 Commits

Author SHA1 Message Date
Anthony Calosa
deb0d7e2f1 Fix CardArtCache,LoadingCache Dispose Textures 2020-05-11 10:22:13 +08:00
CCTV-1
e0b61e7453 Merge remote-tracking branch 'upstream/master' 2020-05-10 16:36:25 +08:00
Hans Mackowiak
4047dfe727 InputPayMana: fix ManaInput Dialog using getAbilityToPlay 2020-05-05 01:57:31 +00:00
Hans Mackowiak
18154ca0b7 DealDamage: add ExcessDamage 2020-05-04 14:04:02 +00:00
Hans Mackowiak
eb0a30f013 TriggerDiscardAll: new trigger for Rielle, the Everwise 2020-04-30 09:50:55 +00:00
Anthony Calosa
c5aa8cfae7 Fix Card Display on Network Client
Adventure, Flip, Transform, Manifest, Morph etc display properly on Client Side (fix #159)
Also Fix Aura Display

I don't encounter issue #512 anyomre but I leave it open (limited testing)
2020-04-30 06:20:05 +08:00
CCTV-1
5a3db18220 Merge remote-tracking branch 'upstream/master' 2020-04-28 16:21:04 +08:00
Hans Mackowiak
1ea93a6f2e Last state land fix 2020-04-28 05:24:49 +00:00
Hans Mackowiak
c2248ef905 Game: remove SpellAbilityCache 2020-04-27 10:32:17 +00:00
Anthony Calosa
e7cbee211d Update controls 2020-04-26 18:37:10 +08:00
Anthony Calosa
a553103e39 AI vs AI match shows Match Results (mobile) 2020-04-26 17:25:44 +08:00
Anthony Calosa
d754c2c4d3 Update Win/Lose Overlay (mobile)
At the end of the match, user can minimize the overlay to see the last battlefield and browse other zones, to bring up the overlay, click game menu, and click Show WinLose Overlay.

Also fixes issue #928
2020-04-26 15:00:57 +08:00
Anthony Calosa
8acb143fea Improve Online Lobby (Mobile port) 2020-04-21 17:52:05 +08:00
Anthony Calosa
3cdbf3eb67 Update FControlGameEventHandler
some method don't exist on mobile port and are specifically for desktop so let those routine run for its specific platform
2020-04-21 17:50:25 +08:00
Michael Kamensky
4744f11e69 Merge branch 'newBranch' into 'master'
Update KeywordCard, add Flash Icon, try to prevent rotate bug

See merge request core-developers/forge!2715
2020-04-19 16:28:04 +00:00
Hans Mackowiak
ef95f02fa2 Cycling: add YouCycledThisTurn, OnlyFirst for Trigger and ValidCause for ReplaceDraw 2020-04-19 03:24:10 +00:00
CCTV-1
e85ed216be Merge remote-tracking branch 'upstream/master' 2020-04-15 13:58:10 +08:00
Anthony Calosa
102119679c Update Flash Icons
Add a helper icon for cards with flash or can be cast as though it had flash (if show ability icons is enabled)
2020-04-15 12:33:31 +08:00
Anthony Calosa
d87d825bce Network Improvements 2020-04-15 02:40:18 +00:00
Anthony Calosa
17b2a2b023 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-13 22:21:25 +08:00
Hans Mackowiak
f3729d0059 SpellAbility: fix MaxTotalTargetCMC 2020-04-13 11:57:43 +00:00
Anthony Calosa
d6c5d7f04d Network Improvements 2020-04-13 15:42:56 +08:00
Hans Mackowiak
0d1105377e SpellAbility: do xPaid inside spellAbility 2020-04-12 15:19:04 +00:00
Anthony Calosa
f68e3dee71 Fix crash for scry (desktop vs android) match 2020-04-11 17:44:30 +08:00
Anthony Calosa
7abbab5f42 Fix chooseEntitiesForEffect (Cards like Once Upon a Time, etc.. using this will work on network) 2020-04-11 15:06:00 +08:00
CCTV-1
7642d588a4 Merge remote-tracking branch 'upstream/master' 2020-04-06 18:12:05 +08:00
BlueWizard
0b5c70b4bd Start duel sound + correction in Unstable edition file (3 missing tokens) 2020-04-06 02:48:25 +00:00
Anthony Calosa
aa86f8eae3 Forge constant for close command message 2020-04-06 09:21:10 +08:00
Anthony Calosa
9edaa9561e Add Disconnect for Mobile 2020-04-06 05:02:25 +08:00
Alessandro Coli
6fd9852d42 First basic implementation.
Wild opponents are mandatory, and they always are 3.
Wild decks are read only from the quest folder.

TODO:

- to create a preference to make wild opponents optional
- to create a preference to tell how many wild opponents
- create a preference to read wild decks also from
AppData\Roaming\Forge\decks
2020-04-05 16:36:05 +02:00
Anthony Calosa
52307c02d0 Add option to turn on Experimental Network Compatibility
the user can try to turn on this option to test compatibility, defaults to OFF
2020-04-05 07:14:03 +08:00
Anthony Calosa
c714187eee Refactor Object Decoder/Encoder
Prevent crash on netplay
2020-04-05 07:07:30 +08:00
CCTV-1
9a2f2368e9 Merge remote-tracking branch 'upstream/master' 2020-04-04 16:47:07 +08:00
Anthony Calosa
da984227b1 Use Netty Default Object Decoder/Encoder 2020-04-03 21:35:05 +08:00
Anthony Calosa
bb62c0bebb Preference 2020-04-03 18:00:44 +08:00
CCTV-1
0aee987536 Merge remote-tracking branch 'upstream/master' 2020-04-02 21:32:41 +08:00
Anthony Calosa
7c9849f845 Add preference to enable/disable loading of Unknown Cards.
If a user don't wants to load a certain cards from deleted set/s in edition folder,
you can do so by disabling this option.
2020-03-31 10:54:27 +08:00
CCTV-1
040b4cf7fb Merge remote-tracking branch 'upstream/master' into display_localization_cardname 2020-03-21 22:18:46 +08:00
CCTV-1
5005cf9102 Merge remote-tracking branch 'upstream/master' 2020-03-20 11:07:17 +08:00
Hans Mackowiak
33d83dc0c5 Vote: replace hidden keywords with timestamped properties 2020-03-19 06:22:44 +00:00
Sol
62c9d187eb Merge branch 'respectbanlist' into 'master'
Respect ban list in archetype deck generation and updated deckgen data

See merge request core-developers/forge!2618
2020-03-15 01:12:03 +00:00
maustin
0bb7a84e55 Merge branch 'coremaster' into respectbanlist 2020-03-14 21:18:16 +00:00
CCTV-1
27eda6f9b2 Merge remote-tracking branch 'upstream/master' 2020-03-14 12:18:50 +08:00
Jamin W. Collins
d83f8deb7a remove vestigial scripts
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-13 18:43:06 -06:00
Jamin W. Collins
8c5a90d6e9 handle more complex imageKey parsing
Should now be able to handle:
c:Town Gossipmonger|SOI|1$alt

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-03-10 21:23:29 -06:00
Hans Mackowiak
32b56018a6 GameAction: refactor setting CastSA 2020-03-10 07:13:04 +01:00
CCTV-1
a527211bcf translate AutoUpdater 2020-03-09 20:15:36 +08:00
CCTV-1
c769a8adcf Merge remote-tracking branch 'upstream/master' 2020-03-09 19:21:43 +08:00
Michael Kamensky
b9618509be Merge branch 'desktop-autoupdate' into 'master'
check for updates button

See merge request core-developers/forge!2537
2020-03-09 03:59:40 +00:00
CCTV-1
e0c9d5e6e0 Merge remote-tracking branch 'upstream/master' 2020-03-08 16:11:00 +08:00