56126 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Kamensky	03d040616f	Merge branch 'fussy' into 'master' ... fussy prompt fix See merge request core-developers/forge!6123	2022-02-02 05:54:30 +00:00
Michael Kamensky	1609c78741	Merge branch 'neo_1' into 'master' ... NEO – 1 Feb See merge request core-developers/forge!6117	2022-02-02 05:54:28 +00:00
Tim Mocny	7eb277d5a6	NEO – 1 Feb	2022-02-02 05:54:26 +00:00
Michael Kamensky	1b5360c182	Merge branch 'neo_ktw' into 'master' ... NEO: Kappa Tech-Wrecker and some etbCounter parsing upgrades See merge request core-developers/forge!6122	2022-02-02 05:54:12 +00:00
Tim Mocny	73e4e838bc	NEO: Kappa Tech-Wrecker and some etbCounter parsing upgrades	2022-02-02 05:54:11 +00:00
Michael Kamensky	39ff60f714	Merge branch 'neo_morj' into 'master' ... NEO: March of Reckless Joy and support See merge request core-developers/forge!6124	2022-02-02 05:52:56 +00:00
Tim Mocny	84d8a65859	NEO: March of Reckless Joy and support	2022-02-02 05:52:55 +00:00
Northmoc	0e7c59f685	fussy prompt fix	2022-02-01 23:36:14 -05:00
Renato Santos	8dcc1f6b9d	Update forge-gui/res/cardsfolder/upcoming/invoke_justice.txt	2022-02-02 03:13:40 +00:00
pakoito	ca713037a3	feat: add log for number of turns played at the end of the game	2022-02-02 01:28:52 +00:00
Renato Santos	df0a153eac	Requested edits: all but one	2022-02-02 01:10:41 +00:00
Anthony Calosa	96766a2a12	Merge branch 'master' into 'master' ... [Mobile] fix Deck list view mana symbols See merge request core-developers/forge!6120	2022-02-02 00:41:43 +00:00
Anthony Calosa	f3f74dc894	Merge remote-tracking branch 'core/master'	2022-02-02 08:30:01 +08:00
Anthony Calosa	fb00d35404	[Mobile] fix symbol width	2022-02-02 08:28:28 +08:00
Renato Santos	894ef2533b	New card scripts	2022-02-01 21:16:45 +00:00
Michael Kamensky	d13396484d	Merge branch 'neo_hm' into 'master' ... NEO: "crews Vehicles as though its power were X greater" support See merge request core-developers/forge!6095	2022-02-01 20:06:33 +00:00
Tim Mocny	b981b52f83	NEO: "crews Vehicles as though its power were X greater" support	2022-02-01 20:06:33 +00:00
Michael Kamensky	a596d88c84	Merge branch 'neo_ao' into 'master' ... NEO: Ao, the Dawn Sky and support See merge request core-developers/forge!6112	2022-02-01 20:06:25 +00:00
Michael Kamensky	0328438bfb	Merge branch 'cleanup' into 'master' ... Random Cleanup See merge request core-developers/forge!6118	2022-02-01 20:05:47 +00:00
tool4EvEr	b2571753be	Less ChangeNum$ 1	2022-02-01 20:21:24 +01:00
tool4EvEr	cb48c6e411	Remove TriggerController$ TriggeredCardController default	2022-02-01 20:14:04 +01:00
tool4EvEr	1e3916f086	Remove default param	2022-02-01 17:51:40 +01:00
tool4EvEr	d27552dd25	Clean up	2022-02-01 17:51:19 +01:00
Paul Hammerton	6fda10fa20	Merge branch 'neo_update_p22' into 'master' ... P22 edition and NEO update See merge request core-developers/forge!6116	2022-02-01 13:08:38 +00:00
paul_snoops	f252b74051	edition file name changes	2022-02-01 13:07:50 +00:00
paul_snoops	fec2344d86	P22 edition and NEO update	2022-02-01 12:57:24 +00:00
Michael Kamensky	1e3260a45e	Merge branch 'neo_31' into 'master' ... NEO - 31 Jan See merge request core-developers/forge!6114	2022-02-01 04:39:12 +00:00
Tim Mocny	fc05fdfada	NEO - 31 Jan	2022-02-01 04:39:07 +00:00
Michael Kamensky	2425623491	Merge branch 'guardian' into 'master' ... Guardian Project fix for if clause See merge request core-developers/forge!6111	2022-01-31 18:05:08 +00:00
Northmoc	5bfa3e0e34	DigEffect support "WithTotalCMC"	2022-01-31 13:03:43 -05:00
Northmoc	badbb2d2fd	ao_the_dawn_sky.txt	2022-01-31 13:03:15 -05:00
TRT	81602fe262	Guardian Project fix for if clause	2022-01-31 16:59:20 +01:00
Anthony Calosa	348fd0bed7	Merge branch 'master' into 'master' ... [Mobile] Add AI Status to Deck ListView See merge request core-developers/forge!6110	2022-01-31 12:35:13 +00:00
Anthony Calosa	03b338f4f0	[Mobile] Add AI Status to Deck ListView	2022-01-31 20:34:25 +08:00
Michael Kamensky	c6b4a2b27f	Merge branch 'etbcounters' into 'master' ... ETB counters fix See merge request core-developers/forge!6109	2022-01-31 12:26:33 +00:00
Bug Hunter	f4f0a82b40	ETB counters fix	2022-01-31 12:26:32 +00:00
Michael Kamensky	cd5a24fa52	Merge branch 'presence' into 'master' ... Presence fixes See merge request core-developers/forge!6103	2022-01-31 12:25:48 +00:00
Bug Hunter	74d2c68b12	Presence fixes	2022-01-31 12:25:47 +00:00
Paul Hammerton	1993aa7644	Merge branch 'jin_name_fix' into 'master' ... Jin-Gitaxias name fix See merge request core-developers/forge!6108	2022-01-31 09:07:55 +00:00
paul_snoops	81f86d4d01	Jin-Gitaxias name fix	2022-01-31 09:06:47 +00:00
Paul Hammerton	da6b5a972d	Merge branch 'neo_update' into 'master' ... NEO edition update See merge request core-developers/forge!6107	2022-01-31 09:01:49 +00:00
paul_snoops	e45d7a9d23	NEO edition update	2022-01-31 09:00:31 +00:00
Michael Kamensky	59b687bb59	Merge branch 'typo' into 'master' ... Typo cleanup See merge request core-developers/forge!6104	2022-01-31 05:40:30 +00:00
Tim Mocny	39cdad2353	Typo cleanup	2022-01-31 05:40:29 +00:00
Michael Kamensky	2fdbaada41	Merge branch 'neo_30' into 'master' ... NEO – 30 Jan See merge request core-developers/forge!6105	2022-01-31 05:40:14 +00:00
Tim Mocny	a6f0ca8476	NEO – 30 Jan	2022-01-31 05:40:06 +00:00
Anthony Calosa	51fee69a3b	Merge branch 'master' into 'master' ... [Mobile] Add AI Status to Deck ImageView See merge request core-developers/forge!6106	2022-01-31 04:59:30 +00:00
Anthony Calosa	c267bc5ddd	[Mobile] Add AI Status to Deck ImageView	2022-01-31 12:58:35 +08:00
Anthony Calosa	d91af76ca9	Merge branch 'adventure-case-issues' into 'master' ... Fix capitalization issues See merge request core-developers/forge!6101	2022-01-30 22:41:54 +00:00
Anthony Calosa	08cd2611e5	Merge branch 'cleanup' into 'master' ... various card cleanup See merge request core-developers/forge!6102	2022-01-30 22:39:40 +00:00