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

53641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leriomaggio
95f1d6df07 Updated Card Tokens (with test) to retain cards even if not legal. 
This will be now used in DeckImporter in combination with Card Preview.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 10:56:32 +01:00
leriomaggio
764ccd703c slightly reduce constraint on items' height 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 10:32:22 +01:00
leriomaggio
19b8865e10 New UI version with Hyperlinks and Card Preview 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 10:31:57 +01:00
leriomaggio
936bb15bf9 New methods to directly set a bufferedImage and to control alpha value of FImagePanel 
This will be used in deck import card preview (default state)

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 10:31:34 +01:00
leriomaggio
b5bb07c827 New static method to return default card image 
This will be used in deck import card preview (default state)

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 10:30:42 +01:00
leriomaggio
c0059c351f Adding support to add alpha over images (to show them as disabled) 
This will be used in deck import card preview.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 10:29:54 +01:00
leriomaggio
5400546399 Aligned with bug fixed on multipleArts with SmartCardArt 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 10:28:50 +01:00
tool4EvEr
df4c64070d Fix Fireball 2021-09-12 10:29:49 +02:00
Anthony Calosa
2e437dcbae Merge branch 'master' into 'master' 
[Mobile] Fix blinking card images while using online image fetcher

See merge request core-developers/forge!5332
 2021-09-12 07:58:05 +00:00
Anthony Calosa
6f0ba03d24 [Mobile] Fix blinking card images while using online image fetcher 
- also cache card list for faster lookup
 2021-09-12 15:52:57 +08:00
Meerkov
615ec642d2 AI Ban Camouflage 2021-09-12 06:20:52 +00:00
Michael Kamensky
8149cbb507 Merge branch 'white-corners' into 'master' 
Crop out white corners when importing images

Closes #1965

See merge request core-developers/forge!5326
 2021-09-12 03:45:15 +00:00
Michael Kamensky
410df067bd Merge branch 'TRT-master-patch-19508' into 'master' 
Update forge-gui/res/cardsfolder/r/riftmarked_knight.txt

See merge request core-developers/forge!5327
 2021-09-12 03:44:07 +00:00
Michael Kamensky
29a274ed93 Merge branch 'quick-fix-smart-card-art' into 'master' 
BUG FIX for Smart Card Art selection

See merge request core-developers/forge!5329
 2021-09-12 03:43:51 +00:00
Michael Kamensky
6f45745c6d Merge branch 'mid_10' into 'master' 
MID - 11 Sep

See merge request core-developers/forge!5330
 2021-09-12 03:42:58 +00:00
Michael Kamensky
bbbfe8ddb1 Merge branch 'cost_formats' into 'master' 
Update some cost and prompt formats

See merge request core-developers/forge!5314
 2021-09-12 03:42:37 +00:00
Michael Kamensky
d00c5c81a6 Merge branch 'ea_ae' into 'master' 
Enduring Angel // Angelic Enforcer and support

See merge request core-developers/forge!5317
 2021-09-12 03:42:11 +00:00
Northmoc
6e0b6a2b9e counter name to lower case in prompt 2021-09-11 23:13:46 -04:00
Northmoc
957e3ebfb0 Various typos and formatting fixes 2021-09-11 23:13:45 -04:00
Northmoc
cfc143f398 improve CostRemoveCounter prompt formatting 2021-09-11 23:13:45 -04:00
Northmoc
23967b3d85 improve CostRemoveAnyCounter prompt formatting 2021-09-11 23:13:44 -04:00
Northmoc
db988abb4f Change SimpleString to comma for multiple parts 2021-09-11 23:13:44 -04:00
Northmoc
60d4d14320 SetLife instead of GainLife 2021-09-11 23:12:23 -04:00
Northmoc
eb25257a18 Player.java - add replacement to loseLife 2021-09-11 23:12:23 -04:00
Northmoc
be9c1d7c91 fix desc 2021-09-11 23:12:22 -04:00
Northmoc
0df5526452 add ReplaceLifeReduced 2021-09-11 23:12:22 -04:00
Northmoc
314df20711 enduring_angel_angelic_enforcer.txt 2021-09-11 23:12:21 -04:00
Northmoc
b13f4f4ae2 faithful_mending.txt 2021-09-11 23:10:02 -04:00
Northmoc
abbe687419 vampire_socialite.txt (Suthro) 2021-09-11 23:10:02 -04:00
leriomaggio
fb092c77a4 BUG FIX for Smart Card Art selection 
This subtle bug occurred whenever the algorithm for smart card art selection wanted to add a card with multiple arts and the number of cards per art to add was not even. To avoid zeros, the cardsPerArtIndex was set at least to one, and so the rest - leading then to adding too many (extra) cards not originally present in the deck.

