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

53916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leriomaggio
ac2c085324 Incorporating FIX to Image copy on subimage + method to reset alpha. 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-15 19:36:38 +01:00
Michael Kamensky
9deb569764 Merge branch 'mid_15' into 'master' 
MID - 15 Sep

See merge request core-developers/forge!5365
 2021-09-15 18:33:12 +00:00
Michael Kamensky
30e8327dd5 Merge branch 'formats_update' into 'master' 
MID formats update

See merge request core-developers/forge!5368
 2021-09-15 18:32:56 +00:00
Michael Kamensky
ae75b54ade Merge branch 'MID_MIC_cards' into 'master' 
MIC/MID cards 15 Sep

See merge request core-developers/forge!5366
 2021-09-15 18:32:29 +00:00
Northmoc
559dd9581e mask_of_griselbrand.txt add AI hint 2021-09-15 13:48:15 -04:00
Northmoc
9447230406 mask_of_griselbrand.txt 2021-09-15 13:47:39 -04:00
Northmoc
beecd0eb4e clean up unicycle.txt 2021-09-15 13:47:06 -04:00
Northmoc
489062390b normalize "*+" for Consuming Blob and token 2021-09-15 13:32:32 -04:00
Northmoc
38934bfce4 consuming_blob.txt and token 2021-09-15 13:32:03 -04:00
paul_snoops
97585b37a1 fixes 2021-09-15 18:15:17 +01:00
paul_snoops
44ab79ae80 MID formats update 2021-09-15 17:53:03 +01:00
Northmoc
eb72996822 rise_of_the_ants.txt and token 2021-09-15 12:49:22 -04:00
paul_snoops
44fa10eeff MIC/MID cards 15 Sep 2021-09-15 15:05:46 +01:00
Michael Kamensky
98301b0113 Merge branch 'patch-cardpicture-panel-image-copy-from-subimage' into 'master' 
Patch to CardPicturePanel to work on cropped Card Images

See merge request core-developers/forge!5362
 2021-09-15 13:08:01 +00:00
Bug Hunter
29ea9e2d7b Merge branch 'typo' into 'master' 
gargantuan_gorilla.txt cleanup

See merge request core-developers/forge!5363
 2021-09-15 11:35:03 +00:00
Northmoc
9f5e90cff1 ritual_of_hope.txt 2021-09-15 07:17:21 -04:00
Northmoc
84cbc4c078 gargantuan_gorilla.txt cleanup 2021-09-15 07:14:51 -04:00
Northmoc
fdd3a8fdf3 improve StackDesc sb 2021-09-15 07:11:33 -04:00
leriomaggio
62bd8efd1c Patch to CardPicturePanel to work on cropped Card Images 
BufferedImage (deep) copy procedure applied in CardPicturePanel may not always work when the input image has been originally cropped.

The issue is caused by `image.copyData(null)` which may sometimes work on the original (uncropped) underlying raster.
This patch fixes this issue!

Source: https://stackoverflow.com/a/26894825/2969461
 2021-09-15 11:46:22 +01:00
Michael Kamensky
16612a8c7a Merge branch 'MIC_edition' into 'master' 
MIC edition update

See merge request core-developers/forge!5361
 2021-09-15 10:19:20 +00:00
paul_snoops
657ff62583 MIC edition update 2021-09-15 08:46:06 +01:00
Michael Kamensky
ea5b9d9bc0 Merge branch 'mid_14' into 'master' 
MID – 14 Sep

See merge request core-developers/forge!5360
 2021-09-15 04:31:48 +00:00
Northmoc
5efb43c22e siphon_insight.txt 2021-09-14 17:19:08 -04:00
Northmoc
d2b7bd7101 dire_strain_rampage.txt 2021-09-14 17:18:36 -04:00
Michael Kamensky
c7c6343d67 Merge branch 'mid_14' into 'master' 
MID - 14 Sep

See merge request core-developers/forge!5357
 2021-09-14 20:29:27 +00:00
Michael Kamensky
8d5517ecff Merge branch 'TRT-master-patch-24147' into 'master' 
Update forge-gui/res/cardsfolder/p/pirs_whim.txt

