47650 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hans Mackowiak	395ea80ff0	Merge branch 'fix' into 'master' ... Some card fixes See merge request core-developers/forge!3803	2021-02-11 00:02:23 +00:00
Tim Mocny	07de907236	Some card fixes	2021-02-11 00:02:22 +00:00
tool4EvEr	793f75a020	Cleanup import	2021-02-10 22:11:39 +01:00
Sol	c29a267d07	Merge branch 'twosat-master-patch-35964' into 'master' ... Update de-DE.properties See merge request core-developers/forge!3801	2021-02-10 20:02:55 +00:00
Andreas Bendel	9ec9e526ad	Update de-DE.properties ... translated 'download skins' entries	2021-02-10 19:55:32 +00:00
Michael Kamensky	29b877ff1e	Merge branch 'new_sld' into 'master' ... SLD smitten cards See merge request core-developers/forge!3798	2021-02-10 19:18:56 +00:00
Michael Kamensky	4af3b259dc	Merge branch 'fixCastCancel' into 'master' ... Fix casting spells after canceling with extra costs See merge request core-developers/forge!3793	2021-02-10 19:18:07 +00:00
Bug Hunter	8e2a29bf13	Fix casting spells after canceling with extra costs	2021-02-10 19:18:06 +00:00
Adam Pantel	77d39a2c48	Check for invalid CloneTarget	2021-02-10 12:22:12 -05:00
John	f167e5ce8b	Update masked_vandal.txt	2021-02-10 16:21:24 +00:00
John	cd3b35e377	Update masked_vandal.txt	2021-02-10 16:18:45 +00:00
paul_snoops	74551aa238	SLD smitten cards	2021-02-10 16:14:38 +00:00
Michael Kamensky	6fcb1323b2	Merge branch 'edition_file_fixes' into 'master' ... Some KHC fixes See merge request core-developers/forge!3797	2021-02-10 15:05:58 +00:00
paul_snoops	29bbe02383	Some KHC fixes	2021-02-10 13:47:43 +00:00
Lyu Zong-Hong	b320ac12a1	Handle 721.3d (except commander)	2021-02-10 22:46:07 +09:00
Sol	781d59008b	Merge branch 'Williams-master-patch-30693' into 'master' ... Narfi Betrayer King fix See merge request core-developers/forge!3796	2021-02-10 13:34:10 +00:00
Lyu Zong-Hong	221f5da473	Update mutated card view panel to show correct merged cards	2021-02-10 21:26:10 +09:00
Anthony Calosa	450a7f199f	Merge branch 'master' into 'master' ... Move custom skins to cache See merge request core-developers/forge!3795	2021-02-10 12:17:54 +00:00
Anthony Calosa	8dcb4818a5	add todo	2021-02-10 20:16:37 +08:00
Lyu Zong-Hong	3812a85a8e	Revert unnecessary changes of getCards()	2021-02-10 19:48:22 +09:00
Anthony Calosa	0c3248deff	Merge remote-tracking branch 'core/master'	2021-02-10 18:31:36 +08:00
John	e0044cb561	Update narfi_betrayer_king.txt	2021-02-10 10:05:47 +00:00
Hans Mackowiak	2c765630c0	fix unused import	2021-02-10 09:15:16 +01:00
Hans Mackowiak	749fa157d0	Merge branch 'khc9' into 'master' ... Missing KHC cards and KHM fixes See merge request core-developers/forge!3792	2021-02-10 07:24:15 +00:00
Tim Mocny	5767847124	Missing KHC cards and KHM fixes	2021-02-10 07:24:14 +00:00
Anthony Calosa	ffb0b8bb89	Move custom skins to cache ... - added skins downloader	2021-02-10 14:55:12 +08:00
Michael Kamensky	0f53353852	Merge branch 'fixNiko2' into 'master' ... Update Niko Aris wrong values See merge request core-developers/forge!3789	2021-02-10 04:02:10 +00:00
Michael Kamensky	771ab2c0fe	Merge branch 'Williams-master-patch-28506' into 'master' ... Update Secret Lair Drop Series Black is Magic See merge request core-developers/forge!3794	2021-02-10 04:01:47 +00:00
Michael Kamensky	427c1db10d	Merge branch 'dividedNewTargets' into 'master' ... TargetChoices: refactor DividedAsYouChoose See merge request core-developers/forge!3571	2021-02-10 04:00:37 +00:00
Hans Mackowiak	9d0433f812	- Use the original implementation for orderAndPlaySimultaneousSa for the AI for the time being until the AI side of the implementation can be improved.	2021-02-10 04:00:37 +00:00
Sol	1e7fdf39d1	Merge branch 'Williams-master-patch-50720' into 'master' ... Reidane Fix See merge request core-developers/forge!3790	2021-02-10 02:50:45 +00:00
John	4f452331b2	Update Secret Lair Drop Series.txt	2021-02-09 22:39:53 +00:00
Sol	06e0ed9a79	Merge branch 'manifestTestCase' into 'master' ... TestCase: fix Manifest test See merge request core-developers/forge!3791	2021-02-09 21:51:12 +00:00
Hans Mackowiak	a82f035211	TestCase: fix Manifest test	2021-02-09 22:47:31 +01:00
John	7dae978824	Update reidane_god_of_the_worthy_valkmira_protectors_shield.txt	2021-02-09 19:03:01 +00:00
tool4EvEr	ca0eee67d7	Update Niko Aris wrong values	2021-02-09 19:06:21 +01:00
Hans Mackowiak	c830641bc9	fix Manifest Adventure cards	2021-02-09 14:57:08 +01:00
Hans Mackowiak	97d3dd294a	GameAction: reset backstate when card to other zone than stack	2021-02-09 10:39:01 +01:00
Lyu Zong-Hong	24800840be	Merge master	2021-02-09 17:15:06 +09:00
Lyu Zong-Hong	218e21fcd3	Handle TurnFace, Flip, Transform for merged permanent	2021-02-09 15:36:45 +09:00
Michael Kamensky	7a13cc9d54	Merge branch 'display_localization_cardname' into 'master' ... support choose/search localization card name See merge request core-developers/forge!2469	2021-02-09 04:53:33 +00:00
Sol	0f38e714ec	Merge branch 'migrate-kaldheim' into 'master' ... Migrate Kaldheim from Upcoming See merge request core-developers/forge!3788	2021-02-09 02:12:14 +00:00
friarsol	c88fd07acd	Migrate Kaldheim	2021-02-08 21:09:44 -05:00
Sol	78a76d0f86	Merge branch 'token_fix' into 'master' ... Firja's Retribution token fix See merge request core-developers/forge!3787	2021-02-09 02:07:05 +00:00
Sol	93d76b4666	Merge branch 'fixNiko' into 'master' ... Fix Niko Aris +1 See merge request core-developers/forge!3786	2021-02-09 02:06:39 +00:00
Sol	d3232e84af	Update ANNOUNCEMENTS.txt	2021-02-09 02:02:02 +00:00
paul_snoops	be6d28a18d	Firja's Retribution token fix ... Angel renamed to Angel Warrior in script	2021-02-08 22:02:54 +00:00
tool4EvEr	04d2f7ca63	Update Niko Aris +1	2021-02-08 20:47:13 +01:00
Michael Kamensky	7f691ddabc	Merge branch 'cascadeMDFC' into 'master' ... PlayEffect: support restrictions for both MDFC sides & split halves See merge request core-developers/forge!3773	2021-02-08 19:09:38 +00:00
Bug Hunter	01c7aa5889	PlayEffect: support restrictions for both MDFC sides & split halves	2021-02-08 19:09:38 +00:00