Thanks to @Snoops for the heads up.
 2021-09-12 00:56:44 +01:00
Bug Hunter
c03fc6cfd0 Update forge-gui/res/cardsfolder/r/riftmarked_knight.txt 2021-09-11 19:41:15 +00:00
Mark Wiggans
bcaf23c5ff Have ImageCache recognize images with white corners and crop them out 2021-09-11 11:32:37 -04:00
leriomaggio
f8d5eae4ce Removed unused import 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-11 16:03:42 +01:00
leriomaggio
0d022c0f7e Latest changes to DeckImporter UI using HTML text and Statistics borrowed from Deck Editor. 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-11 13:48:35 +01:00
leriomaggio
91246ecd83 Latest translation and UI of DeckImport (removing unused labels) 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-11 13:47:53 +01:00
leriomaggio
98dd5f4b8b Replacing "replace deck" with "create new deck" command 
The new one makes things a bit self explanatory than "replace deck" since the current deck isn't actually replaced (i.e. not eliminated).

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-11 13:46:16 +01:00
Anthony Calosa
a5aa29f65e Merge branch 'kevlahnota-master-patch-56985' into 'master' 
Update Forge.java

See merge request core-developers/forge!5325
 2021-09-11 10:25:05 +00:00
Anthony Calosa
2dd5a49e62 Update Forge.java 2021-09-11 10:23:49 +00:00
Michael Kamensky
1328b0bc7d Merge branch 'MID_update' into 'master' 
MID update

See merge request core-developers/forge!5324
 2021-09-11 09:35:46 +00:00
Michael Kamensky
def434bdb7 Merge branch 'cleanup' into 'master' 
Minor Cleanup

See merge request core-developers/forge!5322
 2021-09-11 09:35:17 +00:00
Michael Kamensky
e781825f31 Merge branch 'Meerkov-master-patch-21940' into 'master' 
Unban Orcish Artillery

See merge request core-developers/forge!5321
 2021-09-11 09:34:21 +00:00
Michael Kamensky
88658dcf87 Merge branch 'Meerkov-master-patch-67925' into 'master' 
AI Ban: False Orders

See merge request core-developers/forge!5320
 2021-09-11 09:33:57 +00:00
paul_snoops
1bb053adaf MID update 2021-09-11 10:29:04 +01:00
Anthony Calosa
5db87cf0a1 Merge branch 'master' into 'master' 
[Mobile] Disable cardBG Texture for Android 9 and below

See merge request core-developers/forge!5323
 2021-09-11 09:18:05 +00:00
Anthony Calosa
01b80cfc78 Merge remote-tracking branch 'remotes/core/master' 2021-09-11 17:14:17 +08:00
Anthony Calosa
eddbc1e94a [Mobile] Disable cardBG Texture for Android 9 and below 
on Android 10+ (4 GB RAM) it works fine however Android 9 and below with at least 4 GB RAM, it crashes at startup if it tries to read and load the big texture file. Needs investigation
 2021-09-11 17:13:20 +08:00
tool4EvEr
052b73bda2 Minor Cleanup 2021-09-11 10:26:01 +02:00
Meerkov
49fdfdbe61 Unban Orcish Artillery 2021-09-11 08:15:36 +00:00
Meerkov
cefc86b13f The AI doesn't know how to use this card, and currently it's clogging up AI decks in LEB. 2021-09-11 08:04:08 +00:00
Michael Kamensky
1e359236ae Merge branch 'master' into 'master' 
Net Decks Archive Updates

See merge request core-developers/forge!5319
 2021-09-11 03:22:13 +00:00