Commit Graph

42286 Commits

Author SHA1 Message Date
Anthony Calosa
d6f42edfa5 Merge remote-tracking branch 'remotes/core/master' 2019-08-28 10:30:08 +08:00
Anthony Calosa
4af721ac6f Shorter Log 2019-08-28 09:37:40 +08:00
swordshine
8e6655e3ee Merge branch 'oathbreakerdeckgen' into 'master'
Updated deckgen data including oathbreaker

See merge request core-developers/forge!2067
2019-08-28 00:34:43 +00:00
austinio7116
fdd6d789be Updated M20 standard deckgen data
Updated Commander deckgen data
Initial Oathbreaker deckgen data

(cherry picked from commit 254dfd8)
2019-08-27 20:14:11 +01:00
Michael Kamensky
4752e13d91 Merge branch 'master' into 'master'
Prevent render issues when you exit prematurely

See merge request core-developers/forge!2066
2019-08-27 04:57:53 +00:00
Michael Kamensky
30b5388734 Merge branch 'PowerExchangeEffectChange' into 'master'
PowerExchangeEffect: use NewPT to set base power

See merge request core-developers/forge!2065
2019-08-27 04:53:52 +00:00
kevlahnota
ae8c6c2917 Prevent rendering issue on loading screen when you exit prematurely
and try to restart the app again (Android)
2019-08-27 09:25:38 +08:00
Hanmac
ea14729609 PowerExchangeEffect: use NewPT to set base power 2019-08-26 21:35:37 +02:00
Anthony Calosa
cffda2c1a7 Pull from core-developers/forge:master 2019-08-26 13:24:20 +08:00
Michael Kamensky
e3423c03e1 Merge branch 'gnu-v3-license' into 'master'
GNU General Public License V3 Added to Code Repo

See merge request core-developers/forge!2064
2019-08-26 03:28:47 +00:00
kevlahnota
fbdeb3953b TODO: adjust settings page description bounds 2019-08-26 10:39:29 +08:00
Michael Kamensky
8e93de9a8c Merge branch 'libgdxarm64' into 'master'
Android: Add libgdx arm64 libraries

See merge request core-developers/forge!2060
2019-08-25 18:01:12 +00:00
Valerio Maggio
988edc90cb Added GNU v3 License 2019-08-25 19:16:17 +02:00
Peter
0cc1b32f90 Mobile: Add libgdx arm64 libraries 2019-08-25 15:26:08 +02:00
Michael Kamensky
e54393e8eb Merge branch 'darkredskin' into 'master'
Add DarkRed skin by Churrufli

See merge request core-developers/forge!2056
2019-08-25 11:00:24 +00:00
Michael Kamensky
c1eb0d84a1 Merge branch 'master' into 'master'
Prevent rendering issues again.

See merge request core-developers/forge!2057
2019-08-25 10:59:24 +00:00
kevlahnota
70bd959ca9 Added darkforge skin 2019-08-25 17:40:18 +08:00
kevlahnota
347cb6520c Prevent rendering issues again. 2019-08-25 17:28:51 +08:00
Peter
b2fe710fc2 As requested, add DarkRed skin by Churrufli 2019-08-25 11:02:23 +02:00
Michael Kamensky
45fd90f678 Merge branch 'master' into 'master'
Prevent rendering issue and adjust screen timeout when downloading resource

See merge request core-developers/forge!2055
2019-08-25 04:25:05 +00:00
kevlahnota
035bf81150 Prevent rendering issues 2019-08-25 11:24:54 +08:00
Michael Kamensky
c7bc5d1768 Merge branch 'imageFetcherFix' into 'master'
ImageFetcher: Better handling if Image can't be saved as jpg

See merge request core-developers/forge!2006
2019-08-24 17:51:39 +00:00
Hans Mackowiak
5cf1f47047 ImageFetcher: Better handling if Image can't be saved as jpg 2019-08-24 17:51:39 +00:00
kevlahnota
9d63eac89a WIP: Partial fix on preventsleep when downloading resource. 2019-08-24 18:14:35 +08:00
Michael Kamensky
c31198eaea Merge branch 'master' into 'master'
Updated Android to use Adaptive Icons

