Ryan1729
3c47659c20
fix comment
2019-09-04 23:18:47 -06:00
Ryan1729
9d2e92157c
move and rename TriggerKey to AbilityKey
2019-09-04 22:53:32 -06:00
Ryan1729
ef5b7e902b
rename runTrigger to runTriggerOld and add new runTrigger method
2019-09-03 22:52:38 -06:00
Michael Kamensky
e052c34a05
Merge branch 'master' into 'master'
...
Adjust Planar Conquest layout for widescreen/tall display on Android.
See merge request core-developers/forge!2076
2019-08-31 11:40:18 +00:00
Anthony Calosa
2aa8daceed
Update default bg image to 16:9
2019-08-31 13:37:14 +08:00
Anthony Calosa
91d5fd29dc
Removed unused import
2019-08-31 13:04:15 +08:00
Anthony Calosa
b9e12c8708
Background scale (width)
2019-08-31 12:58:14 +08:00
Anthony Calosa
d527c17362
add todo
2019-08-30 20:32:25 +08:00
Anthony Calosa
1950d989e8
Merge remote-tracking branch 'remotes/core/master'
2019-08-30 20:30:10 +08:00
Anthony Calosa
3298f60a7d
Last Minute Changes
2019-08-30 19:53:31 +08:00
Anthony Calosa
2fa6781565
Minor Adjustment
2019-08-30 19:18:04 +08:00
Anthony Calosa
5b53da08c0
Adjust Planar Conquest layout for widescreen/tall display on Android.
2019-08-30 17:10:38 +08:00
Michael Kamensky
af00536bd0
Merge branch 'fix_hang' into 'master'
...
Followup on fixed AudioClip deadlock
See merge request core-developers/forge!2074
2019-08-30 07:59:43 +00:00
NikolayHD
f62f2832dd
followup on fixed AudioClip deadlock
2019-08-30 00:52:47 +03:00
Michael Kamensky
154a91a418
Merge branch 'fix_hang' into 'master'
...
Fix deadlock in AudioClip reproducing
See merge request core-developers/forge!2073
2019-08-29 04:47:59 +00:00
Michael Kamensky
e2dbabeb5e
Merge branch 'august-26-2019-bannings-update' into 'master'
...
Update Standard, Modern and Vintage format
See merge request core-developers/forge!2072
2019-08-29 04:25:24 +00:00
NikolayHD
64c624509c
fix deadlock in AudioClip reproducing
...
in JRE 1.8.0_221 a call to clip.setMicrosecondPosition(0)
can produce a deadlock if the clip is already beginning
to reproduce, that is clip.start() was recently called
The workaround is to wait until the clip actually begins to
reproduce before letting another clip.setMicrosecondPosition(0)
call happen
2019-08-29 02:27:23 +03:00
pfirpfel
f52aa11ca3
Update Standard, Modern and Vintage format according to August 26, 2019 Banned and Restricted Announcement
2019-08-28 16:33:26 +02:00
Michael Kamensky
6344c8fc3c
Merge branch 'master' into 'master'
...
Added puzzle PS_M207 - Possibility Storm - Magic Core Set 2020 07
See merge request core-developers/forge!2071
2019-08-28 13:27:20 +00:00
Michael Kamensky
c755a4c4a5
Added puzzle PS_M207 - Possibility Storm - Magic Core Set 2020 07
2019-08-28 13:27:19 +00:00
Michael Kamensky
326f34adf0
Merge branch 'master' into 'master'
...
Allow importing non Core and non Exp Cards only
See merge request core-developers/forge!2068
2019-08-28 13:08:52 +00:00
Michael Kamensky
fa23e51c86
Merge branch 'patch-4' into 'master'
...
Update vraskas_stoneglare: fix missing X
See merge request core-developers/forge!2070
2019-08-28 13:08:22 +00:00
Hans Mackowiak
77e80f1e04
Update vraskas_stoneglare: fix missing X
2019-08-28 13:08:22 +00:00
Michael Kamensky
9effa5390e
Merge branch 'add-grixis-cube' into 'master'
...
Add Ryan Overturf's Grixis Cube (MTGO)
See merge request core-developers/forge!2069
2019-08-28 13:08:11 +00:00
Anthony Calosa
a15a5ad5c3
Fix Portrait mode Exit/Back key
2019-08-28 20:42:06 +08:00
pfirpfel
5c32b465d0
Add Ryan Overturf's Grixis Cube (MTGO)
2019-08-28 13:16:58 +02:00
Anthony Calosa
8cef63968c
Allow Importing non Core and non Expansion Cards Only
2019-08-28 11:35:16 +08:00
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
