external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 34 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

53916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
0c7b0621cd note for mobile version pref handling 2021-09-30 12:53:59 -04:00
Michael Kamensky
e131ad1f2c Merge branch 'master' into 'master' 
Fix imports.

See merge request core-developers/forge!5486
 2021-09-30 16:25:41 +00:00
Michael Kamensky
e02168b3e4 - Fix imports. 2021-09-30 19:25:14 +03:00
Northmoc
36a8c93bc8 setting up the pref 2021-09-30 12:21:52 -04:00
Northmoc
d4e0202e20 ForgePreferences 2021-09-30 12:21:51 -04:00
Austere Grim
2e27a95f3e Update forge-gui/src/main/java/forge/sound/MusicPlaylist.java 2021-09-30 16:20:15 +00:00
Anthony Calosa
080bd7324b Merge branch 'master' into 'master' 
Add Foretold Event

See merge request core-developers/forge!5483
 2021-09-30 13:48:46 +00:00
Anthony Calosa
54ee4d451e Merge remote-tracking branch 'remotes/core/master' 2021-09-30 21:46:47 +08:00
Anthony Calosa
ca3e19c289 Add Foretold Event 
When a player foretolds a card, the exile is shown
 2021-09-30 21:45:40 +08:00
Michael Kamensky
abf498f746 Merge branch 'klaxnek-master-patch-82600' into 'master' 
Update es-ES.properties (translated lblShowBattlefield)

See merge request core-developers/forge!5481
 2021-09-30 12:44:29 +00:00
Michael Kamensky
8a31f74bdf Merge branch 'languageinnistrad' into 'master' 
Updated card translations (Innistrad)

See merge request core-developers/forge!5482
 2021-09-30 12:44:25 +00:00
klaxnek
11fb7fd296 Updated card translations (Innistrad) 2021-09-30 14:14:14 +02:00
klaxnek
c63519b644 Update es-ES.properties (translated lblShowBattlefield) 2021-09-30 10:14:31 +00:00
leriomaggio
c3f2c820be Re-enabled card image auto-download and better imagePanel alpha for disabled cards 
CardPicturePanel now supports back auto-download of card image whenever a placeholder image is being used. This has been enabled for PaperCard instances only, and currently being activated from DeckImport UI. This change won't affect in any way the deck editor as card image is being downloaded from catalog.

Also, the alpha level set to image panel has been now set to 0.5 to control grey-coloured overlay.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-30 07:06:05 +01:00
leriomaggio
1a8347805c Improved overlay effect to display "disabled" cards 
The "disabled" card effect will be used in Deck Import to show the preview of those cards that won't be imported in the deck. The new improved overlay effect has been achieved by adding a grey colour to image with alpha.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-30 07:02:50 +01:00
Anthony Calosa
623525146f Merge branch 'master' into 'master' 
[Mobile] Disable mouse events for Android

See merge request core-developers/forge!5480
 2021-09-30 05:49:14 +00:00
Anthony Calosa
cbaaf381ed Merge remote-tracking branch 'remotes/core/master' 2021-09-30 13:47:52 +08:00
Anthony Calosa
e06a97a6db [Mobile] Disable mouse events for Android 
- should have a mouse hotplug detection
 2021-09-30 13:47:19 +08:00
leriomaggio
7be8c1bf2a New method in ImageCache to get the full info of a card original image (img + is_placeholder) 
ImageCache now includes a new method to get the full info pair (image, placeHolderFlag) when retrieving a card image.
This will be used in CardPicturePanel to re-enable support for auto-download now that default image is not being used anymore.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-30 06:36:32 +01:00
Michael Kamensky
9438299590 Merge branch 'master' into 'master' 
ChangeZoneAi: don't return a legend to the battlefield if another is already present.

See merge request core-developers/forge!5479
 2021-09-30 05:28:53 +00:00
Michael Kamensky
cd0659d518 - ChangeZone: don't return a legend to the battlefield if another is already present. 2021-09-30 08:28:11 +03:00
Michael Kamensky
52c78eca90 Merge branch 'master' into 'master' 
[Mobile] Only respond to abilities on stack with Y/N keyboard shortcuts

See merge request core-developers/forge!5478
 2021-09-30 05:12:23 +00:00
Michael Kamensky
4d95708065 - [Mobile] Only respond to abilities on stack with Y/N keyboard shortcuts 2021-09-30 08:11:51 +03:00
Michael Kamensky
1319c90c8b Merge branch 'master' into 'master' 
Basic support for auto-yield keyboard shortcuts on mobile Forge (Y / N)

See merge request core-developers/forge!5477
 2021-09-30 04:51:14 +00:00
