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

51618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
ba7f08d5ec Merge branch 'tokenset' into 'master' 
Some improvements to token image fetching (especially emblems)

See merge request core-developers/forge!5105
 2021-07-25 04:27:44 +00:00
Northmoc
222448d29c Add extra try for "setless" token image (Desktop) 2021-07-24 13:06:47 -04:00
Northmoc
377cbca39b Add extra try for "setless" token image (Android) 2021-07-24 13:06:13 -04:00
Northmoc
97225782c1 Emblems - common rarity 2021-07-24 13:05:06 -04:00
Northmoc
8b96079f6e EffectEffect add set to Emblem imagekey 2021-07-24 13:04:27 -04:00
Michael Kamensky
921369628b Merge branch 'dealdamage' into 'master' 
Fix dealDamage ignoring amount changes

See merge request core-developers/forge!5104
 2021-07-24 16:42:44 +00:00
tool4EvEr
2480296113 Fix dealDamage ignoring amount changes 2021-07-24 14:15:52 +02:00
Bug Hunter
3b357207a4 Merge branch 'import' into 'master' 
Fix imports

See merge request core-developers/forge!5103
 2021-07-24 09:27:39 +00:00
tool4EvEr
ac6219f4bd Clean up 2021-07-24 11:27:37 +02:00
Michael Kamensky
004ea04a0e Merge branch 'move-fatpacks-to-editions' into 'master' 
Move fatpacks to editions

See merge request core-developers/forge!5102
 2021-07-24 05:18:05 +00:00
Michael Kamensky
2b342d7118 Merge branch 'dungeon' into 'master' 
Add Dungeon to EditionSectionWithCollectorNumbers

See merge request core-developers/forge!5099
 2021-07-24 05:17:57 +00:00
Michael Kamensky
5645f2212e Merge branch 'predict' into 'master' 
Fix predictDamageTo

See merge request core-developers/forge!5100
 2021-07-24 05:17:23 +00:00
Michael Kamensky
e5cb062644 Merge branch 'anger' into 'master' 
Fix ReplaceDyingDefined on cards that use DamageAll effect

Closes #1938

See merge request core-developers/forge!5097
 2021-07-24 05:17:14 +00:00
Michael Kamensky
4bce4a9a84 Merge branch 'thirst' into 'master' 
Bloodchief's Thirst: improve StackDescription to show target when kicked (band-aid)

See merge request core-developers/forge!5101
 2021-07-24 05:16:21 +00:00
friarsol
da0f7ed15e Include D&D set 2021-07-23 22:49:32 -04:00
friarsol
6210fdd9fc Move FatPacks to editions file 2021-07-23 22:47:48 -04:00
Northmoc
610fe7fada - typo 2021-07-23 20:45:29 -04:00
Northmoc
4108b56135 serpentine_spike.txt tidy up StackDesc 2021-07-23 20:40:37 -04:00
tool4EvEr
1534636a64 Fix Serpentine Spike 2021-07-23 20:24:17 -04:00
Northmoc
94da5f3c3a add Remember objects from Damage effects to GameAction before the maps are cleared 2021-07-23 20:24:16 -04:00
Northmoc
a8205192ca remove Remember functions from DamageAllEffect 2021-07-23 20:24:09 -04:00
Northmoc
22337e4a7b remove Remember functions from DamageDealEffect 2021-07-23 20:21:18 -04:00
tool4EvEr
ffb40f1195 Fix Price of Loyalty 2021-07-24 00:09:52 +02:00
tool4EvEr
df160a751e Fix predictDamageTo 2021-07-23 21:56:37 +02:00
tool4EvEr
911511d039 Add Dungeon to EditionSectionWithCollectorNumbers 2021-07-23 21:33:25 +02:00
Michael Kamensky
ef917a91b9 Merge branch 'update_translation_dice_class' into 'master' 
Fix translation issues for Class and dice rolling cards

See merge request core-developers/forge!5098
 2021-07-23 15:59:52 +00:00
Northmoc
589f714d70 improve StackDescription to show target when kicked (band-aid) 2021-07-23 11:13:12 -04:00
Lyu Zong-Hong
b28e32460d Fix translation issues for Class and dice rolling cards 2021-07-23 23:40:04 +09:00
Northmoc
2fffb11d72 anger_of_the_gods.txt tidy up 2021-07-23 10:00:05 -04:00
Michael Kamensky
7dcf2c6131 Merge branch 'afr_update_translation' into 'master' 
Update translations for AFR release

See merge request core-developers/forge!5096
 2021-07-23 09:46:13 +00:00
Michael Kamensky
49fe438790 Merge branch 'afr_oracle_update' into 'master' 
Update oracles with AFR release

See merge request core-developers/forge!5095
 2021-07-23 09:45:57 +00:00
Lyu Zong-Hong
f559bd98ef Update translations for AFR release 2021-07-23 16:19:40 +09:00
Lyu Zong-Hong
a3372980e5 Update oracles with AFR release 2021-07-23 15:31:40 +09:00
Lyu Zong-Hong
a42d64353e Update oracles with AFR release 2021-07-23 15:02:11 +09:00
Michael Kamensky
445826e50e Merge branch 'NPE' into 'master' 
Fix some NPE from token table

See merge request core-developers/forge!5089
 2021-07-23 04:25:47 +00:00
Michael Kamensky
998873f311 Merge branch 'mathas' into 'master' 
Fix Mathas

See merge request core-developers/forge!5090
 2021-07-23 04:25:07 +00:00
Michael Kamensky
85b2d97a4c Merge branch 'lorcan' into 'master' 
Added Lorcan, Warlock Collector

See merge request core-developers/forge!5091
 2021-07-23 04:24:49 +00:00
Michael Kamensky
eaa6d6acd6 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!5092
 2021-07-23 04:24:23 +00:00
Michael Kamensky
d1c0d7f49b Merge branch 'fix_fevered_suspicion' into 'master' 
Fixed Fevered Suspicion  (issue #1934)

See merge request core-developers/forge!5093
 2021-07-23 04:24:14 +00:00
Michael Kamensky
20712cc652 Merge branch 'share_the_spoils' into 'master' 
Add Share the Spoils

See merge request core-developers/forge!5084
 2021-07-23 04:24:00 +00:00
Lyu Zong-Hong
ebcfa5b084 Add ValidSA check to LandPlayed trigger 2021-07-23 11:38:55 +09:00
Wendell Wilkerson
cb2d44a35c missing Amount$ All added 2021-07-22 21:11:41 -05:00
CCTV-1
62ef92364f update simplified chinese translation 2021-07-23 10:06:00 +08:00
Lyu Zong-Hong
5d9e0f54a6 Merge branch 'master' into share_the_spoils 2021-07-23 10:38:42 +09:00
paul_snoops
10645c4da8 Added Lorcan, Warlock Collector 2021-07-22 19:52:34 +01:00
tool4EvEr
28ab74ce06 Fix Mathas 2021-07-22 20:48:00 +02:00
tool4EvEr
0c745c51fd Fix some NPE from token table 2021-07-22 20:14:12 +02:00
Michael Kamensky
e1f3293126 Merge branch 'tidy' into 'master' 
tidy up dungeon_crawler.txt

See merge request core-developers/forge!5088
 2021-07-22 16:48:54 +00:00
Northmoc
fed5b9af3d tidy up dungeon_crawler.txt 2021-07-22 12:29:03 -04:00
Michael Kamensky
09a4d6f4e2 Merge branch 'kheru' into 'master' 
Kheru Spellsnatcher: Fix playing MDFC lands

See merge request core-developers/forge!5086
 2021-07-22 15:37:30 +00:00