44186 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Pantel	55300347ce	Fix Settle the Wreckage, Cavalier of Dawn	2020-03-10 12:46:51 -04:00
Anthony Calosa	c85584445e	update project.properties	2020-03-10 17:16:08 +08:00
Anthony Calosa	ceeb5d623f	Increase Android target SDK so it will work with Android 10. ... Need to download SDK 26 to compile. (Just tested this on Android 6 and Android 9, it works, but need to test the change for Android 5 and Android 10, for Android 10, It needs to turn the storage permission settings manually since the project don't have running permission setup currently)	2020-03-10 16:53:59 +08:00
Anthony Calosa	1f4eff8b1c	Adjust CroppedArea for Non Modern Card Frames ... (fullborder images)	2020-03-10 16:45:08 +08:00
Anthony Calosa	41af869d3c	Update Font	2020-03-10 16:35:39 +08:00
Michael Kamensky	2747d93e4c	Merge branch 'fixXonCancel' into 'master' ... GameAction: refactor setting CastSA Closes #1320 See merge request core-developers/forge!2585	2020-03-10 06:35:34 +00:00
Hans Mackowiak	5c9251e295	SpellAbility: adding an Announce needs to be to originalMapParams too	2020-03-10 07:13:04 +01:00
Hans Mackowiak	fa67ee73a5	Card: cleanup multikicker values	2020-03-10 07:13:04 +01:00
Hans Mackowiak	e1659a4539	Combat: use lkiCase only if blocker itself is an lki	2020-03-10 07:13:04 +01:00
Hans Mackowiak	d5b578b306	Card: move reseting xmana paid to clearTemporaryVars	2020-03-10 07:13:04 +01:00
Hans Mackowiak	32b56018a6	GameAction: refactor setting CastSA	2020-03-10 07:13:04 +01:00
Peter	aa12085345	Add new translation strings about the new Auto Updater	2020-03-09 19:54:11 +01:00
Michael Kamensky	3dd20d9d0b	Merge branch 'master' into 'master' ... Fix AddsCounters Closes #1264 See merge request core-developers/forge!2597	2020-03-09 18:27:54 +00:00
Agetian	8b922fc8f2	- Fix AddsCounters	2020-03-09 21:13:29 +03:00
Agetian	c88a419e03	- Use ExecuteScript in PS_THB7 for a simpler implementation.	2020-03-09 12:32:06 +03:00
Michael Kamensky	b9618509be	Merge branch 'desktop-autoupdate' into 'master' ... check for updates button See merge request core-developers/forge!2537	2020-03-09 03:59:40 +00:00
Sol	1076b1e29f	Merge branch 'edition-fixes' into 'master' ... improve handling of foil-only Kaya for CN2 See merge request core-developers/forge!2584	2020-03-09 01:10:26 +00:00
Jamin W. Collins	4717955afb	improve handling of foil-only Kaya for CN2 ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-08 09:43:58 -06:00
Michael Kamensky	af771d0c2c	Merge branch 'master' into 'master' ... Added puzzles PS_THB6 and PS_THB7 - Possibility Storm - Theros Beyond Death 06 and 07 See merge request core-developers/forge!2595	2020-03-08 12:12:36 +00:00
Michael Kamensky	8fea6b4cc0	Merge branch 'newBranch' into 'master' ... Add Cancel Button for Puzzle Screen See merge request core-developers/forge!2596	2020-03-08 12:12:30 +00:00
Anthony Calosa	9249029dc1	Add Cancel Button for Puzzle Screen ... (If you decide not to solve puzzle or accidentally hit start on Puzzle Menu)	2020-03-08 18:37:36 +08:00
Agetian	e5d40554e1	- Error prevention on ID-based precast	2020-03-08 13:16:10 +03:00
Agetian	8b8e39ff41	- Added puzzles PS_THB6 and PS_THB7. ... - Added a way to precast a spell from a specific host by ID.	2020-03-08 13:12:28 +03:00
Michael Kamensky	40591b04d2	Merge branch 'newBranch' into 'master' ... Update Menu & App Icons See merge request core-developers/forge!2591	2020-03-08 09:10:44 +00:00
Michael Kamensky	1c1e2416e4	Merge branch 'patch-4' into 'master' ... Replace bg_match.jpg in Darkred skin See merge request core-developers/forge!2593	2020-03-08 09:10:06 +00:00
Anthony Calosa	bdf9d3f88e	Merge remote-tracking branch 'remotes/core/master' into newBranch	2020-03-08 12:34:47 +08:00
Sol	960760a564	Merge branch 'mb1fix' into 'master' ... MB1 pool corrections See merge request core-developers/forge!2590	2020-03-08 02:13:25 +00:00
Tim Mocny	f488cb1d0b	MB1 pool corrections	2020-03-08 02:13:25 +00:00
Sol	c4e2004af3	Merge branch 'fixes' into 'master' ... simplify regex usage to group numbers, support Android 6 See merge request core-developers/forge!2592	2020-03-08 02:11:07 +00:00
friarsol	dcb151f561	Get the Updater liike 90% of the way there.	2020-03-07 20:37:07 -05:00
Churrufli	4550ee26e3	Replace bg_match.jpg, previous one is a png renamed, I noticed may cause bugs in some Android versions	2020-03-07 18:15:23 +00:00
Jamin W. Collins	ecdea545fc	simplify regex usage to group numbers, support Android 6 ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-07 09:01:57 -07:00
Anthony Calosa	643c08850b	Merge remote-tracking branch 'remotes/core/master' into newBranch	2020-03-07 13:21:38 +08:00
Anthony Calosa	fed6d788cf	Update Menu Icons	2020-03-07 13:21:13 +08:00
Anthony Calosa	3ccd979b63	Update App Icon	2020-03-07 13:20:07 +08:00
Michael Kamensky	be52fb772e	Merge branch 'onceupon' into 'master' ... Once Upon a Time (lowercase "a" throughout Forge) See merge request core-developers/forge!2589	2020-03-06 15:30:37 +00:00
Tim Mocny	633c106708	Once Upon a Time (lowercase "a" throughout Forge)	2020-03-06 15:30:36 +00:00
Michael Kamensky	aec62cbffb	Merge branch 'mysteryboost' into 'master' ... Mystery Booster support! See merge request core-developers/forge!2588	2020-03-06 15:30:25 +00:00
Tim Mocny	5b61712d70	Mystery Booster support!	2020-03-06 15:30:25 +00:00
Michael Kamensky	7fa248db4c	Merge branch 'patch-joust' into 'master' ... Update joust: add missing AILogic$ Fight See merge request core-developers/forge!2586	2020-03-05 14:32:18 +00:00
Hans Mackowiak	33f04148d3	Update joust: add missing AILogic$ Fight	2020-03-05 14:32:17 +00:00
Michael Kamensky	3aa33be214	Merge branch 'patch-collector-number-thb' into 'master' ... Update Theros Beyond Death: add missing CollectorNumber See merge request core-developers/forge!2587	2020-03-05 14:32:11 +00:00
Hans Mackowiak	612045f8c0	Update Theros Beyond Death: add missing CollectorNumber	2020-03-05 14:32:11 +00:00
Michael Kamensky	0bd6b16247	Merge branch 'edition-fixes' into 'master' ... Edition fixes See merge request core-developers/forge!2583	2020-03-05 03:35:42 +00:00
Michael Kamensky	eaa7d296d2	Merge branch 'newBranch' into 'master' ... Fix jerky animation on Conquest Reward Dialog See merge request core-developers/forge!2581	2020-03-05 03:32:26 +00:00
Jamin W. Collins	235162fb84	fixing the collector numbers for Magic 2015 ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-04 20:06:09 -07:00
Jamin W. Collins	fc4a491111	fixing collector numbers for Magic 2014 ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-04 20:04:36 -07:00
Jamin W. Collins	0cd9b1435b	fixing collector numbers for Khans of Tarkir ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-04 20:02:16 -07:00
Sol	61184ade4c	Merge branch 'collector_number' into 'master' ... change collector number to be a String See merge request core-developers/forge!2578	2020-03-05 02:55:36 +00:00
Jamin W. Collins	f2e29c9c93	fixing collector numbers for Fate Reforged ... Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>	2020-03-04 19:54:54 -07:00