external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,546 Commits 31 Branches 187 Tags
c3a95a07a1a28e9664617bb9007d6d715c9e211c
Commit Graph

43546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CCTV-1
91534776d1 convert \t to four spaces,makes the diff able to read 2019-10-17 11:07:00 +08:00
Alessandro Coli
ef82e11c53 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-16 14:10:58 +02:00
swordshine
bec4db6c6d Merge branch '1187-reducecost-with-minmana-does-reduce-to-0-but-shouldn-t' into 'master' 
Resolve "ReduceCost with MinMana does reduce to 0, but shouldn't"

Closes #1187

See merge request core-developers/forge!2244
 2019-10-16 01:25:33 +00:00
Hans Mackowiak
40b1f89c8f Resolve "ReduceCost with MinMana does reduce to 0, but shouldn't" 2019-10-16 01:25:33 +00:00
swordshine
544301e5ff Merge branch 'elddeckgen' into 'master' 
ELD Deckgen Data

See merge request core-developers/forge!2245
 2019-10-16 01:24:03 +00:00
austinio7116
ed48bc2e0e ELD Deckgen Data 2019-10-15 19:06:47 +01:00
Hans Mackowiak
b7b9013685 Merge branch 'playerKeywordRework' into 'master' 
Player keyword rework

Closes #1179

See merge request core-developers/forge!2233
 2019-10-15 11:12:20 +00:00
