56126 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Michael Kamensky	f52dc8e1da	Merge branch 'typo' into 'master' ... ascent_of_the_worthy.txt finish SpellDesc for III See merge request core-developers/forge!6178	2022-02-07 04:35:29 +00:00
Renato Santos	d23b38b18a	Requested corrections	2022-02-07 04:25:16 +00:00
Anthony Calosa	2ed45c2d91	cleanup ... - todo figure out android...	2022-02-07 10:37:08 +08:00
Anthony Calosa	b6e03b165f	fix startup ... - todo figure out android...	2022-02-07 10:26:33 +08:00
Anthony Calosa	2539e9b9ef	update	2022-02-07 09:00:46 +08:00
Renato Santos	9c0d347679	New tested card scripts (2022-06-06)	2022-02-07 00:13:21 +00:00
Anthony Calosa	55f1baee8c	replace lambda ... - investigate adventure desktop scenes freeze - investigate android crash	2022-02-07 06:40:05 +08:00
Anthony Calosa	dd12073f1a	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-07 06:16:05 +08:00
Northmoc	dc2683fde9	ascent_of_the_worthy.txt finish SpellDesc for III	2022-02-06 16:11:53 -05:00
Michael Kamensky	43f4866a1e	Merge branch 'master' into 'master' ... Revert RemoveOptional in GameState, might break on clones. See merge request core-developers/forge!6175	2022-02-06 18:45:41 +00:00
Michael Kamensky	54c9ec7e89	- Revert RemoveOptional in GameState, might break on clones.	2022-02-06 21:44:56 +03:00
Anthony Calosa	6afce227cb	move back editor window exclusively for desktop ... - investigate adventure desktop scenes freeze - investigate android crash	2022-02-07 00:59:19 +08:00
Anthony Calosa	ee675d0585	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-06 23:00:46 +08:00
Michael Kamensky	93eb0b062a	Merge branch 'master' into 'master' ... Filter valid options for the AI when choosing a card name before running the logic. See merge request core-developers/forge!6173	2022-02-06 14:46:31 +00:00
Michael Kamensky	3ba614c551	- Filter valid options for the AI when choosing a card name before running the logic.	2022-02-06 17:45:28 +03:00
Anthony Calosa	8878fe2c4c	update controls to be playable	2022-02-06 22:40:33 +08:00
Michael Kamensky	621039b1c3	Merge branch 'johnwilliams7-master-patch-49806' into 'master' ... Update Secret Lair Drop Series.txt See merge request core-developers/forge!6172	2022-02-06 14:03:42 +00:00
Anthony Calosa	08fa608237	update port	2022-02-06 21:18:04 +08:00
John Williams	0adf9e666c	Update Secret Lair Drop Series.txt	2022-02-06 12:43:35 +00:00
Anthony Calosa	9b6a51f642	Merge remote-tracking branch 'core/master' into AdventureModePort	2022-02-06 19:43:42 +08:00
Paul Hammerton	5b72edaafa	Merge branch 'name_fix' into 'master' ... Saiba Trespassers name fix in edition See merge request core-developers/forge!6171	2022-02-06 10:48:58 +00:00
paul_snoops	53b35c6424	Saiba Trespassers name fix in edition	2022-02-06 10:44:20 +00:00
Michael Kamensky	2baca7f34a	Merge branch 'neo_5' into 'master' ... NEO – 5 Feb See merge request core-developers/forge!6165	2022-02-06 09:37:41 +00:00
Tim Mocny	4c2497c084	NEO – 5 Feb	2022-02-06 09:37:40 +00:00