external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,683 Commits 33 Branches 187 Tags
2d86d240a795f6829c3e299d2f22d1a6b51f995f
Commit Graph

42683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Peter
d859368d7c Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-27 19:06:25 +02: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
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
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
Valerio Maggio
27a65c551b Removed unused imports to avoid checkstyle failures 2019-08-25 14:46:39 +02:00
Valerio Maggio
4fc08e9d7a Merge remote-tracking branch 'upstream/master' 2019-08-25 14:30:30 +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
Valerio Maggio
fe95de30cf Merge remote-tracking branch 'upstream/master' 2019-08-25 12:37:35 +02:00
Valerio Maggio
f8c98dca5d Add new shared options to show Unique Cards Only in ItemList and Image views 2019-08-25 12:24:01 +02: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
dbbf7310b7 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into mobile-translations02 2019-08-25 11:23:33 +02:00
Peter
b2fe710fc2 As requested, add DarkRed skin by Churrufli 2019-08-25 11:02:23 +02:00
Peter
434718fc91 Add deleted libs by error (2nd try).. 2019-08-25 10:55:40 +02:00
Peter
f22b8332fc Add deleted libs by error... 2019-08-25 10:49:08 +02:00
Peter
06161663b4 Add deleted libs by error... 2019-08-25 10:44:42 +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
035bf81150 Prevent rendering issues 2019-08-25 11:24:54 +08:00
Valerio Maggio
14ce377ca6 disabled Unique cards only by default in Deck Editor 2019-08-24 20:02:11 +02: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