56242 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anthony Calosa	a6de8df2ed	Merge branch 'NewMaster' into 'master' ... [Adventure] add backdrop for Inn See merge request core-developers/forge!6394	2022-03-13 05:49:34 +00:00
Anthony Calosa	11d4cd9f9d	Merge remote-tracking branch 'core/master'	2022-03-13 13:11:09 +08:00
Anthony Calosa	895e7034be	[Adventure] add backdrop for Inn	2022-03-13 13:05:49 +08:00
Michael Kamensky	bee2705cc5	Merge branch 'grenzo' into 'master' ... changeHiddenOriginResolve: Fix default fallback Closes #2114 See merge request core-developers/forge!6391	2022-03-13 04:25:58 +00:00
Bug Hunter	06d58604d6	changeHiddenOriginResolve: Fix default fallback	2022-03-13 04:25:53 +00:00
Michael Kamensky	6e5df41780	Merge branch 'master' into 'master' ... Added NEO/NEC achievements by Marek14. See merge request core-developers/forge!6393	2022-03-12 19:01:07 +00:00
Michael Kamensky	13f30b5e7d	- Added NEO/NEC achievements by Marek14.	2022-03-12 21:58:49 +03:00
Michael Kamensky	75ad123346	Merge branch 'TRT-master-patch-92800' into 'master' ... Update forge-gui/res/cardsfolder/b/boon_of_boseiju.txt Closes #2115 See merge request core-developers/forge!6392	2022-03-12 18:31:25 +00:00
Bug Hunter	76966aa981	Update forge-gui/res/cardsfolder/b/boon_of_boseiju.txt	2022-03-12 13:56:44 +00:00
Hans Mackowiak	917493b2af	AI: shortcut for chooseCounterType if there is only one	2022-03-12 12:44:01 +01:00
Anthony Calosa	610d0b9d99	Merge branch 'NewMaster' into 'master' ... [Adventure] fix RewardScene label See merge request core-developers/forge!6390	2022-03-12 08:49:47 +00:00
Anthony Calosa	56ec2b4952	[Adventure] fix RewardScene label ... - hide gold label when RewardScene is not Shop type	2022-03-12 16:47:53 +08:00
Anthony Calosa	fdd320596c	Merge branch 'NewMaster' into 'master' ... [Adventure] add market BG See merge request core-developers/forge!6389	2022-03-12 06:11:22 +00:00
Anthony Calosa	8a0f2837d9	[Adventure] add market BG	2022-03-12 14:06:08 +08:00
Anthony Calosa	f4648c3460	Merge branch 'NewMaster' into 'master' ... [Adventure] update RewardActor See merge request core-developers/forge!6388	2022-03-12 05:10:52 +00:00
Anthony Calosa	03fc7209a8	[Adventure] update RewardActor	2022-03-12 13:07:34 +08:00
Michael Kamensky	22bf12f07b	Merge branch 'miscfix' into 'master' ... ControlGain Lose fix See merge request core-developers/forge!6379	2022-03-11 10:28:32 +00:00
Bug Hunter	01f397db9f	Merge branch 'TRT-master-patch-26275' into 'master' ... Update forge-gui/res/cardsfolder/p/puffer_extract.txt See merge request core-developers/forge!6386	2022-03-11 08:09:17 +00:00
Bug Hunter	66198604ab	Update forge-gui/res/cardsfolder/p/puffer_extract.txt	2022-03-11 08:08:48 +00:00
Anthony Calosa	931a1e91cd	Merge branch 'kevlahnota-master-patch-61149' into 'master' ... unused imports See merge request core-developers/forge!6385	2022-03-11 04:55:17 +00:00
Anthony Calosa	5315c90d24	unused imports	2022-03-11 04:55:00 +00:00
Anthony Calosa	a640b2bb3a	Merge branch 'master' into 'master' ... [Adventure] Add Gold Indicator See merge request core-developers/forge!6384	2022-03-11 04:50:42 +00:00
Anthony Calosa	4c518fad73	[Adventure] Add Gold Indicator	2022-03-11 12:49:12 +08:00
Anthony Calosa	74a2d247bc	Merge branch 'master' into 'master' ... switch check See merge request core-developers/forge!6383	2022-03-10 20:07:50 +00:00
Anthony Calosa	2272d7f648	switch check	2022-03-11 04:06:30 +08:00
Anthony Calosa	1d5b80b376	Merge branch 'master' into 'master' ... fix netplay See merge request core-developers/forge!6382	2022-03-10 18:47:40 +00:00
Anthony Calosa	020a21e189	fix netplay	2022-03-11 02:46:15 +08:00
Anthony Calosa	100ccc0bdb	Merge branch 'master' into 'master' ... update use titlebg See merge request core-developers/forge!6381	2022-03-10 17:15:51 +00:00
Anthony Calosa	6b4b3bce46	Merge branch 'fix_oni_cult_anvil' into 'master' ... Fix: Oni-Cult Anvil's triggered ability See merge request core-developers/forge!6378	2022-03-10 17:13:58 +00:00
Anthony Calosa	5a11de43d6	update use titlebg	2022-03-11 01:12:57 +08:00
Anthony Calosa	96c51e6a28	Merge branch 'master' into 'master' ... [Mobile] update SplashScreen See merge request core-developers/forge!6380	2022-03-10 17:05:56 +00:00
tool4EvEr	bd888f9382	ETB replacement fix	2022-03-10 17:58:01 +01:00
tool4EvEr	054fca64fb	Update effects	2022-03-10 17:47:44 +01:00
Anthony Calosa	eec2da8f00	[Mobile] update SplashScreen	2022-03-11 00:26:48 +08:00
tool4EvEr	7d6aa6f006	Clean up	2022-03-10 17:16:57 +01:00
tool4EvEr	f02703a8cb	Fix for Master Thief	2022-03-10 17:10:54 +01:00
tool4EvEr	c93624fa29	Guardian Beast	2022-03-10 17:10:33 +01:00
pfirpfel	eb4c5ee3f0	Fix: Oni-Cult Anvil's triggered ability triggers only during its controller's turn	2022-03-10 15:19:23 +01:00
Bug Hunter	27d25eb1c9	Merge branch 'cleanup' into 'master' ... Some clean up fix See merge request core-developers/forge!6377	2022-03-10 07:27:26 +00:00
tool4EvEr	94d0802528	Some clean up fix	2022-03-10 08:26:21 +01:00
Michael Kamensky	1217c61736	Merge branch 'dennick' into 'master' ... Update cards See merge request core-developers/forge!6376	2022-03-09 16:53:01 +00:00
Hans Mackowiak	cd3546c2cb	Update SplashScreen	2022-03-09 13:17:07 +00:00
TRT	7b86c7cfac	Update cards	2022-03-09 09:56:08 +01:00
Michael Kamensky	dc038e8bc6	Merge branch 'textchange' into 'master' ... applyTextChangeEffects: fix replacing Self See merge request core-developers/forge!6372	2022-03-09 03:19:55 +00:00
Michael Kamensky	dcf240eb61	Merge branch 'randomcleanup' into 'master' ... Random cleanup See merge request core-developers/forge!6373	2022-03-09 03:19:33 +00:00
Bug Hunter	5218191821	Random cleanup	2022-03-09 03:19:31 +00:00
Michael Kamensky	3261406b9c	Merge branch 'sideboard' into 'master' ... Fix Sideboard filter See merge request core-developers/forge!6374	2022-03-09 03:19:05 +00:00
Michael Kamensky	c2cdd4135e	Merge branch 'Shorikai' into 'master' ... Fix for Shorikai See merge request core-developers/forge!6375	2022-03-09 03:18:50 +00:00
tool4EvEr	132ff7ed21	Clean up	2022-03-08 23:36:37 +01:00
tool4EvEr	8e34d7dd74	Fix for Shorikai	2022-03-08 21:26:58 +01:00