54905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Northmoc	2af4b81464	remove unneeded param	2021-12-27 13:04:45 -05:00
Northmoc	926f20f76e	AnimateEffectBase update booleans	2021-12-24 14:31:47 -05:00
Northmoc	21e742a229	town_razer_tyrant.txt	2021-12-24 10:10:39 -05:00
Michael Kamensky	6144ddacb6	Merge branch 'sac' into 'master' ... SacrificeAi: fix for Curse of the Cabal See merge request core-developers/forge!5965	2021-12-22 07:05:30 +00:00
Michael Kamensky	be387cd2c0	Merge branch 'qf' into 'master' ... quicksilver_fountain.txt add AI hint See merge request core-developers/forge!5966	2021-12-22 07:04:51 +00:00
Michael Kamensky	692db7188e	Merge branch 'damage' into 'master' ... Deal combat damage to players simultaneously Closes #2042 See merge request core-developers/forge!5960	2021-12-22 07:04:15 +00:00
tool4EvEr	e87def5398	Clean up	2021-12-21 23:19:59 +01:00
Northmoc	c0e6cdec03	quicksilver_fountain.txt add AI hint	2021-12-21 14:07:42 -05:00
TRT	c719d594dc	SacrificeAi: fix for Curse of the Cabal	2021-12-21 18:06:34 +01:00
Michael Kamensky	477c55fa4e	Merge branch 'cantVentureStatic' into 'master' ... Cant venture static See merge request core-developers/forge!5963	2021-12-21 16:34:42 +00:00
Michael Kamensky	c881ebcc5d	Merge branch 'ignoreHexproofShroud' into 'master' ... Ignore hexproof shroud See merge request core-developers/forge!5964	2021-12-21 16:34:19 +00:00
Hans Mackowiak	f3355d529a	Ignore hexproof shroud	2021-12-21 16:34:18 +00:00
Hans Mackowiak	430dab48c0	CantVenture static	2021-12-21 12:48:36 +01:00
Anthony Calosa	f48dd467a2	Merge branch 'master' into 'master' ... [Mobile] Support for highlighted players See merge request core-developers/forge!5962	2021-12-20 22:43:06 +00:00
Anthony Calosa	5b76f355ea	[Mobile] Support for highlighted players ... - Draws rectangle outline on the Player Avatar (uses same color outline with highlighted cards)	2021-12-21 06:40:47 +08:00
Hans Mackowiak	67d903335a	Merge branch 'type' into 'master' ... Fix hasCreatureType See merge request core-developers/forge!5961	2021-12-20 17:50:17 +00:00
tool4EvEr	47be073c50	Fix hasCreatureType	2021-12-20 18:32:36 +01:00
TRT	d9683252f1	Deal combat damage to players simultaneously	2021-12-20 18:09:57 +01:00
Bug Hunter	f0d87e2f31	Merge branch 'TRT-master-patch-93448' into 'master' ... Update forge-gui/res/cardsfolder/t/teferis_protection.txt Closes #2041 See merge request core-developers/forge!5959	2021-12-20 11:50:31 +00:00
Bug Hunter	2f3ba9b2e5	Update forge-gui/res/cardsfolder/t/teferis_protection.txt	2021-12-20 11:49:56 +00:00
Hans Mackowiak	473cb47c83	~ cleanup logback dependencies	2021-12-20 11:50:15 +01:00
Bug Hunter	7069e5739b	Merge branch 'TRT-master-patch-15571' into 'master' ... Update forge-gui/res/cardsfolder/w/wolverine_riders.txt See merge request core-developers/forge!5958	2021-12-20 07:55:07 +00:00
Bug Hunter	e00ae42696	Update forge-gui/res/cardsfolder/w/wolverine_riders.txt	2021-12-20 07:53:43 +00:00
Michael Kamensky	8ae0b968f0	Merge branch 'highlighting' into 'master' ... Fix player highlighting when selected Closes #2040 See merge request core-developers/forge!5957	2021-12-20 04:13:52 +00:00
tool4EvEr	4c3598d069	Fix mandatory	2021-12-20 00:02:33 +01:00
tool4EvEr	ddc12e2867	Clean up	2021-12-19 23:23:01 +01:00
Sol	8bd790cd1c	Merge branch 'logRework' into 'master' ... replace log4j with logback See merge request core-developers/forge!5955	2021-12-19 22:18:48 +00:00
tool4EvEr	402ecc607e	Fix NPE	2021-12-19 23:09:58 +01:00
tool4EvEr	c2f1472db7	Fix player highlighting when selected	2021-12-19 20:31:49 +01:00
Bug Hunter	78b4c07eec	Merge branch 'TRT-master-patch-78524' into 'master' ... Update forge-gui/res/cardsfolder/b/basic_conjuration.txt See merge request core-developers/forge!5956	2021-12-19 11:50:36 +00:00
Bug Hunter	f7004369a0	Update forge-gui/res/cardsfolder/b/basic_conjuration.txt	2021-12-19 11:49:41 +00:00
Hans Mackowiak	fb529368fa	replace log4j with logback	2021-12-19 10:32:18 +01:00
Michael Kamensky	4d68a4030b	Merge branch 'y22_18' into 'master' ... Inquisitor Captain (Y22) See merge request core-developers/forge!5953	2021-12-18 17:40:43 +00:00
Michael Kamensky	2c01aa81b8	Merge branch 'npe' into 'master' ... untilHostLeavesPlayCommand: Fix NPE when returning Aura See merge request core-developers/forge!5954	2021-12-18 14:41:06 +00:00
tool4EvEr	0df3e72d00	untilHostLeavesPlayCommand: Fix NPE when returning Aura	2021-12-18 12:56:45 +01:00
paul_snoops	28f0c0c674	Y22 cards 18 Dec	2021-12-18 11:23:39 +00:00
Michael Kamensky	c3a0e437d9	Merge branch 'neo_cards_17_12' into 'master' ... NEO cards 17 Dec See merge request core-developers/forge!5950	2021-12-18 03:59:48 +00:00
Bug Hunter	d9460e7fe7	Merge branch 'trigger' into 'master' ... Fix trigger remembering See merge request core-developers/forge!5952	2021-12-17 21:00:49 +00:00
tool4EvEr	40e50cd612	Fix trigger remembering	2021-12-17 22:00:13 +01:00
Michael Kamensky	6b4e7f1521	Merge branch 'edition_fixes' into 'master' ... Wizards Play Network 2022 and edition fixes See merge request core-developers/forge!5951	2021-12-17 20:10:48 +00:00
paul_snoops	c0aac4334d	kaito_shizuki fix	2021-12-17 17:56:06 +00:00
paul_snoops	9ccc75fcb8	kaito_shizuki	2021-12-17 15:00:18 +00:00
paul_snoops	bb5e1ec47e	hidetsugu_devouring_chaos	2021-12-17 13:24:36 +00:00
paul_snoops	b7e8c13b93	NEO cards 17 Dec	2021-12-17 13:24:36 +00:00
paul_snoops	f40643a439	Wizards Play Network 2022 and edition fixes	2021-12-17 12:24:24 +00:00
Michael Kamensky	ac3d009521	Merge branch 'neo_edtion' into 'master' ... NEO edition file See merge request core-developers/forge!5949	2021-12-17 10:56:22 +00:00
paul_snoops	cd15187d60	add one card	2021-12-17 09:16:23 +00:00
paul_snoops	add44f99bc	NEO edition file	2021-12-17 02:12:00 +00:00
Michael Kamensky	69f1b61fc1	Merge branch 'fixes' into 'master' ... Small fixes See merge request core-developers/forge!5948	2021-12-16 18:27:34 +00:00
paul_snoops	0fed13be54	Small fixes	2021-12-16 12:08:31 +00:00