44177 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anthony Calosa	f99e819ff0	Add puzzle improvements to Mobile Forge	2020-03-05 05:45:11 +08:00
Anthony Calosa	0f6b65a9ff	Merge remote-tracking branch 'remotes/core/master' into newBranch	2020-03-04 19:40:09 +08:00
austinio7116	6e94378cc1	Added filter to ensure banlist is respected	2020-03-04 06:05:07 +00:00
Jamin W. Collins	ff31718839	correct how collectorNumber is located ... The existing logic will always return the first match for a given card name, even if there are multiple different printings of the same card name within a set. This change aligns the collectorNumber with the alternate art index. Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-03 21:27:05 -07:00
Michael Kamensky	2ab5a286c5	Merge branch '030320' into 'master' ... March 3 fixes See merge request core-developers/forge!2580	2020-03-04 04:07:14 +00:00
Northmoc	e07208e81b	dissenters_deliverance.txt correct filename	2020-03-03 14:15:54 -05:00
Hans Mackowiak	1ec9c6cade	Merge branch 'glyphofdelusion' into 'master' ... Glyph of Delusion Closes #63 See merge request core-developers/forge!2482	2020-03-03 16:24:42 +00:00
Tim Mocny	04e94f68f5	Glyph of Delusion	2020-03-03 16:24:41 +00:00
Jamin W. Collins	e325f42ca8	change collector number to be a String ... This change moves the internal storage of collector number from Integer to String. The parsed pattern for valid collector numbers is any number of digits followed by an optional single non-digit character. This follows the format used by Scryfall for the alternate art WAR planeswalkers and cards from older formats sucha as FEM. Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-03 08:59:09 -07:00
Michael Kamensky	f3c078b23c	Merge branch 'Hanmac-master-patch-40459' into 'master' ... CardProperty: extend blockedValidThisTurn and blockedByValidThisTurn using defined Closes #1299 See merge request core-developers/forge!2579	2020-03-03 14:30:40 +00:00
Hans Mackowiak	4f0deea15f	CardProperty: extend blockedValidThisTurn and blockedByValidThisTurn using defined	2020-03-03 14:30:39 +00:00
Michael Kamensky	db396e6b5c	Merge branch '020320' into 'master' ... Fixes - 2 Mar 2020 See merge request core-developers/forge!2577	2020-03-03 04:07:39 +00:00
Tim Mocny	dfe7ea0ecc	Fixes - 2 Mar 2020	2020-03-03 04:07:39 +00:00
Michael Kamensky	55cba2513f	Merge branch 'witchHuntAi' into 'master' ... ControlGainAi: fix target logic for Witch Hunt See merge request core-developers/forge!2576	2020-03-02 06:08:02 +00:00
Hans Mackowiak	9bbc3c8ef2	ControlGainAi: fix target logic for Witch Hunt	2020-03-02 06:59:33 +01:00
Anthony Calosa	c473ecb827	Merge remote-tracking branch 'remotes/core/master' into newBranch	2020-03-02 12:30:51 +08:00
Anthony Calosa	f654982e38	Fix Card Reveal Animation for default display	2020-03-02 12:30:02 +08:00
Michael Kamensky	38394ee263	Merge branch 'fixes' into 'master' ... fix message when no cards in opponent's hand See merge request core-developers/forge!2575	2020-03-02 03:55:12 +00:00
Jamin W. Collins	c9010d4224	fix message when no cards in opponent's hand ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-01 14:04:08 -07:00
Michael Kamensky	cb1b8024b4	Merge branch '1303-control-change-and-cda-not-reset' into 'master' ... Resolve "Control Change and CDA not reset?" Closes #1303 See merge request core-developers/forge!2573	2020-03-01 17:15:39 +00:00
Hans Mackowiak	075a0e99af	Merieke Ri Berit: use Effect for Destroy Trigger	2020-03-01 17:37:06 +01:00
Jamin Collins	5f4c86697a	Merge branch 'sld37' into 'master' ... SLD - Thalia See merge request core-developers/forge!2574	2020-03-01 15:42:59 +00:00
Tim Mocny	1fee06c843	SLD - Thalia	2020-03-01 15:42:59 +00:00
Hans Mackowiak	23bc7a629b	Fix controllerChangeZoneCorrection when ControlGain is undone	2020-03-01 11:47:51 +01:00
Hans Mackowiak	86ec94ca0d	Merge branch '1300-crash-on-desktop-1-6-32-snapshot-r123-2020-01-27-1-pm' into 'master' ... Resolve "Crash on Desktop 1.6.32 Snapshot r123 (2020-01-27 ~1 PM)" Closes #1300 See merge request core-developers/forge!2555	2020-03-01 10:30:45 +00:00
Hans Mackowiak	93f0ade107	MustBlockEffect: use Choose Card for Crashing Boars	2020-03-01 10:30:45 +00:00
Michael Kamensky	40bb3d2750	Merge branch 'newBranch' into 'master' ... Update Sprite Icons (Default Theme) See merge request core-developers/forge!2564	2020-03-01 04:16:22 +00:00
Michael Kamensky	86a9cb13d9	Merge branch 'WAR_JP_PW' into 'master' ... WAR with Japanese Planeswalkers added (option 2) Closes #1305 See merge request core-developers/forge!2566	2020-03-01 04:15:18 +00:00
Tim Mocny	e1138ff7b5	WAR with Japanese Planeswalkers added (option 2)	2020-03-01 04:15:17 +00:00
Michael Kamensky	52fe82b834	Merge branch 'sliverfixes' into 'master' ... Forum fixes Leap Day See merge request core-developers/forge!2571	2020-03-01 04:14:47 +00:00
Tim Mocny	15e3c4f5e5	Forum fixes Leap Day	2020-03-01 04:14:47 +00:00
Michael Kamensky	4e5853e29a	Merge branch 'triggerFixStack' into 'master' ... GameAction: fix Trigger for Stack Closes #1309 See merge request core-developers/forge!2572	2020-03-01 04:14:44 +00:00
Hans Mackowiak	34d0d143c5	GameAction: fix Trigger for Stack	2020-03-01 04:14:44 +00:00
Michael Kamensky	d37cb22698	Merge branch 'master' into 'master' ... Added puzzle PS_THB5 + AI logic improvement for Kenrith, the Returned King See merge request core-developers/forge!2568	2020-03-01 04:13:57 +00:00
Anthony Calosa	b5787407b6	Merge remote-tracking branch 'remotes/core/master' into newBranch	2020-03-01 11:10:55 +08:00
Anthony Calosa	4d1d79098d	Better Icon Render	2020-03-01 10:47:48 +08:00
Sol	3fc0c1e20f	Merge branch 'fixes' into 'master' ... Fixes See merge request core-developers/forge!2570	2020-03-01 02:44:30 +00:00
Jamin Collins	726b8bfbe5	correct sprite load progress bar to 100% max ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-01 02:44:30 +00:00
Anthony Calosa	0306ab97f1	Fix Crash on Desktop, Menu Arrangement, Added some Icons	2020-03-01 07:42:20 +08:00
Jamin Collins	083df572b8	Merge branch 'tinyban' into 'master' ... Tiny Leaders ban - Najeela See merge request core-developers/forge!2569	2020-02-29 21:50:28 +00:00
Tim Mocny	12c705476d	Tiny Leaders ban - Najeela	2020-02-29 21:50:28 +00:00
Agetian	4880d70129	- Simple modification for AI PumpAll on Kenrith	2020-02-29 19:33:35 +03:00
Agetian	f49d5e2352	- Better AI targeting for Kenrith, the Returned King's {4}{B} ability.	2020-02-29 19:25:24 +03:00
Agetian	f8b9a31bf2	Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master	2020-02-29 17:06:04 +03:00
Michael Kamensky	808a43b44d	Merge branch 'editions28feb' into 'master' ... Editions support for Grand Prix Promos, Unsanctioned See merge request core-developers/forge!2562	2020-02-29 14:02:09 +00:00
Tim Mocny	f2c523c267	Editions support for Grand Prix Promos, Unsanctioned	2020-02-29 14:02:09 +00:00
Michael Kamensky	b847f7f8c9	Merge branch 'immolation' into 'master' ... Mask of Immolation typos fix See merge request core-developers/forge!2560	2020-02-29 14:01:26 +00:00
Tim Mocny	a9f13ee503	Mask of Immolation typos fix	2020-02-29 14:01:26 +00:00
Agetian	e0b7ea4960	- Added puzzle PS_THB5.	2020-02-29 16:49:53 +03:00
Sol	a41c0454fa	Merge branch 'update-modern-banned' into 'master' ... updating the Modern banned list See merge request core-developers/forge!2565	2020-02-29 04:39:58 +00:00