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

42885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alessandro Coli
ae9ee57d79 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-10 19:50:02 +02: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
Alessandro Coli
17706bd5e4 Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-09 22:20:15 +02:00
Michael Kamensky
7bcba5df37 Merge branch 'newBranch' into 'master' 
Add faux smooth round corners (via drawRoundRect with GL_LINE_SMOOTH)

See merge request core-developers/forge!2230
 2019-10-09 13:31:01 +00:00
Anthony Calosa
c50fda20d7 Adjust Y to accomodate "Legendary" card design 2019-10-09 16:36:39 +08:00
Anthony Calosa
3842920061 Add faux smooth round corners (via drawRoundRect with GL_LINE_SMOOTH) 2019-10-09 15:42:13 +08:00
Michael Kamensky
5b8e8521d7 Merge branch 'newBranch' into 'master' 
Alternative/Faster Round Border

See merge request core-developers/forge!2229
 2019-10-09 05:09:25 +00:00
Anthony Calosa
598ea819f1 minor adjustments 2019-10-09 11:47:51 +08:00
Anthony Calosa
289f6e4821 removed unused import 2019-10-09 11:36:26 +08:00
Anthony Calosa
e1daff65ed Refactor Mask/Border on zoomed images 2019-10-09 11:18:19 +08:00
Anthony Calosa
4609b0bb05 Alternative/Faster Round Border 2019-10-09 06:36:34 +08:00
Alessandro Coli
9ed54f726c Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-08 14:11:00 +02:00
Michael Kamensky
5ec9413f43 Merge branch 'newBranch' into 'master' 
New Faster Cache for Mobile, Add Border Masking Option

See merge request core-developers/forge!2226
 2019-10-08 04:49:41 +00:00
Anthony Calosa
ba444373c5 Update code 2019-10-08 10:56:45 +08:00
Anthony Calosa
a8da2882b4 Update description 2019-10-08 08:44:26 +08:00
Anthony Calosa
3928226343 Fix land stacking (should affect creatures and animated lands) 2019-10-08 08:08:37 +08:00
Alessandro Coli
f94a613eef Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-07 13:56:51 +02:00
Anthony Calosa
925b196171 set cache to eternal and disable overhead stats 2019-10-07 19:17:27 +08:00
Anthony Calosa
91a390358e Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-07 19:11:17 +08:00
swordshine
cd239a3286 Merge branch 'patch-4' into 'master' 
BlockEffect.java : fix no method String.join, use Lang.joinHomogenous

See merge request core-developers/forge!2227
 2019-10-07 10:30:16 +00:00
Hans Mackowiak
0422ec65be BlockEffect.java : fix no method String.join, use Lang.joinHomogenous 2019-10-07 10:30:16 +00:00
Anthony Calosa
daa8b53833 Revert BlockEffect 2019-10-07 16:55:03 +08:00
Anthony Calosa
9b0f9d7a8d Fix blurred Font on non Chinese Language 2019-10-07 15:15:20 +08:00
Anthony Calosa
c012a2f6da Fix blurred Font on non Chinese Language 2019-10-07 14:17:45 +08:00
Anthony Calosa
fbe1e63b1a Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-07 13:19:02 +08:00
Anthony Calosa
87e9c93264 New Faster Cache for Mobile - Cache2k, Add Border Masking Option 2019-10-07 12:59:52 +08:00
Hans Mackowiak
9e959089ac Merge branch 'tweak-disintegrate' into 'master' 
Remove a duplicate DB definition in Disintegrate.

See merge request core-developers/forge!2225
 2019-10-07 04:56:51 +00:00
Michael Kamensky
e71ef7d629 Merge branch 'replacementEffectHasRun' into 'master' 
better Replacement Effect hasRun with ETB and LKI

Closes #1172

See merge request core-developers/forge!2222
 2019-10-07 04:50:22 +00:00
Hans Mackowiak
eba9f0d72a better Replacement Effect hasRun with ETB and LKI 2019-10-07 04:50:22 +00:00
Agetian
48c90e3908 - Remove a duplicate DB definition in Disintegrate. 2019-10-07 07:38:38 +03:00
swordshine
d4b2897b49 Merge branch 'patch' into 'master' 
Fix three cards

See merge request core-developers/forge!2224
 2019-10-07 03:49:11 +00:00
swordshine
79b99afbef Merge branch 'contributors' into 'master' 
Contributors

See merge request core-developers/forge!2215
 2019-10-07 03:45:30 +00:00
swordshine
c7a1aae06b Merge branch 'deck-editor-unique-filter' into 'master' 
Deck editor filters bug

See merge request core-developers/forge!2214
 2019-10-07 03:45:17 +00:00
swordshine
131aa8b5a2 Fix Disintegrate 2019-10-07 11:43:38 +08:00
swordshine
748e91d8ac Fix Dance of the Manse and Blow Your House Down 2019-10-07 11:18:32 +08:00
Hans Mackowiak
0bf17333ad Merge branch 'correct_testKalitasNumberOfTokens' into 'master' 
Correct kalitas number of tokens test

See merge request core-developers/forge!2223
 2019-10-07 02:20:19 +00:00
Ryan Wiedemann
7fcac4944a change assertTrue to assertEquals as suggested by Intellij, so we get better test failure messages 2019-10-07 02:20:19 +00:00
Hans Mackowiak
f2200f23cf Merge branch 'kalitasTokenEffectFix' into 'master' 
TokenEffect: fix Cause Key it should be null in some cases

See merge request core-developers/forge!2221
 2019-10-06 13:21:38 +00:00
Hans Mackowiak
6ef38fdcfd TokenEffect: fix Cause Key it should be null in some cases 2019-10-06 13:21:38 +00:00
swordshine
67ebfa4ddd Merge branch 'master' into 'master' 
supplement ELD card translation and update forge-android support simplified chinese characters

See merge request core-developers/forge!2220
 2019-10-06 12:40:46 +00:00
CCTV-1
f43774ead7 update forge-android support simplified chinese characters 2019-10-06 19:42:30 +08:00
CCTV-1
e7588c6ea0 supplement ELD card translation 2019-10-06 19:23:16 +08:00
Alessandro Coli
e6fa89206a Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git 2019-10-06 11:40:00 +02:00
swordshine
eb82d454b8 Merge branch 'start_replacement_run_keys_refactor' into 'master' 
Start replacement run keys refactor

See merge request core-developers/forge!2175
 2019-10-06 06:22:54 +00:00
Ryan1729
33ccc5c21f remove import 
...
 2019-10-05 23:52:14 -06:00
Ryan1729
5f3a0b3f0b change replacingObjects type 2019-10-05 23:44:22 -06:00
Ryan1729
f6134e3ccf update canReplace method 2019-10-05 22:24:05 -06:00
Michael Kamensky
d294e02b44 Merge branch 'cardTraitsReworkAnimate' into 'master' 
Card: CardTraits are now not added to Card/State anymore but uses timestamp

Closes #1165, #1120, #955, and #573

See merge request core-developers/forge!2216
 2019-10-05 19:59:28 +00:00
Hans Mackowiak
f32a8d7bb8 Card: CardTraits are now not added to Card/State anymore but uses timestamp 2019-10-05 19:59:28 +00:00