Michael Kamensky
d1af3ccd4d - Minor clarification for Y/N shortcuts. 2021-09-30 07:50:59 +03:00
Michael Kamensky
a3e5ae1999 - Basic support for auto-yield keyboard shortcuts on mobile Forge (Y / N) 2021-09-30 07:48:04 +03:00
Anthony Calosa
bea555ce0f Merge branch 'master' into 'master' 
[Mobile] minor update

See merge request core-developers/forge!5476
 2021-09-30 04:26:45 +00:00
Anthony Calosa
ac10b94412 [Mobile] Remove unsupported libs 
As of LibGDX 1.10.0, armeabi support is dropped (android ARMv5). https://libgdx.com/news/2021/04/the-ultimate-migration-guide
 2021-09-30 12:23:39 +08:00
Anthony Calosa
4f8fb837e6 Merge remote-tracking branch 'remotes/core/master' 2021-09-30 12:20:02 +08:00
Anthony Calosa
100eb19bd1 [Mobile] Update LobbyScreen 
-switch places of variants and players combo boxes for landscape layout
 2021-09-30 12:15:31 +08:00
Michael Kamensky
d97f3cdd9f Merge branch 'master' into 'master' 
Drop the Alpha bs on Mobile Forge (hasn't been true for a long time)

See merge request core-developers/forge!5475
 2021-09-30 04:13:25 +00:00
Michael Kamensky
77ed2db604 - Drop the Alpha bs on Mobile Forge (hasn't been true for a long time) 2021-09-30 07:12:55 +03:00
Michael Kamensky
0ed61fcee7 Merge branch 'draw_reveal' into 'master' 
tweak Sindbad effect to reveal drawn to player before discard

See merge request core-developers/forge!5473
 2021-09-30 03:42:18 +00:00
Anthony Calosa
e4c720e8c2 Merge branch 'master' into 'master' 
[Mobile] Fix cards hovered on MatchScreen

See merge request core-developers/forge!5474
 2021-09-30 00:51:28 +00:00
Anthony Calosa
c943386ca8 [Mobile] Fix cards hovered on MatchScreen 2021-09-30 08:49:15 +08:00
Northmoc
cf2086a79b tweak Sindbad effect to reveal drawn to player before discard 2021-09-29 19:35:42 -04:00
Michael Kamensky
f33010b9d7 Merge branch 'twosat-master-patch-61985' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5472
 2021-09-29 19:03:06 +00:00
Andreas Bendel
1a8ab764fe Update de-DE.properties 
translated lblShowBattlefield
 2021-09-29 18:47:06 +00:00
Anthony Calosa
82e163aa95 Merge branch 'master' into 'master' 
[Mobile] reset hovered when mouseMoved

See merge request core-developers/forge!5471
 2021-09-29 12:11:18 +00:00
Anthony Calosa
4939e18d2c [Mobile] reset hovered when mouseMoved 2021-09-29 20:10:19 +08:00
Michael Kamensky
b3d0e1c81d Merge branch 'custom-sound-fx' into 'master' 
Auto-detect custom sound files for cards if they exist

See merge request core-developers/forge!5468
 2021-09-29 11:01:14 +00:00
Michael Kamensky
3458a3adea Merge branch 'master' into 'master' 
[Mobile] enable mouseMoved and update some selectable element

See merge request core-developers/forge!5470
 2021-09-29 10:44:33 +00:00
Michael Kamensky
a367d6dbc4 Merge branch 'pir' into 'master' 
Fix AssignGroup skipping triggers

See merge request core-developers/forge!5469
 2021-09-29 09:50:28 +00:00
Anthony Calosa
660d827c54 [Mobile] enable mouseMoved and update some selectable element 2021-09-29 17:42:03 +08:00
TRT
cc2cb8cdd1 Fix AssignGroup skipping triggers 2021-09-29 11:26:42 +02:00
leriomaggio
3e3cdc6808 Remove duplicated code to align all card tokens to have the same message. 
All card tokens (those having an instance of PaperCard set) now share the same message with no code duplication.
The message has been also update - and so corresponding tests - to include set code in square brackets, and collector number (identified by sharp symbol).
This change will also simplify token formatting in Deck import.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-29 08:03:39 +01:00
leriomaggio
1020c8d0f0 Added support for "include BnR" check from UI 
Now statistics do also support to account for any "Limited Card"-Type token found in the list, if the flag to include them is set to true.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-29 07:34:25 +01:00
leriomaggio
c9faba36a9 Change to isCardType Matching: from contains to startswith 
This is to avoid matching things like "island" as a "land" card type token

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-29 07:30:55 +01:00
Michael Kamensky
0454786545 - Auto-detect custom sound files for cards if they exist. 2021-09-29 09:30:53 +03:00
Michael Kamensky
9a7fe7c4f0 Merge branch 'tapcap' into 'master' 
Fix some tap-related capitalization issues

See merge request core-developers/forge!5463
 2021-09-29 03:49:05 +00:00