55549 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anthony Calosa	7499bddbb4	Merge branch 'master' into 'master' ... [Mobile] Fix Dropdown visibility on activate See merge request core-developers/forge!6194	2022-02-09 04:05:53 +00:00
Anthony Calosa	792cd9966c	[Mobile] Fix Dropdown visibility on activate ... prior to autoclose changes	2022-02-09 12:03:48 +08:00
Anthony Calosa	859edf866a	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-09 11:11:12 +08:00
Anthony Calosa	b7f15da799	Merge branch 'master' into 'master' ... [Mobile] Fix auto close for Add Basic Lands Dialog and Deck Chooser See merge request core-developers/forge!6193	2022-02-09 03:06:01 +00:00
Anthony Calosa	e4422157ad	[Mobile] Fix auto close for Add Basic Lands Dialog and Deck Chooser	2022-02-09 11:04:27 +08:00
Anthony Calosa	524b26f45a	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-09 10:49:56 +08:00
Renato Santos	97981b1cbe	Tested card scripts for NEO (2022-06-09)	2022-02-09 00:54:21 +00:00
Paul Hammerton	aabff5bd08	Merge branch 'nec_edition' into 'master' ... NEC edition update See merge request core-developers/forge!6191	2022-02-09 00:36:48 +00:00
paul_snoops	82fc79cefb	NEC edition update	2022-02-09 00:35:23 +00:00
Paul Hammerton	f322da9d8f	Merge branch 'citizen_token_fix' into 'master' ... WAR edition citizen token fix See merge request core-developers/forge!6190	2022-02-09 00:01:07 +00:00
paul_snoops	b777af5540	WAR edition citizen token fix	2022-02-08 23:58:09 +00:00
Anthony Calosa	fea769ed95	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-09 05:07:14 +08:00
Michael Kamensky	2c4aabb1f8	Merge branch 'coretype' into 'master' ... move Enchantment up in CoreType enum See merge request core-developers/forge!6188	2022-02-08 16:50:55 +00:00
Michael Kamensky	e95f0878eb	Merge branch 'vigor' into 'master' ... Vigor Mortis counters Closes #2074 See merge request core-developers/forge!6189	2022-02-08 16:50:32 +00:00
TRT	b44530d296	Vigor Mortis counters	2022-02-08 17:38:46 +01:00
Northmoc	c4b421afe0	move Enchantment up in CoreType enum	2022-02-08 09:57:40 -05:00
Anthony Calosa	ce9c1a1a9c	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-08 22:22:15 +08:00
Michael Kamensky	c2ff0bcbcd	Merge branch 'fix' into 'master' ... c_a_treasure_sac.txt desc fix See merge request core-developers/forge!6186	2022-02-08 12:41:46 +00:00
Michael Kamensky	76a04ce37a	Merge branch 'fixcard' into 'master' ... Fix Inventive Iteration See merge request core-developers/forge!6187	2022-02-08 09:40:11 +00:00
Bug Hunter	0eb952715e	Fix Inventive Iteration	2022-02-08 09:40:11 +00:00
Anthony Calosa	1b205f8fe3	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-08 12:56:47 +08:00
Anthony Calosa	f6857a783d	update tenpatch, remove duplicate	2022-02-08 12:52:45 +08:00
Northmoc	a72ac6d3ae	c_a_treasure_sac.txt desc fix	2022-02-07 23:42:16 -05:00
Michael Kamensky	7272856f93	Merge branch 'strings' into 'master' ... Fixing/adding flexibility to ChangeZoneEffect stack description builder See merge request core-developers/forge!6136	2022-02-08 04:16:28 +00:00
Tim Mocny	254ba8ed81	Fixing/adding flexibility to ChangeZoneEffect stack description builder	2022-02-08 04:16:27 +00:00
Michael Kamensky	e27e4e4de8	Merge branch 'neo_7' into 'master' ... NEO – 7 Feb See merge request core-developers/forge!6184	2022-02-08 04:14:30 +00:00
Tim Mocny	bb7331a708	NEO – 7 Feb	2022-02-08 04:14:26 +00:00
Michael Kamensky	674db6f642	Merge branch 'rbtweaks' into 'master' ... NEO: Reckoner Bankbuster tweaks See merge request core-developers/forge!6183	2022-02-08 04:13:53 +00:00
Tim Mocny	a9abb8c30b	NEO: Reckoner Bankbuster tweaks	2022-02-08 04:13:52 +00:00
Anthony Calosa	11c47f7906	added Fregnor adventure expansion ... 2-7-22	2022-02-08 08:44:41 +08:00
Anthony Calosa	22eda4b2ea	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-08 07:29:16 +08:00
Anthony Calosa	cffda7a41c	update ui	2022-02-08 07:09:16 +08:00
Michael Kamensky	3f848abd5a	Merge branch 'mMR' into 'master' ... Cleanup meetsManaRestrictions See merge request core-developers/forge!6182	2022-02-07 18:45:47 +00:00
Bug Hunter	2da9647021	Cleanup meetsManaRestrictions	2022-02-07 18:45:46 +00:00
Michael Kamensky	f1e6e868bf	Merge branch 'neo_mindlink' into 'master' ... NEO: Mindlink Mech and support See merge request core-developers/forge!6181	2022-02-07 18:44:45 +00:00
Tim Mocny	223cecca97	NEO: Mindlink Mech and support	2022-02-07 18:44:44 +00:00
Michael Kamensky	dbf5a5a386	Merge branch 'neo_mechtitan' into 'master' ... NEO: Mechtitan Core + Mechtitan token and support See merge request core-developers/forge!6162	2022-02-07 18:43:43 +00:00
Tim Mocny	c41d72044f	NEO: Mechtitan Core + Mechtitan token and support	2022-02-07 18:43:40 +00:00
Anthony Calosa	02635ef00c	convert point to vector2	2022-02-08 00:06:46 +08:00
Anthony Calosa	1f692b165b	convert java code	2022-02-07 23:32:54 +08:00
Anthony Calosa	d9fec971dc	fix ui_skin.json	2022-02-07 23:23:02 +08:00
Anthony Calosa	e7b8ad090e	update deck editor	2022-02-07 22:33:37 +08:00
Anthony Calosa	3550a7dc96	unused imports	2022-02-07 20:50:35 +08:00
Anthony Calosa	49ad463cf9	Fix	2022-02-07 20:34:46 +08:00
Anthony Calosa	6cb0d80e28	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-07 20:34:12 +08:00
Michael Kamensky	a932b75985	Merge branch 'stackdesc3' into 'master' ... AnimateEffect / DamageDealEffect improve getStackDescription See merge request core-developers/forge!6176	2022-02-07 09:23:10 +00:00
Tim Mocny	7fec1d98ba	AnimateEffect / DamageDealEffect improve getStackDescription	2022-02-07 09:23:08 +00:00
Michael Kamensky	1ae9cc65e1	Merge branch 'freshmaster' into 'master' ... Tested card scripts for NEO (2022-06-06) See merge request core-developers/forge!6179	2022-02-07 04:36:44 +00:00
Michael Kamensky	2514d857f9	Merge branch 'neo_6' into 'master' ... NEO – 6 Feb See merge request core-developers/forge!6174	2022-02-07 04:36:13 +00:00
Tim Mocny	9db08ea013	NEO – 6 Feb	2022-02-07 04:36:10 +00:00