54130 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Kamensky	e288b84863	Merge branch 'prowler' into 'master' ... VOW: Cemetery Prowler and support See merge request core-developers/forge!5735	2021-11-09 03:53:04 +00:00
Bug Hunter	d03743b8c5	Merge branch 'fix' into 'master' ... welkin_hawk.txt various fixes See merge request core-developers/forge!5761	2021-11-08 19:21:46 +00:00
Tim Mocny	79b1a5e831	welkin_hawk.txt various fixes	2021-11-08 19:21:45 +00:00
Michael Kamensky	b67942cbdf	Merge branch 'hullbreaker' into 'master' ... VOW: Hullbreaker Horror and keyword refactor See merge request core-developers/forge!5743	2021-11-08 19:10:41 +00:00
Michael Kamensky	c681f407b3	Merge branch 'curse_of_hos' into 'master' ... VOW: Curse of Hospitality See merge request core-developers/forge!5731	2021-11-08 17:57:16 +00:00
Northmoc	d656b39f06	CardProperty: implement generic "attacking DefinedGameEntity"	2021-11-08 12:42:06 -05:00
Northmoc	1329b52b3c	curse_of_hospitality.txt	2021-11-08 12:42:04 -05:00
Michael Kamensky	76dc6e1f03	Merge branch 'kaalia' into 'master' ... Fix attacking self with Kaalia trigger See merge request core-developers/forge!5760	2021-11-08 17:31:16 +00:00
Northmoc	26364e5a1b	AbilityUtils support "TypesSharedWith"	2021-11-08 12:17:29 -05:00
Northmoc	947b3b06a8	cemetery_prowler.txt	2021-11-08 12:17:28 -05:00
tool4EvEr	f652bd5f29	Fix attacking self with Kaalia trigger	2021-11-08 18:13:37 +01:00
Michael Kamensky	fa57889a89	Merge branch 'vow_7' into 'master' ... VOW: 7 Nov See merge request core-developers/forge!5749	2021-11-08 15:01:45 +00:00
Northmoc	916c466303	skulking_killer.txt All -> Random	2021-11-08 09:19:15 -05:00
Northmoc	843f395832	faithbound_judge_sinners_judgment.txt AI hint	2021-11-08 08:09:18 -05:00
Michael Kamensky	afff59e29f	Merge branch 'editions' into 'master' ... VOW, VOC & DBL edition updates See merge request core-developers/forge!5758	2021-11-08 09:45:51 +00:00
paul_snoops	816bdf1398	VOW, VOC & DBL edition updates	2021-11-08 09:44:38 +00:00
Michael Kamensky	bd4577b859	Merge branch 'prosper' into 'master' ... Fix Prosper See merge request core-developers/forge!5757	2021-11-08 09:42:08 +00:00
Michael Kamensky	a58eacb072	Merge branch 'pay' into 'master' ... Fix exileFromMiscZone paying with less than needed See merge request core-developers/forge!5756	2021-11-08 09:41:27 +00:00
Michael Kamensky	ba96043ebd	Merge branch 'smart-card-art-deck-import-desktop-and-mobile' into 'master' ... Smart Card Art option in deck Importer for Desktop and Mobile + updates to Deck Import on Mobile See merge request core-developers/forge!5754	2021-11-08 09:41:23 +00:00
TRT	98f752244c	Fix Prosper	2021-11-08 09:49:55 +01:00
TRT	6bc8d595bc	Fix exileFromMiscZone paying with less than needed	2021-11-08 09:14:16 +01:00
Bug Hunter	7ec1066e2a	Merge branch 'ordering-random' into 'master' ... ChangeZoneAllEffect: don't ask to order cards when they're going to end up being randomized. See merge request core-developers/forge!5753	2021-11-08 08:04:56 +00:00
leriomaggio	e86745fb34	Merge remote-tracking branch 'upstream/master' into smart-card-art-deck-import-desktop-and-mobile	2021-11-08 07:20:07 +00:00
Michael Kamensky	e2e32204e2	- ChangeZoneAllEffect: don't ask to order cards when they're going to end up being randomized.	2021-11-08 07:16:20 +03:00
Michael Kamensky	564873d05d	Merge branch 'backport-rightclick' into 'master' ... Implement right clicking to zoom in mobile backport (desktop use only). See merge request core-developers/forge!5752	2021-11-08 04:13:19 +00:00
Michael Kamensky	8ff377444a	- Implement right clicking to zoom in mobile backport (desktop use only).	2021-11-08 07:12:16 +03:00
Michael Kamensky	177ab00021	Merge branch 'music-profiles' into 'master' ... Selectable Music sets + Assorted AI improvements, card fixes See merge request core-developers/forge!5751	2021-11-08 04:09:20 +00:00
Michael Kamensky	2ab830717e	- Update de-DE.properties.	2021-11-08 07:06:25 +03:00
Michael Kamensky	459f704521	Merge remote-tracking branch 'origin/music-profiles' into music-profiles ... # Conflicts: # forge-gui/res/languages/de-DE.properties	2021-11-08 07:05:39 +03:00
Michael Kamensky	37e965d9ee	Merge branch 'master' of https://git.cardforge.org/agetian/forge into music-profiles ... Conflicts: forge-gui/res/languages/de-DE.properties	2021-11-08 07:05:07 +03:00
Michael Kamensky	7bc4c9eb05	Merge branch 'master' into 'music-profiles' ... # Conflicts: # forge-gui/res/languages/de-DE.properties	2021-11-08 04:03:40 +00:00
Michael Kamensky	cde8a122eb	Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master	2021-11-08 07:00:43 +03:00
Michael Kamensky	f09416fb94	Merge branch 'voc_5' into 'master' ... VOC: 5 Nov See merge request core-developers/forge!5748	2021-11-08 03:57:45 +00:00
Michael Kamensky	a832cf9c46	Merge branch 'hiveheart' into 'master' ... VOW: Hiveheart Shaman and support See merge request core-developers/forge!5742	2021-11-08 03:52:03 +00:00
Northmoc	a1a27b4fdd	moldgraf_millipede.txt	2021-11-07 22:49:27 -05:00
Michael Kamensky	efc6a373d3	Merge branch 'vow_6' into 'master' ... VOW: 6 Nov See merge request core-developers/forge!5741	2021-11-08 03:49:07 +00:00
Michael Kamensky	420f1618cf	Merge branch 'vow_5' into 'master' ... VOW: 5 Nov See merge request core-developers/forge!5740	2021-11-08 03:49:02 +00:00
Michael Kamensky	51992223be	Merge branch 'vow_4' into 'master' ... VOW: 4 Nov See merge request core-developers/forge!5739	2021-11-08 03:48:47 +00:00
Michael Kamensky	2c028c68df	Merge branch 'vow_3' into 'master' ... VOW: 3 Nov See merge request core-developers/forge!5738	2021-11-08 03:41:35 +00:00
Michael Kamensky	349878ab4e	Merge branch 'SacCostCap' into 'master' ... Cleaning up some capitalization in SacCost See merge request core-developers/forge!5745	2021-11-08 03:39:16 +00:00
Michael Kamensky	96689b974f	Merge branch 'tidy' into 'master' ... Tidy up various cards See merge request core-developers/forge!5737	2021-11-08 03:39:14 +00:00
Northmoc	6bfd10304b	hopeful_initiate.txt	2021-11-07 22:34:38 -05:00
Northmoc	e96b73033f	unhallowed_phalanx.txt (Svaldan)	2021-11-07 22:30:37 -05:00
Northmoc	a923d70222	circle_of_confinement.txt (Svaldan)	2021-11-07 22:11:49 -05:00
Northmoc	9c41fe0fc0	faithbound_judge_sinners_judgment.txt and counter	2021-11-07 22:08:27 -05:00
Northmoc	e205d0ad86	eruth_tormented_prophet.txt	2021-11-07 22:08:07 -05:00
Northmoc	951a67556a	stormchaser_drake.txt	2021-11-07 21:09:42 -05:00
Northmoc	f025081f2a	alchemists_gambit.txt	2021-11-07 21:09:35 -05:00
Northmoc	2242e164c8	demonic_tutor.txt fix stackdesc	2021-11-07 20:41:00 -05:00
Northmoc	56c2f6c46c	witness_the_future.txt	2021-11-07 19:48:02 -05:00