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
51,631 Commits 33 Branches 187 Tags
a5ee901bba734eb8065da14aaddea24514b4c7a5
Commit Graph

51631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
5f742d59b6 Merge branch 'sutured' into 'master' 
sutured_ghoul.txt overhaul

Closes #1918

See merge request core-developers/forge!4997
 2021-07-13 18:20:36 +00:00
Michael Kamensky
24768d42b3 Merge branch 'fix_dungeon_of_the_mad_mage' into 'master' 
Fix dungeon of the mad mage and update text rendering for Dungeon cards

See merge request core-developers/forge!5002
 2021-07-13 16:38:56 +00:00
paul_snoops
2bf31bfae6 PLIST edition update 2021-07-13 17:38:20 +01:00
Michael Kamensky
792d4759ca Merge branch 'trigger_planar_die' into 'master' 
Roll a planar die will also run RollDie and RollDieOnce triggers

See merge request core-developers/forge!5003
 2021-07-13 16:38:20 +00:00
Michael Kamensky
64271eda4c Merge branch 'AFC_edition' into 'master' 
AFC edition update

See merge request core-developers/forge!5004
 2021-07-13 16:38:03 +00:00
Michael Kamensky
f38c902c9c Merge branch 'afc_13' into 'master' 
AFC - 13 Jul

See merge request core-developers/forge!5001
 2021-07-13 16:37:46 +00:00
paul_snoops
0885fc0995 AFC edition update 2021-07-13 17:15:41 +01:00
Northmoc
14fe4b862f sutured_ghoul.txt remove Effect 2021-07-13 09:45:14 -04:00
Northmoc
d655d43910 sutured_ghoul.txt overhaul 2021-07-13 09:45:13 -04:00
Lyu Zong-Hong
de20cec586 Update Chicken à la King so only trigger when rolling d6 2021-07-13 22:07:33 +09:00
Lyu Zong-Hong
cd05a8ffe1 Trigger RollDie and RollDieOnce for planar die too 2021-07-13 21:58:52 +09:00
Lyu Zong-Hong
acc6941220 Handle <span> tag in mobile port 2021-07-13 21:19:03 +09:00
Lyu Zong-Hong
3b8b28c355 Also disable ability texts for Dungeon cards that are not current room 2021-07-13 20:49:45 +09:00
Lyu Zong-Hong
0ac9e33dc7 Fix the Runestone Caverns room in Dungeon of the Mad Mage 2021-07-13 20:07:19 +09:00
Michael Kamensky
94ae1fe777 Merge branch 'afr_12' into 'master' 
AFR - 12 Jul

See merge request core-developers/forge!4996
 2021-07-13 10:35:14 +00:00
Northmoc
6f3b578fc0 galea_kindler_of_hope.txt 2021-07-13 06:31:44 -04:00
leriomaggio
573901ce51 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-13 08:22:58 +01:00
leriomaggio
7528b2b4b8 Improved implementantion for add w/ cardRequest and custom cards and fromCardlist 2021-07-13 08:09:06 +01:00
Michael Kamensky
4598c67578 Merge branch 'Fix_typo' into 'master' 
Fixed Typo

See merge request core-developers/forge!5000
 2021-07-13 06:49:56 +00:00
stubob
1e93f31d0b Fixed Typo 2021-07-12 23:04:49 -06:00
Michael Kamensky
9de6a40028 Merge branch 'Fix_asmodeus' into 'master' 
Update asmodeus_the_archfiend.txt

See merge request core-developers/forge!4998
 2021-07-12 19:05:52 +00:00
Sol
1cd5b6633f Update asmodeus_the_archfiend.txt 2021-07-12 18:55:03 +00:00
Michael Kamensky
65e6a01785 Merge branch 'Williams-master-patch-28964' into 'master' 
AFR 12/07

See merge request core-developers/forge!4994
 2021-07-12 16:13:50 +00:00
Michael Kamensky
f5561a17f9 Merge branch 'AFR_fixes' into 'master' 
Fixes from Alumi comments

See merge request core-developers/forge!4995
 2021-07-12 16:12:47 +00:00
ArsenalNut
a3d5094175 Update skullport_merchant.txt 2021-07-12 15:52:29 +00:00
Northmoc
82a9582f34 inferno_of_the_star_mounts.txt 2021-07-12 10:45:52 -04:00
Wendell Wilkerson
7846128ba5 fixes from Alumi comments 2021-07-12 09:28:13 -05:00
Northmoc
4b542b9002 sudden_insight.txt 2021-07-12 10:23:07 -04:00
Northmoc
da4e428cb8 purple_worm.txt 2021-07-12 08:26:48 -04:00
John
0c6d965a1c Update circle_of_the_moon_druid.txt 2021-07-12 12:04:51 +00:00
John
cfa2432cca Update rally_maneuver.txt 2021-07-12 11:59:38 +00:00
John
0c61ae7a2b Update lurking_roper.txt 2021-07-12 11:59:14 +00:00
John
9b8654a1af Update elturgard_ranger.txt 2021-07-12 11:58:51 +00:00
John
ecf3dcca99 Update dire_wolf_prowler.txt 2021-07-12 11:58:22 +00:00
John
02c76474c8 Add new file 2021-07-12 10:27:11 +00:00
John
f8832a19c0 Add new file 2021-07-12 10:26:41 +00:00
John
413352a4d5 Add new file 2021-07-12 10:26:05 +00:00
John
fcd7fe840d Add new file 2021-07-12 10:25:38 +00:00
John
2843bc18fc Add new file 2021-07-12 10:25:09 +00:00
John
478b8e604f Add new file 2021-07-12 10:24:42 +00:00
John
b9554604b6 Add new file 2021-07-12 10:24:13 +00:00
John
aec56d726d Add new file 2021-07-12 10:23:48 +00:00
John
863d1d4884 Add new file 2021-07-12 10:23:12 +00:00
John
f2cfeb31b8 Add new file 2021-07-12 10:22:43 +00:00
John
ea50d8f947 Add new file 2021-07-12 10:22:11 +00:00
John
ee835d310a Add new file 2021-07-12 10:21:39 +00:00
John
4567260d61 Add new file 2021-07-12 10:21:05 +00:00
John
d0a4ff54f7 Add new file 2021-07-12 10:19:18 +00:00
Alumi
767b6f1ea5 Merge branch 'patch-enable-custom-cards' into 'master' 
Patch showing custom card warning properly

See merge request core-developers/forge!4993
 2021-07-12 08:31:11 +00:00
leriomaggio
4eb2bcca89 Merge remote-tracking branch 'upstream/master' into patch-enable-custom-cards 2021-07-12 09:26:16 +01:00