external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,180 Commits 32 Branches 187 Tags
d5d70b51a7f141091a1047be1d8a37dffc2d00f6
Commit Graph

2914 Commits

Author SHA1 Message Date
Anthony Calosa
0097b66cd6 [Mobile] fix NPE 2022-01-18 07:17:23 +08:00
tool4EvEr
9e8d366026 Add Skip button to allow arbitrary order when assigning attackers dmg 2022-01-16 11:43:20 +01:00
Anthony Calosa
e212502646 [Mobile] Crash Fix on Loading New Game 
- fix #2046
 2022-01-14 13:57:01 +08:00
Anthony Calosa
1a57684a44 Disable missingcards cache for desktop 
- for compatibility with autodownloader
 2022-01-09 19:06:26 +08:00
Michael Kamensky
3bd19eeee3 - Prepare Forge for Android publish 1.6.47.001 [incremental] 2021-12-29 09:29:47 +03: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
Anthony Calosa
5b76f355ea [Mobile] Support for highlighted players 
- Draws rectangle outline on the Player Avatar (uses same color outline with highlighted cards)
 2021-12-21 06:40:47 +08:00
Grimm
58eded5d09 Added 2 small poi 
fixed some crashes in the item view
 2021-12-07 23:03:40 +01:00
Anthony Calosa
de12d3abd4 [Mobile] Fix crash 2021-12-03 00:04:21 +08:00
Anthony Calosa
85393862e1 [Mobile] Fix portrait layout for variant selection 2021-11-27 12:10:54 +08:00
Anthony Calosa
0145bb9470 [Mobile] Add "Match: Number" Selection 2021-11-27 11:20:20 +08:00
Anthony Calosa
dac5d73955 [Mobile] Fix planar conquest deck edit 2021-11-22 10:31:53 +08:00
Grimm
87337def2e Added Shop to the Inn screen 2021-11-19 02:40:50 +01:00
Grimm
ca56e1bb4e Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-11-18 02:27:16 +01:00
Grimm
c47af43006 Added multiple decks in adventure. 
Adjusted deck editor to enable usage in adventure mode.
Fixed a crash after a match.
 2021-11-18 02:27:01 +01:00
Michael Kamensky
d45d34dae2 - Prepare Forge for Android publish 1.6.46.001 [incremental]. 2021-11-15 07:56:12 +03: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
Michael Kamensky
e9b329523e - Try-catch in ItemManager to catch odd flukes in the form of unreproducible NPEs when removing stuff in deck editors (as recommended by Kev). 2021-11-11 08:11:16 +03: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
Grimm
bcb7bd9a98 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-11-09 00:50:42 +01:00
Grimm
eba6430713 Fixed major tread bug in adventure matches 
Changed save file structure for adventure
Changed startup for the main adventure class to support more standard feature
fixed some configuration in the adventure files
 2021-11-08 23:26:03 +01: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
564873d05d Merge branch 'backport-rightclick' into 'master' 
Implement right clicking to zoom in mobile backport (desktop use only).

See merge request core-developers/forge!5752
 2021-11-08 04:13:19 +00:00
Michael Kamensky
8ff377444a - Implement right clicking to zoom in mobile backport (desktop use only). 2021-11-08 07:12:16 +03:00
leriomaggio
c0c2f024cf Since callback is not fed into constructor anymore, making sure to avoid any NPE 2021-11-04 07:29:30 +00:00
leriomaggio
34449ffc64 Import/Replace deck after import in Deck Editor 
The editor has been slightly change to support the new modality in deck Importer to replace/import cards into current deck (if any).
Also, this commit fixes a bug also considering deck name to be replaced if deck from importer has a name.

To do so, the DeckImport won't take the callback to run directly into the constructor, but the callback will be fed into with a separated method. This is because the callback would need to access the dialog instance to access which option was selected by the user about replace/import.
 2021-11-04 07:27:34 +00:00
leriomaggio
b069c19452 Extended DeckImport on mobile to support smart card art and crete/import deck 
The mobile deck importer has been extended by adding two new options for smart card art selection, and to decide whether decklist should import or replace current deck (if any).
 2021-11-04 07:24:25 +00:00
Michael Kamensky
d942f89162 - Add support for multiple music sets. 2021-11-04 08:09:36 +03: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
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
Michael Kamensky
74fbb1ed57 - Mobile settings for the sound profile. 
- Tweaked the sound profile setting hint.
 2021-11-03 09:14:57 +03:00
Michael Kamensky
238a3ea17a - Initial implementation of sound profiles, part 1. 2021-11-03 08:49:52 +03:00
leriomaggio
3cbd974f18 Renamed method to bluntly optimise all card art in Main (used on Mobile) 
Renamed method only to make it more clearly distinguishable from other internal method for card optimisation.
 2021-11-02 17:49:22 +00:00
Anthony Calosa
cb0101fc52 [Mobile] Auto optimize card art when importing 2021-10-30 04:58:45 +08:00
Anthony Calosa
88dac20908 [Mobile] Display cards that cannot be imported on Deck Import Dialog 2021-10-30 03:30:06 +08:00
TRT
cbbdd8584c Fix NPE when trying to remove card 2021-10-27 01:12:17 +02:00
Anthony Calosa
6179c991a0 fix NPE 2021-10-21 12:18:24 +08:00
Anthony Calosa
8c438261dc [Mobile] Prevent Card Animations when FScrollPane is moving 
- cleaner looks when the user is scrolling through the cards
 2021-10-21 10:10:38 +08:00
Grimm
49f7128240 Restore the adventure merge 
This reverts commit e69cf66ec8.
 2021-10-20 04:54:01 +00:00
Michael Kamensky
87521416b2 Merge branch 'deck-importer-decks-file-format' into 'master' 
NEW Deck Importer

See merge request core-developers/forge!5296
 2021-10-16 16:47:29 +00:00
Michael Kamensky
2129a1dcf2 - Prepare Forge for Android publish 1.6.45.001 [incremental]. 2021-10-16 19:01:47 +03:00
Michael Kamensky
5520cd2a67 [maven-release-plugin] prepare for next development iteration 2021-10-16 18:52:21 +03:00
Michael Kamensky
340a6b2af5 [maven-release-plugin] prepare release forge-1.6.45 2021-10-16 18:52:12 +03: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
f5b0e3d068 [Mobile] fix facedown splitcard showing different cardbacks when zoomed 2021-10-16 21:04:46 +08:00
leriomaggio
2858abd551 reworded method name 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-10-16 09:25:28 +01:00