See merge request core-developers/forge!2054
2019-08-24 08:50:43 +00:00
kevlahnota
f077e59745 Fix Talon Gates BG not loading 2019-08-24 15:45:39 +08:00
kevlahnota
a6c67d2967 Updated Android to use Adaptive Icons 2019-08-24 14:30:18 +08:00
swordshine
191941bb9f Merge branch 'patch' into 'master'
Fix Doomsday

See merge request core-developers/forge!2053
2019-08-24 06:26:21 +00:00
swordshine
66cc926348 Fix Doomsday 2019-08-24 14:17:50 +08:00
Michael Kamensky
e03b8b2d40 Merge branch 'fix-ai-paidhash-reset' into 'master'
Fix AI inverse logic when resetting the paid hash before playing a SA

Closes #1133

See merge request core-developers/forge!2052
2019-08-24 05:51:32 +00:00
Michael Kamensky
b28cd601fd Fix AI inverse logic when resetting the paid hash before playing a SA 2019-08-24 05:51:32 +00:00
swordshine
bb0f9b260f Merge branch 'patch-4' into 'master'
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!2051
2019-08-24 00:36:04 +00:00
Anthony Calosa
b28f83aa92 Update ANNOUNCEMENTS.txt 2019-08-23 20:28:25 +00:00
Michael Kamensky
84d3dfcc47 Merge branch 'master' into 'master'
Improve Dynamic Planechase Background

See merge request core-developers/forge!2050
2019-08-23 17:45:51 +00:00
kevlahnota
43722d1c1f Improve Dynamic Planechase Background 2019-08-24 01:23:39 +08:00
Michael Kamensky
098cd5b445 Merge branch 'fix-removelandtypes' into 'master'
Fix RemoveLandTypes in AnimateBaseEffect

Closes #1132

See merge request core-developers/forge!2049
2019-08-23 04:52:20 +00:00
Michael Kamensky
6c64ae97fb - Update the state for view when unanimating the card, helps address misrepresented visual state for relevant cards. 2019-08-23 04:52:20 +00:00
swordshine
ffbf21c233 Merge branch 'grip-of-chaos' into 'master'
Try to fix Grip of Chaos

See merge request core-developers/forge!1535
2019-08-23 02:56:00 +00:00
swordshine
bc2233cf24 Merge branch 'master' into 'master'
Update Libgdx to 1.9.10

See merge request core-developers/forge!2047
2019-08-23 02:45:04 +00:00
swordshine
3d8f944526 Merge branch 'patch' into 'master'
Fix Reality Scramble

See merge request core-developers/forge!2048
2019-08-23 00:43:10 +00:00
kevlahnota
5e88cc67e4 Update Libgdx to 1.9.10 2019-08-23 00:59:18 +08:00
swordshine
5e260fc9fb Fix Reality Scramble 2019-08-22 23:35:12 +08:00
swordshine
47a1b6ea98 Merge branch 'patch' into 'master'
C19 cards

See merge request core-developers/forge!2042
2019-08-20 12:20:57 +00:00
swordshine
a8c1377e10 Update Wall of Stolen Identity 2019-08-20 20:02:59 +08:00
Michael Kamensky
a4fea0b5e7 Merge branch 'master' into 'master'
Added puzzle PS_M206 - Possibility Storm - Magic Core Set 2020 06

See merge request core-developers/forge!2046
2019-08-20 06:48:38 +00:00
Agetian
258946ac32 - Added puzzle PS_M206. 2019-08-20 09:47:42 +03:00
Michael Kamensky
fbf94af590 Merge branch 'master' into 'master'
Add Oathbreaker variant

See merge request core-developers/forge!2043
2019-08-20 04:34:14 +00:00
Dan Demp
f1e0158102 Add menu item for setting Oathbreaker
Allow double-tapping to set Commander or Oathbreaker if one hasn't yet been set
2019-08-20 04:34:14 +00:00
Michael Kamensky
ce96e64edb Merge branch 'fix-mobile-home' into 'master'
Restore mobile home screen buttons

See merge request core-developers/forge!2045
2019-08-20 04:32:31 +00:00
drdev
8e812c7f2a Remove unused imports 2019-08-19 22:50:28 -05:00