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,641 Commits 34 Branches 187 Tags
c1a56f95d21a0cf014d6d8facce8b45e45a729ca
Commit Graph

53641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
fc1a291bdc Merge branch 'master' into 'master' 
Fix local Multiplayer Phase Indicator

See merge request core-developers/forge!5491
 2021-10-03 04:32:42 +00:00
Michael Kamensky
fbb7ce8938 Merge branch 'npe' into 'master' 
Fix NPE when attaching aura with Genesis Hydra

See merge request core-developers/forge!5488
 2021-10-03 04:32:21 +00:00
Anthony Calosa
64c7e5b5cb update empty stack not hidden on local multiplayer 2021-10-03 11:32:48 +08:00
tool4EvEr
50c5d479e6 copyLastState must happen before any move 2021-10-02 21:52:01 +02:00
leriomaggio
88ec398e8c Changed API to make isSectionImportable public rather than protected 
This is to allow DeckImport to get all the supported DeckSections in current editor, without relying on using the content of the cbxSection dropdown UI component.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-02 08:27:27 +01:00
leriomaggio
f065d460c3 Updated Parameter cast to pass in DeckImport Constructor 
DeckImport will now get an instance of the CDeckEditor rather than the more generic ACEditorBase.
This is to allow more refined access to methods. Also, all lives in forge-gui-desktop, therefore there should be no conflict with mobile app ui.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-02 08:25:47 +01:00
leriomaggio
08ca0bf175 Improved implementation of DeckSection Matching 
Previous implementation was lacking to check for commander section, plus re-used the code of validators. This one is a refined and refactored implementation.

Note: as default, the method will always return Main, as there is no possibility, in general, to say whether Sideboard should be preferred instead - without any other knowledge about the deck.
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-02 07:38:17 +01:00
Anthony Calosa
3bf4c33044 Fix local Multiplayer Phase Indicator 2021-10-02 13:56:40 +08:00
Michael Kamensky
2cec5db777 Merge branch 'twosat-master-patch-24386' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5490
 2021-10-02 03:52:32 +00:00
Andreas Bendel
13e1840da0 Update de-DE.properties 
GrayText translation
 2021-10-01 21:02:52 +00:00
Michael Kamensky
10a21fb1a6 Merge branch 'johnwilliams7-master-patch-48251' into 'master' 
Update Pro Tour Promos.txt

See merge request core-developers/forge!5489
 2021-10-01 20:27:47 +00:00
John Williams
356e9ff477 Update Pro Tour Promos.txt 2021-10-01 19:57:12 +00:00
Michael Kamensky
bb421ea2e6 Merge branch 'gray_text' into 'master' 
Gray text preference

See merge request core-developers/forge!5485
 2021-10-01 17:09:36 +00:00
tool4EvEr
c1fa46df39 Fix NPE when attaching aura with Genesis Hydra 2021-10-01 18:51:14 +02:00
leriomaggio
65b7df63f7 Extended support to log both unknown and unsupported cards. 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-01 17:00:47 +01:00
Michael Kamensky
f452e86221 Merge branch 'aifix' into 'master' 
EffectAi: fix logic for targeting spells for prevent

See merge request core-developers/forge!5487
 2021-10-01 14:54:31 +00:00
tool4EvEr
9a4b60aaf5 Fix targeting 2021-10-01 16:32:47 +02:00
tool4EvEr
781de0fd5a Clean up 2021-10-01 16:28:03 +02:00
Michael Kamensky
cda73ae992 Merge branch 'austeregrim-add-m4a-music-filter' into 'master' 
Update forge-gui/src/main/java/forge/sound/MusicPlaylist.java

See merge request core-developers/forge!5484
 2021-10-01 03:42:33 +00:00
Northmoc
0d13edd84e clean up a few things 2021-09-30 22:13:19 -04:00
Northmoc
c73395e98b add prompts in all languages 2021-09-30 22:04:39 -04:00
Northmoc
c2dfde32fb implement preference in getAbilityText 2021-09-30 22:01:05 -04:00
Northmoc
aa0b390cde GameRules set up useGrayText boolean 2021-09-30 22:00:33 -04:00
Northmoc
7a86f84d0d add the pref to different rules sets 2021-09-30 22:00:02 -04:00
Northmoc
b3a7a8aecf add the pref to different rules sets 2021-09-30 21:59:45 -04:00
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