44352 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anthony Calosa	d754c2c4d3	Update Win/Lose Overlay (mobile) ... At the end of the match, user can minimize the overlay to see the last battlefield and browse other zones, to bring up the overlay, click game menu, and click Show WinLose Overlay. Also fixes issue #928	2020-04-26 15:00:57 +08:00
Michael Kamensky	049e129606	Merge branch 'fixXPaidZeroCyclingCastTrigger' into 'master' ... fix Cycling for Zero with xPaid, also do Zaxara with xPaid See merge request core-developers/forge!2758	2020-04-25 19:56:37 +00:00
Hans Mackowiak	b5deb0b252	fix Cycling for Zero with xPaid, also do Zaxara with xPaid	2020-04-25 19:56:37 +00:00
Michael Kamensky	0bb42a2794	Merge branch '1372-used-memory-grows-quadratic-in-the-number-of-triggered-spells' into 'master' ... Resolve "Used memory grows quadratic in the number of triggered spells" Closes #1372 See merge request core-developers/forge!2756	2020-04-25 17:36:50 +00:00
Hans Mackowiak	a9b5e1d112	Resolve "Used memory grows quadratic in the number of triggered spells"	2020-04-25 17:36:50 +00:00
Michael Kamensky	c1c9271458	Merge branch 'master' into 'master' ... Add color requirement AI hints to the ELD land cycle that usually comes tapped. See merge request core-developers/forge!2757	2020-04-25 15:52:43 +00:00
Agetian	44e4dfecca	- Add color requirement AI hints to the ELD land cycle that usually comes tapped and has a "comes untapped" effect.	2020-04-25 18:38:36 +03:00
swordshine	d809fa6b91	Merge branch 'mysticsubdual' into 'master' ... IKO - mystic_subdual.txt See merge request core-developers/forge!2754	2020-04-25 04:47:10 +00:00
Tim Mocny	c5a89747b8	IKO - mystic_subdual.txt	2020-04-25 04:47:10 +00:00
Michael Kamensky	36341a85cd	Merge branch 'move' into 'master' ... Tweaks - 24 April See merge request core-developers/forge!2753	2020-04-24 14:34:22 +00:00
Tim Mocny	253256799c	Tweaks - 24 April	2020-04-24 14:34:22 +00:00
Michael Kamensky	16fa79132b	Merge branch 'zaxara' into 'master' ... Zaxara (C20) See merge request core-developers/forge!2735	2020-04-24 14:33:18 +00:00
Tim Mocny	f02ab6c073	Zaxara (C20)	2020-04-24 14:33:18 +00:00
swordshine	ef208f3442	Merge branch 'fixes.4.23' into 'master' ... Fixes - 23 April See merge request core-developers/forge!2752	2020-04-24 00:23:42 +00:00
Northmoc	bdcaf785bd	labyrinth_raptor.txt - ChangeNum$ -> Amount$	2020-04-23 19:14:54 -04:00
Northmoc	318c4891a4	grave_betrayal.txt - RememberObjects$ TriggeredCard	2020-04-23 19:14:54 -04:00
Michael Kamensky	a6fcec519d	Merge branch 'master' into 'master' ... Added an AI hint for Leyline of Abundance. See merge request core-developers/forge!2750	2020-04-23 15:33:19 +00:00
Agetian	7f3bc8f7f9	- Added an AI hint for Leyline of Abundance.	2020-04-23 18:09:42 +03:00
Michael Kamensky	f2e7068706	Merge branch 'titansnest' into 'master' ... Titans' Nest (IKO) See merge request core-developers/forge!2708	2020-04-23 15:00:05 +00:00
Tim Mocny	67c0722db8	Titans' Nest (IKO)	2020-04-23 15:00:05 +00:00
Michael Kamensky	60ad4cf0d1	Merge branch 'master' into 'master' ... Added a couple AI hints. See merge request core-developers/forge!2749	2020-04-23 09:43:14 +00:00
Agetian	d76004509d	- Added a couple AI hints.	2020-04-23 11:02:51 +03:00
Michael Kamensky	bac8497bc3	Merge branch 'newBranch' into 'master' ... Fix uncleared selectables when a player concedes and restarts next game See merge request core-developers/forge!2748	2020-04-23 06:54:33 +00:00
Anthony Calosa	ac9636c44e	Fix uncleared selectables when a player concedes and restarts next game	2020-04-23 14:07:15 +08:00
Michael Kamensky	89b534a580	Merge branch 'master' into 'master' ... Add basic AI logic for Capricopian. See merge request core-developers/forge!2747	2020-04-22 18:16:28 +00:00
Agetian	daa982389e	- Add basic logic for Capricopian.	2020-04-22 21:05:37 +03:00
Michael Kamensky	e56ee38933	Merge branch 'capricopian' into 'master' ... Capricopian (C20) See merge request core-developers/forge!2742	2020-04-22 17:12:23 +00:00
Tim Mocny	b12ed3307a	Capricopian (C20)	2020-04-22 17:12:23 +00:00
Michael Kamensky	08446a344c	Merge branch 'master' into 'master' ... Add an attack effect hint for Krenko, Tin Street Kingpin. See merge request core-developers/forge!2746	2020-04-22 16:42:47 +00:00
Agetian	5ec6589175	- Add an attack effect hint for Krenko, Tin Street Kingpin.	2020-04-22 19:30:28 +03:00
Michael Kamensky	bdff4a12e7	Merge branch 'master' into 'master' ... Run the AI trigger code in case the SA is pre-targeted earlier in the code (fixes Nyx Herald) + improve AI Adventure support See merge request core-developers/forge!2745	2020-04-22 16:25:43 +00:00
Agetian	f610203a53	Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master	2020-04-22 19:19:53 +03:00
Agetian	37b7408163	- Improve support for AI casting Sorcery speed Adventure cards.	2020-04-22 19:16:30 +03:00
Agetian	67684fa4ec	- Don't cut short when checking whether to run the AI trigger code if the triggered ability was pre-targeted in earlier checks before doTrigger is called.	2020-04-22 18:43:22 +03:00
Michael Kamensky	5787bf7660	Merge branch 'xyris' into 'master' ... Xyris (C20) See merge request core-developers/forge!2734	2020-04-22 15:13:31 +00:00
Tim Mocny	e621972ad2	Xyris (C20)	2020-04-22 15:13:30 +00:00
Michael Kamensky	84146df00e	Merge branch 'manascape' into 'master' ... Manascape Refractor (C20) See merge request core-developers/forge!2737	2020-04-22 14:57:46 +00:00
Northmoc	a27673ef5b	manascape_refractor.txt	2020-04-22 10:46:40 -04:00
Michael Kamensky	4c8072afd2	Merge branch 'master' into 'master' ... Added several new cubes ported from XMage + two submitted cubes See merge request core-developers/forge!2744	2020-04-22 08:09:34 +00:00
Agetian	6340f92c95	- Added several new cubes ported from XMage + two cubes submitted on Slightlymagic (by thegreatone1357 and dolphi5).	2020-04-22 11:02:28 +03:00
Michael Kamensky	9349477f21	Merge branch 'newBranch' into 'master' ... Improve Online Lobby (Mobile Port) Closes #659, #658, #172, and #914 See merge request core-developers/forge!2738	2020-04-22 04:24:19 +00:00
Anthony Calosa	96e243e4c9	Refactor stack -> Deque, add check for transformCount	2020-04-22 07:29:49 +08:00
Anthony Calosa	828885c9b0	Merge remote-tracking branch 'remotes/core/master' into newBranch	2020-04-22 05:55:38 +08:00
Michael Kamensky	4694ea8014	Merge branch 'mutual_destruction' into 'master' ... Mutual Destruction fix :: AffectedZones -> EffectZone See merge request core-developers/forge!2743	2020-04-21 18:29:05 +00:00
Tim Mocny	41d0fa9227	Mutual Destruction fix :: AffectedZones -> EffectZone	2020-04-21 18:29:05 +00:00
Michael Kamensky	7e158620f3	Merge branch 'nikara_yannik' into 'master' ... Nikara and Yannik (C20) See merge request core-developers/forge!2736	2020-04-21 18:28:38 +00:00
Tim Mocny	4ffbaf87a0	Nikara and Yannik (C20)	2020-04-21 18:28:37 +00:00
Michael Kamensky	0a32dcffa6	Merge branch 'cleanup' into 'master' ... Cleanups - 21 April See merge request core-developers/forge!2741	2020-04-21 17:06:24 +00:00
Tim Mocny	f20f4dcfe4	Cleanups - 21 April	2020-04-21 17:06:24 +00:00
Michael Kamensky	377e2dc9a6	Merge branch 'patch-2' into 'master' ... Update alpine_moon.txt See merge request core-developers/forge!2740	2020-04-21 16:56:01 +00:00