Commit Graph

54833 Commits

Author SHA1 Message Date
hx hyper
cff23a9f42 fixed cost for Apprentice Sharpshooter and Dreadlight Monstrosity 2021-11-12 12:42:07 +00:00
John Williams
8bb48af04c Add new file 2021-11-12 12:34:55 +00:00
Anthony Calosa
6eac397807 Merge remote-tracking branch 'core/master' 2021-11-12 20:25:23 +08:00
Job Spijker
130d712f08 Fixed \n typo in oracle text 2021-11-12 10:24:32 +00:00
Bug Hunter
200dbbd37e Update forge-gui/res/cardsfolder/upcoming/ancestral_anger.txt 2021-11-12 10:02:33 +00:00
Michael Kamensky
d8bcee5f0b Merge branch 'TRT-master-patch-94392' into 'master'
Update forge-gui/res/cardsfolder/upcoming/millicent_restless_revenant.txt

See merge request core-developers/forge!5804
2021-11-12 08:59:18 +00:00
Bug Hunter
748a8f2c42 Update forge-gui/res/cardsfolder/upcoming/millicent_restless_revenant.txt 2021-11-12 08:54:58 +00:00
Job Spijker
2c0f5e4266 Added newline to Haunted Library 2021-11-12 07:04:56 +00:00
Job Spijker
9afb565673 Added deck hint to Drogskol Reinforcements 2021-11-12 07:04:21 +00:00
Job Spijker
8f47c10627 Removed melee reminder text from Mode$ Continuous 2021-11-12 07:03:39 +00:00
Anthony Calosa
ec6a91947a Merge remote-tracking branch 'core/master' 2021-11-12 14:17:13 +08:00
Michael Kamensky
01333ff67e Merge branch 'voc_11' into 'master'
VOC: 11 Nov

See merge request core-developers/forge!5802
2021-11-12 05:54:24 +00:00
Michael Kamensky
0840dc30a2 Merge branch 'fix' into 'master'
various minor fixes

See merge request core-developers/forge!5803
2021-11-12 05:51:14 +00:00
Anthony Calosa
8497090c43 Merge remote-tracking branch 'core/master' 2021-11-12 13:09:43 +08:00
Northmoc
0bbaef9a32 honored_heirloom.txt add ManaCost 2021-11-11 22:49:47 -05:00
Northmoc
9b967f7092 courier_bat.txt fix Oracle 2021-11-11 22:49:33 -05:00
Michael Kamensky
eca72342c7 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-12 06:47:22 +03:00
Michael Kamensky
7fbb6a5ff4 Merge branch 'vowdraft' into 'master'
set up VOW draft

See merge request core-developers/forge!5798
2021-11-12 03:46:29 +00:00
Michael Kamensky
4ac5dabbea Merge branch 'triggerzones' into 'master'
Fix bad TriggerZone param

See merge request core-developers/forge!5800
2021-11-12 03:46:08 +00:00
Northmoc
5e61f8029c timothar_baron_of_bats.txt and slight CostExile prompt tweak 2021-11-11 22:45:39 -05:00
Michael Kamensky
bf18ba2cd7 Merge branch 'cem_des' into 'master'
VOW: Cemetery Desecrator (tricky Charm templating)

See merge request core-developers/forge!5750
2021-11-12 03:45:30 +00:00
Northmoc
a28d5e373f umbris_fear_manifest.txt 2021-11-11 22:43:40 -05:00
Northmoc
3f1ff4b064 imperious_mindbreaker.txt add AI hint 2021-11-11 22:39:39 -05:00
Northmoc
4cca378710 priest_of_the_blessed_graf.txt 2021-11-11 22:39:24 -05:00
Anthony Calosa
a8f6131e61 Merge remote-tracking branch 'core/master' 2021-11-12 11:33:57 +08:00
Northmoc
e1323d0336 imperious_mindbreaker.txt 2021-11-11 21:59:05 -05:00
tool4EvEr
9fb09c1d90 Fix bad TriggerZone param 2021-11-11 23:26:06 +01:00
Job Spijker
7dc538f7b0 VOC: Timin, Youthful Geist 2021-11-11 21:23:51 +00:00
Job Spijker
2b2de73b3b VOC: Rhoda, Geist Avenger 2021-11-11 21:23:20 +00:00
Job Spijker
f492e9d7bf VOC: Haunted Library 2021-11-11 21:06:29 +00:00
Job Spijker
6366583610 VOC: Drogskoll Reinforcements 2021-11-11 21:05:33 +00:00
Northmoc
83fcd6e6cd VOW rankings 2021-11-11 14:12:36 -05:00
Northmoc
ce5acd1845 set up VOW draft 2021-11-11 14:10:59 -05:00
Michael Kamensky
637c8a010e Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-11 21:21:31 +03:00
Michael Kamensky
433d9482ba Merge branch 'Svaldan-master-patch-80692' into 'master'
Final VOW cards by Svaldan

See merge request core-developers/forge!5790
2021-11-11 18:20:59 +00:00
Job Spijker
badde0f297 Improved stack description of VOW:Wolf Strike 2021-11-11 18:05:21 +00:00
Michael Kamensky
be239c55b0 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-11 20:28:41 +03:00
Michael Kamensky
d6b2711e0a Merge branch 'veil' into 'master'
veil_of_summer.txt tidy Desc and AI

See merge request core-developers/forge!5797
2021-11-11 17:27:41 +00:00
Bug Hunter
6bf24309ba Merge branch 'master' into 'master'
Tweak Dollhouse of Horrors implementation

See merge request core-developers/forge!5796
2021-11-11 16:52:14 +00:00
Michael Kamensky
87147c5c4b Tweak Dollhouse of Horrors implementation 2021-11-11 16:52:14 +00:00
Bug Hunter
50114fc6d0 Merge branch 'odric' into 'master'
VOW: Odric and support

See merge request core-developers/forge!5773
2021-11-11 16:50:39 +00:00
Northmoc
26814de95a veil_of_summer.txt tidy Desc and AI 2021-11-11 11:49:32 -05:00
Michael Kamensky
64a3b6579a - Tweak Dollhouse of Horrors implementation. 2021-11-11 18:33:54 +03:00
Michael Kamensky
8bbf8148eb - Tweak Dollhouse of Horrors implementation. 2021-11-11 18:32:50 +03:00
Michael Kamensky
97683d52ef Merge branch 'deald' into 'master'
VOW: Some DealDamage red commons + support + cleanup

See merge request core-developers/forge!5784
2021-11-11 14:57:13 +00:00
Northmoc
58be4989a2 lacerate_flesh.txt newline 2021-11-11 08:20:20 -05:00
Northmoc
d303eba24e brutal_expulsion.txt picky 2021-11-11 08:12:53 -05:00
Job Spijker
e889a7b1e2 Added newline to g_3_1_boar.txt tokenscript 2021-11-11 07:56:58 +00:00
Job Spijker
2e1d519bc7 Update forge-gui/res/cardsfolder/upcoming/wolf_strike.txt 2021-11-11 07:52:25 +00:00
Job Spijker
e813cff9d7 Update forge-gui/res/cardsfolder/upcoming/rural_recruit.txt 2021-11-11 06:59:56 +00:00