external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,453 Commits 32 Branches 187 Tags
0637c69bfe901babf30a015d11386699407b602b
Commit Graph

11706 Commits

Author SHA1 Message Date
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
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
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
Hans Mackowiak
77e80f1e04 Update vraskas_stoneglare: fix missing X 2019-08-28 13:08:22 +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
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
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
Peter
d83c60eb91 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-26 20:47:13 +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
Peter
bdbf03e0dd Mobile: Finalize Settings tab translations 2019-08-25 12:42:24 +02:00
kevlahnota
70bd959ca9 Added darkforge skin 2019-08-25 17:40:18 +08:00
Peter
b2fe710fc2 As requested, add DarkRed skin by Churrufli 2019-08-25 11:02:23 +02:00
Peter
4913633a25 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 
 Conflicts:
	forge-gui-mobile/src/forge/assets/FSkinFont.java
	forge-gui-mobile/src/forge/card/CardImageRenderer.java
	forge-gui-mobile/src/forge/card/CardRenderer.java
 2019-08-25 10:36:12 +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
9d63eac89a WIP: Partial fix on preventsleep when downloading resource. 2019-08-24 18:14:35 +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
Anthony Calosa
b28f83aa92 Update ANNOUNCEMENTS.txt 2019-08-23 20:28:25 +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
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
Agetian
258946ac32 - Added puzzle PS_M206. 2019-08-20 09:47:42 +03: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
6486ebd1ad Remove Exit button from mobile home screen 
Revert text of other buttons on mobile home screen
Fix text with spaces removed, like "Planar Conquest"
 2019-08-19 22:01:50 -05:00
swordshine
cf9256ddf8 Add Wall of Stolen Identity 2019-08-18 15:16:22 +08:00
swordshine
e929523aea Fix Mass Diminish 2019-08-18 13:20:38 +08:00
swordshine
676e92fee2 Add Ghired's Belligerence 2019-08-18 11:52:21 +08:00
swordshine
955d18caa3 Add Thieving Amalgam 2019-08-18 11:10:43 +08:00
swordshine
c47b0acccb Add "until end of combat" 2019-08-17 19:03:57 +08:00
swordshine
97a13768a4 Add Tahngarth, First Mate 2019-08-17 18:59:56 +08:00
Hans Mackowiak
b554198a96 K'rrik and his phyrexian like ability 2019-08-17 10:43:53 +00:00
Peter
e3bc9bf5dc Mobile only: Translate home menus and add an exit button 2019-08-15 21:05:00 +02:00
swordshine
e29663916c Fix the color of Arcum's Astrolabe 2019-08-15 15:06:57 +08:00
Peter
dc676cda3d Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-15 08:06:37 +02:00
Hans Mackowiak
1303991ee7 CostSacrifice: allow X as amount 2019-08-14 17:33:06 +00:00
Peter
d8e073f561 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-14 14:22:16 +02:00
swordshine
17d3f23bed Fix Atla Palani, Nest Tender 2019-08-14 15:22:12 +08:00
swordshine
c248034a3d Merge branch 'patch' into 'master' 
Fix a few cards reported in the slightlymagic forum

See merge request core-developers/forge!2034
 2019-08-14 01:46:05 +00:00
swordshine
5b43f81d7b Fix a few cards reported in the slightlymagic forum 2019-08-14 09:45:24 +08:00
Sol
34a2917e08 Update ANNOUNCEMENTS.txt 2019-08-14 01:21:38 +00:00
swordshine
b591421bd5 Merge branch 'patch' into 'master' 
Fix Frostwalk Bastion

See merge request core-developers/forge!2031
 2019-08-13 15:24:51 +00:00
swordshine
6f517770d9 Fix Frostwalk Bastion 2019-08-13 23:22:56 +08:00