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
Northmoc
fdec280baa turn_the_earth.txt 2021-09-12 20:41:38 -04:00
Northmoc
2a46e193f3 purifying_dragon.txt 2021-09-12 20:41:37 -04:00
Northmoc
b6c281529c dawnhart_wardens.txt 2021-09-12 20:41:37 -04:00
Northmoc
e4cd251a4b voldaren_ambusher.txt (Suthro) 2021-09-12 20:41:36 -04:00
Northmoc
8257f16a5d ghoulcallers_harvest.txt 2021-09-12 20:41:36 -04:00
Northmoc
bd3ca5115b fleshtaker.txt 2021-09-12 20:41:35 -04:00
Northmoc
2bf4821b8e unnatural_growth.txt 2021-09-12 20:41:35 -04:00
Northmoc
fcd29e27be diregraf_rebirth.txt 2021-09-12 20:41:35 -04:00
Northmoc
074439200f croaking_counterpart.txt 2021-09-12 20:41:34 -04:00
Northmoc
accd7c667e minor typos 2021-09-12 20:40:37 -04:00
Northmoc
daa3a66d5e minor typos 2021-09-12 20:40:37 -04:00
Northmoc
901b715947 fix SpellDesc 2021-09-12 20:40:36 -04:00
tool4EvEr
819c92c28a Follow up fixes 2021-09-12 21:08:23 +02:00
leriomaggio
60a1e1975a FIX full localisation support for V|CStatistics 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 19:55:32 +01:00
leriomaggio
5f46af3fd1 Support for Deck Section highlight in Deck Import following XMage integration 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 18:31:30 +01:00
leriomaggio
ab0b964772 Full support to XMage format recognition with tests 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 18:30:59 +01:00
Michael Kamensky
fdc387245b Merge branch 'hiddenKeywords' into 'master' 
Card: refactor hidden keywords into Table Structure

See merge request core-developers/forge!5271
 2021-09-12 15:48:35 +00:00
Hans Mackowiak
bfc938be57 Card: refactor hidden keywords into Table Structure 2021-09-12 15:48:34 +00:00
Michael Kamensky
5ec5cf0a96 Merge branch 'master' into 'master' 
Added puzzles PS_AFR2 - PS_AFR4. Updated GameState to support PS_AFR3, renamed PS_AFR1.

See merge request core-developers/forge!5334
 2021-09-12 15:46:24 +00:00
Michael Kamensky
49ea4b99e7 - Added puzzles PS_AFR2 - PS_AFR4. 
- Tweaked GameState to allow precasting spells from alternate card faces.
- Renamed puzzle PS_AFR1.
 2021-09-12 18:45:13 +03:00
Michael Kamensky
15f1526d95 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-09-12 17:43:54 +03:00
leriomaggio
5beb350faf Support for DeckNames as in NetDecks with brackets and hashtags 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 11:42:10 +01:00
Michael Kamensky
83a7cc8a3e Merge branch 'Meerkov-master-patch-85773' into 'master' 
AI Ban Camouflage

See merge request core-developers/forge!5331
 2021-09-12 10:07:18 +00:00
Michael Kamensky
3d830f532e Merge branch 'fireball' into 'master' 
Fix Fireball

Closes #1970

See merge request core-developers/forge!5333
 2021-09-12 10:06:38 +00:00
leriomaggio
014783dfbe Added planes deck section to nonCardToken recognition (left out by mistake) 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
 2021-09-12 11:06:07 +01:00
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