See merge request core-developers/forge!5358
 2021-09-14 20:29:24 +00:00
Michael Kamensky
eb290dd4a9 Merge branch 'pump_sb' into 'master' 
Pump auto stackdescription sb improvements

See merge request core-developers/forge!5359
 2021-09-14 20:28:53 +00:00
Michael Kamensky
69f560d25f Merge branch 'MID_cards' into 'master' 
MID 13 Sep

See merge request core-developers/forge!5346
 2021-09-14 20:28:37 +00:00
paul_snoops
d5fa07ebe4 delete blessed_defiance.txt for another MR once working 2021-09-14 21:21:33 +01:00
paul_snoops
991b0783b8 fixes 2021-09-14 21:19:47 +01:00
paul_snoops
8089224fe7 fixes 2021-09-14 21:19:47 +01:00
paul_snoops
521dcdca75 fixes 2021-09-14 21:19:47 +01:00
paul_snoops
76fd4a754d MID 13 Sep 2021-09-14 21:19:46 +01:00
Bug Hunter
a82bb3b075 Merge branch 'moonveil' into 'master' 
MID: Moonveil Regent

See merge request core-developers/forge!5353
 2021-09-14 17:57:20 +00:00
Northmoc
cac9d8fbf0 moonveil_regent.txt 2021-09-14 13:52:34 -04:00
Northmoc
1c6a460d93 corrections for 1 or 2 keywords 2021-09-14 13:41:58 -04:00
Northmoc
32a14fa82a Pump auto stackdescription sb improvements 2021-09-14 13:25:17 -04:00
Northmoc
c0727134d2 flare_of_faith.txt 2021-09-14 13:24:08 -04:00
Bug Hunter
91dfad9c9f Update forge-gui/res/cardsfolder/p/pirs_whim.txt 2021-09-14 14:55:56 +00:00
Northmoc
29c8a6dba2 rootcoil_creeper.txt 2021-09-14 10:30:29 -04:00
Northmoc
b3edb1b0a4 grizzly_ghoul.txt 2021-09-14 10:19:23 -04:00
Michael Kamensky
f2c3d3cd27 Merge branch 'hanmac-isTriggerRemembered' into 'master' 
CardProperty: add isTriggerRemembered

See merge request core-developers/forge!5355
 2021-09-14 10:50:38 +00:00
Michael Kamensky
cb851dd099 Merge branch 'TRT-master-patch-26956' into 'master' 
Update forge-gui/res/cardsfolder/m/maskwood_nexus.txt

See merge request core-developers/forge!5356
 2021-09-14 10:50:12 +00:00
Bug Hunter
660ffadda2 Update forge-gui/res/cardsfolder/m/maskwood_nexus.txt 2021-09-14 08:25:30 +00:00
Hans Mackowiak
f3799d3982 CardProperty: add isTriggerRemembered 2021-09-14 07:51:33 +00:00
leriomaggio
c732289690 Updates to DeckRecognizer (& tests) by using the new methods from StaticData 
(Any reference to CardDb has been dropped, along with corresponding card fetching methods).

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-14 08:18:24 +01:00
leriomaggio
82372ec5ba New methods to retrieve cards from all supported databases. 
The API now includes three new methods to proxy card requests to any available database of cards. These methods are currently used by the DeckRecognizer to match any card request from the Deck Importer - so the API adapts to those particular use cases.
However, method signatures are general enough to be further used elsewhere in forge, if necessary.

The first immediate advantage here is that with this addition, Deck Import automagically extends support to also including custom cards.
Moreover, this avoids DeckRecognizer to have lower-level references to CardDb - therefore, better encapsulation so that any DB interaction is correctly proxied by StaticData.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-14 08:13:25 +01:00
leriomaggio
d03bdb2773 Disabled benchmark tests to exclude in battery 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-14 07:57:13 +01:00
leriomaggio
9562064213 Updated (w/ tests) behaviour for compose with foil request, when input card Name is or isn't foil already 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-14 07:56:33 +01:00
Michael Kamensky
41725e7e9f Merge branch 'flash_format' into 'master' 
some keyword formatting updates

See merge request core-developers/forge!5350
 2021-09-14 03:54:44 +00:00