Hans Mackowiak
06b9dffa55 Player keyword rework 2019-10-15 11:12:20 +00:00
CCTV-1
31bb611ecf update BitmapFontWriter.java to latest version(https://github.com/libgdx/libgdx/blob/master/extensions/gdx-tools/src/com/badlogic/gdx/tools/bmfont/BitmapFontWriter.java) 2019-10-15 18:35:16 +08:00
Michael Kamensky
173c9ac5f6 Merge branch 'master' into 'master' 
Added puzzle PS_ELD1 - Possibility Storm - Throne of Eldraine #01

See merge request core-developers/forge!2242
 2019-10-15 09:49:05 +00:00
Agetian
ad63987d01 - Added puzzle PS_ELD1. 2019-10-15 07:37:23 +03:00
Michael Kamensky
2c15810833 Merge branch 'isInZoneCleanup' into 'master' 
replace .getZone().is with .isInZone, no null check needed

See merge request core-developers/forge!2241
 2019-10-14 18:46:43 +00:00
Hans Mackowiak
773df25b53 replace .getZone().is with .isInZone, no null check needed 2019-10-14 18:46:43 +00:00
Michael Kamensky
6e2ac756c9 Merge branch 'newBranch' into 'master' 
Rounded Border Highlight

See merge request core-developers/forge!2240
 2019-10-14 04:55:11 +00:00
Anthony Calosa
f06994e71e Update 2019-10-14 10:53:48 +08:00
Anthony Calosa
9213b2d987 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-14 10:39:02 +08:00
Anthony Calosa
efa3501172 Rounded Highlight if Round Corners are enabled (and some cleanup) 
put on EDT thread pixmap texture conversion
generate zh-CN fonts only when locale is zh-CN
 2019-10-14 10:36:53 +08:00
swordshine
c52960eab1 Merge branch 'master' into 'master' 
Android:prevent generate excessive font cache for zh_CN

See merge request core-developers/forge!2237
 2019-10-14 00:55:25 +00:00
Michael Kamensky
4a6725d228 Merge branch 'AdventureFeatherFix' into 'master' 
Adventure as ReplacementEffect

Closes #1144

See merge request core-developers/forge!2239
 2019-10-13 18:49:48 +00:00
Hans Mackowiak
20069f95ac Adventure as ReplacementEffect 2019-10-13 18:49:48 +00:00
Michael Kamensky
7562ae9960 Merge branch 'newBranch' into 'master' 
Add Border Tint, Update libgdx to Nightly

See merge request core-developers/forge!2235
 2019-10-13 18:36:13 +00:00
Alessandro Coli
762481e28a Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-13 17:58:46 +02:00
Anthony Calosa
32621257df update 2019-10-13 17:09:56 +08:00
Anthony Calosa
ff7a8f994c prevent waiting for opponent during assert, 
send the exception via sentry
 2019-10-13 14:48:49 +08:00
Anthony Calosa
ecbc2f9590 Merge remote-tracking branch 'remotes/core/master' into newBranch 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/AiController.java
 2019-10-13 14:40:11 +08:00
Michael Kamensky
4a7bb4e08e Merge branch 'verifyTransitivity2' into 'master' 
AiController: only do verifyTransitivity when sort failed

See merge request core-developers/forge!2238
 2019-10-13 06:36:55 +00:00
Hans Mackowiak
44bcc72662 AiController: only do verifyTransitivity when sort failed 2019-10-13 06:36:55 +00:00
CCTV-1
9115148eab prevent generate excessive font cache for zh_CN 2019-10-13 13:14:05 +08:00
Michael Kamensky
a07158181e Merge branch 'master' into 'master' 
Comment out the transitivity test due to lag reasons.

See merge request core-developers/forge!2236
 2019-10-13 04:42:16 +00:00
Agetian
7fa461e839 - Comment out the transitivity test due to lag reasons. 2019-10-13 07:36:40 +03:00
Anthony Calosa
fee8a9186a Update Libgdx to 1.9.11 Nightly (build Oct 11, 2019) 2019-10-13 12:17:45 +08:00
Anthony Calosa
d3bad23c99 additional Check 2019-10-13 12:14:42 +08:00
Anthony Calosa
7f0b7780da Modify verifyTransitivity 2019-10-13 11:45:42 +08:00
Anthony Calosa
617403aef6 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-13 08:19:14 +08:00
Alessandro Coli
25194c7abe Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-12 11:07:46 +02:00
Anthony Calosa
81c38449d9 NPE from rarity (dev mode: Put two Nicol Bolas in graveyard, cast animate dead to return 1st Nicol Bolas to play, then cast Rise from the grave to return the 2nd Nicol Bolas to play, then choose the 2nd Nicol Bolas to stay on the battlefield) 2019-10-12 06:09:56 +08:00
Anthony Calosa
fd92993274 adjust thickness 2019-10-12 05:55:14 +08:00
Anthony Calosa
f4d55161b4 Add basic border tint for cards that change color 
(Multicolor Cards will have gold tint if they change color..
Wild Mongrel, Prismatic Lace, etc)
 2019-10-12 05:53:57 +08:00
Michael Kamensky
fdad359318 Merge branch 'patch-comparator' into 'master' 
verifyTransitivity on saComparator

See merge request core-developers/forge!2234
 2019-10-11 19:03:15 +00:00
Hans Mackowiak
fb159a6261 verifyTransitivity on saComparator 2019-10-11 19:03:15 +00:00
Alessandro Coli
967af29c47 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-11 18:34:39 +02:00
Michael Kamensky
3ea93ac9b4 Merge branch 'newBranch' into 'master' 
Add Support Extended Art

See merge request core-developers/forge!2231
 2019-10-11 04:44:21 +00:00
Alessandro Coli
ae9ee57d79 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-10 19:50:02 +02:00
Anthony Calosa
393b419252 Max Font Size for zh-CN 2019-10-10 19:57:58 +08:00
Anthony Calosa
8a18e5ed26 Add Option for Preload 2019-10-10 17:02:05 +08:00
Anthony Calosa
281ee767e0 Preload existing images only 2019-10-10 16:48:18 +08:00
swordshine
0f742201c6 Merge branch 'patch' into 'master' 
Fix Seedguide Ash

See merge request core-developers/forge!2232
 2019-10-10 07:54:00 +00:00
swordshine
08a3a0baa0 Fix Seedguide Ash 2019-10-10 15:22:40 +08:00
Anthony Calosa
8dc0ea70b5 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-10 15:09:59 +08:00
Anthony Calosa
d071c291ad Added Sprite Border 2019-10-10 15:02:37 +08:00