56242 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Renato Santos	5413422245	Update forge-gui/res/cardsfolder/rebalanced/a-ellywick_tumblestrum.txt, forge-gui/res/cardsfolder/rebalanced/a-teferi_time_raveler.txt	2022-02-23 18:13:47 +00:00
Anthony Calosa	1624617207	Merge remote-tracking branch 'core/master'	2022-02-24 02:09:23 +08:00
Anthony Calosa	94594673e0	update	2022-02-24 02:07:35 +08:00
Renato Santos	2d9774acea	Update forge-gui/res/cardsfolder/upcoming/armguard_familiar.txt	2022-02-23 17:58:16 +00:00
Renato Santos	82ca945230	Update forge-gui/res/cardsfolder/s/stuffed_bear.txt	2022-02-23 17:52:23 +00:00
Renato Santos	c2f2ab9550	Update forge-gui/res/cardsfolder/t/teferis_veil.txt, forge-gui/res/cardsfolder/e/eerie_ultimatum.txt	2022-02-23 17:36:52 +00:00
Bug Hunter	ad99ed236a	Merge branch 'TRT-master-patch-98000' into 'master' ... Update forge-gui/res/cardsfolder/upcoming/the_wandering_emperor.txt See merge request core-developers/forge!6291	2022-02-23 17:33:30 +00:00
Bug Hunter	fdbb1ad98c	Update forge-gui/res/cardsfolder/upcoming/the_wandering_emperor.txt	2022-02-23 17:32:55 +00:00
Renato Santos	59b7a56078	Update forge-gui/res/cardsfolder/upcoming/tanuki_transplanter.txt	2022-02-23 17:30:15 +00:00
Renato Santos	c3da514145	Update forge-gui/res/cardsfolder/upcoming/jukai_preserver.txt	2022-02-23 17:17:47 +00:00
Renato Santos	f3f9a7d99a	Update forge-gui/res/cardsfolder/w/wildest_dreams.txt	2022-02-23 16:36:05 +00:00
Renato Santos	f64331ddc3	Update forge-gui/res/cardsfolder/l/leinore_autumn_sovereign.txt	2022-02-23 16:08:00 +00:00
Renato Santos	8227582b16	Merge branch 'master' into 'freshmaster' ... # Conflicts: # forge-gui/res/cardsfolder/upcoming/hidetsugu_consumes_all_vessel_of_the_all_consuming.txt # forge-gui/res/cardsfolder/upcoming/rampant_rejuvenator.txt	2022-02-23 15:41:22 +00:00
Renato Santos	1251b8a02c	Update forge-gui/res/cardsfolder/d/drake_stone.txt	2022-02-23 15:02:09 +00:00
Michael Kamensky	30b348a97c	Merge branch 'hybrid' into 'master' ... ManaEffect: fix for adding from cost with generic half See merge request core-developers/forge!6289	2022-02-23 14:52:44 +00:00
tool4EvEr	885b32f85a	ManaEffect: fix for adding from cost with generic half	2022-02-23 15:43:03 +01:00
Renato Santos	914237e850	Update forge-gui/res/cardsfolder/w/wildest_dreams.txt	2022-02-23 13:49:07 +00:00
Renato Santos	9ebc32c5ee	Update forge-gui/res/cardsfolder/upcoming/mirror_box.txt	2022-02-23 13:22:59 +00:00
Anthony Calosa	802f9837bd	update settings check box and back button	2022-02-23 21:22:07 +08:00
Renato Santos	db8e2e7c6f	Update forge-gui/res/cardsfolder/upcoming/hidetsugu_consumes_all_vessel_of_the_all_consuming.txt	2022-02-23 13:18:28 +00:00
Renato Santos	cce2f711d8	Update forge-gui/res/cardsfolder/upcoming/rampant_rejuvenator.txt	2022-02-23 13:12:21 +00:00
Anthony Calosa	aa0fca7b68	update new game, save load and settings	2022-02-23 16:09:55 +08:00
Anthony Calosa	dc4eed4b08	Revert "Brawl deck included for testing purposes" ... This reverts commit b54cd071b6.	2022-02-23 14:06:30 +08:00
Anthony Calosa	3e3d6fd0cd	Merge remote-tracking branch 'core/brawl'	2022-02-23 14:06:16 +08:00
Anthony Calosa	3d8648f7d8	update start menu	2022-02-23 14:00:48 +08:00
Anthony Calosa	2936380bb8	update player name when loading save and starting match ... - todo update some mobile layout	2022-02-23 13:31:51 +08:00
Michael Kamensky	a70e75f04e	Merge branch 'myojin' into 'master' ... myojin_of_seeing_winds.txt etbCounter See merge request core-developers/forge!6288	2022-02-23 04:20:08 +00:00
Northmoc	ffdc4bf1ce	myojin_of_seeing_winds.txt etbCounter	2022-02-22 21:06:35 -05:00
Anthony Calosa	edb6aff2d6	Merge remote-tracking branch 'core/master'	2022-02-23 08:02:34 +08:00
Anthony Calosa	d7dcc2ae21	update viewport and hud button bounds	2022-02-23 08:00:14 +08:00
Anthony Calosa	6f15f7c618	Merge branch 'neo_draft' into 'master' ... NEO draft update See merge request core-developers/forge!6285	2022-02-22 23:31:13 +00:00
paul_snoops	9480bab6e8	dfc	2022-02-22 18:57:21 +00:00
Michael Kamensky	1d8367c27e	Merge branch 'twosat-master-patch-07360' into 'master' ... Update de-DE.properties See merge request core-developers/forge!6284	2022-02-22 18:56:13 +00:00
paul_snoops	20f6e0fa68	NEO Draft Update	2022-02-22 16:13:50 +00:00
paul_snoops	15145e8b28	NEO Draft Update	2022-02-22 16:13:32 +00:00
Andreas Bendel	ef790504ac	Update de-DE.properties ... translated the new GUI options	2022-02-22 15:24:24 +00:00
Paul Hammerton	889fce2e39	Merge branch 'neo_nec_tokens' into 'master' ... NEO and NEC tokens in edition files See merge request core-developers/forge!6283	2022-02-22 12:56:00 +00:00
paul_snoops	61c49a2589	NEO and NEC tokens in edition files	2022-02-22 12:54:09 +00:00
Michael Kamensky	c45ee59387	Merge branch 'stackDescs' into 'master' ... some more getStackDescription improvements See merge request core-developers/forge!6281	2022-02-22 09:48:59 +00:00
Tim Mocny	deb9744b38	some more getStackDescription improvements	2022-02-22 09:48:51 +00:00
Anthony Calosa	460475bb2a	Merge branch 'master' into 'master' ... unused imports See merge request core-developers/forge!6282	2022-02-22 07:05:51 +00:00
Anthony Calosa	e594a1ba86	unused imports	2022-02-22 15:00:47 +08:00
Anthony Calosa	7e8406d0ed	Merge branch 'master' into 'master' ... update touch controls for adventure rewards See merge request core-developers/forge!6278	2022-02-22 06:54:58 +00:00
Anthony Calosa	a799f3919c	Merge remote-tracking branch 'core/master'	2022-02-22 14:49:30 +08:00
Anthony Calosa	10c28ff2c3	align save/load layout	2022-02-22 14:42:25 +08:00
Anthony Calosa	a0498d9727	fix format	2022-02-22 12:36:28 +08:00
Anthony Calosa	b6a6b4517c	update UIActor ... - to set Label styles for font inside Table	2022-02-22 12:30:18 +08:00
Michael Kamensky	fea1a3b9dd	Merge branch 'nec_21' into 'master' ... NEC – 21 Feb See merge request core-developers/forge!6280	2022-02-22 04:05:24 +00:00
Tim Mocny	d638b50910	NEC – 21 Feb	2022-02-22 04:05:21 +00:00
Anthony Calosa	68ecc56a4e	update TransitionScreen ... - to match selected theme and logo	2022-02-22 09:36:29 +08:00