external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,973 Commits 33 Branches 187 Tags
ec98d128f128e505c5ca5dba3b0df3379408904c
Commit Graph

42973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michael Kamensky
5a13903b34 Merge branch 'master' into 'master' 
Added puzzle PS_ELD0 - Possibility Storm - Throne of Eldraine 00 (Pre-release Puzzle)

See merge request core-developers/forge!2217
 2019-10-05 11:37:49 +00:00
Michael Kamensky
3af071a531 Merge branch 'adventureZoneCheck' into 'master' 
GameAction: better ZoneCheck for Adventure

See merge request core-developers/forge!2218
 2019-10-05 11:37:30 +00:00
Hans Mackowiak
937521632d GameAction: better ZoneCheck for Adventure 2019-10-05 11:37:29 +00:00
Agetian
f95cdd6ab4 - Added puzzle PS_ELD0. 2019-10-05 10:51:34 +03:00
swordshine
dc000318bd Merge branch 'patch-3' into 'master' 
Refactor String.join -> StringUtils.join

See merge request core-developers/forge!2213
 2019-10-04 03:35:29 +00:00
swordshine
0dbc90817a Merge branch 'patch-2' into 'master' 
Prevent NPE casting adventure card as spell

See merge request core-developers/forge!2211
 2019-10-04 03:35:07 +00:00
leriomaggio
780343a746 Added myself to the list of contributors 2019-10-03 19:37:29 +01:00
Valerio Maggio
c07230c447 workaround to fix Deck Editor extra space for label 2019-10-03 18:50:37 +01:00
Valerio Maggio
27565d4cc0 fixed bug that was keep on creating filters in deck editor every tab switch (issue 1174) 2019-10-03 18:33:12 +01:00
Valerio Maggio
c6bd5aaaf1 Merge remote-tracking branch 'upstream/master' into ref-base-fork 2019-10-03 18:10:26 +01:00
Anthony Calosa
90e2c08e75 Refactor String.join -> StringUtils.join 2019-10-03 13:54:34 +00:00
swordshine
3c2eac78d6 Merge branch 'patch' into 'master' 
Fix Tome of Legends

See merge request core-developers/forge!2212
 2019-10-03 12:58:19 +00:00
swordshine
92077f1647 Fix Tome of Legends 2019-10-03 20:47:13 +08:00
Michael Kamensky
3b47b51bb7 Merge branch 'newBranch' into 'master' 
Manaicons update

See merge request core-developers/forge!2210
 2019-10-03 07:18:21 +00:00
Anthony Calosa
c9c27faf8f Prevent NPE casting adventure card as spell 2019-10-03 05:45:44 +00:00
Anthony Calosa
ed5d654ac3 Rounded edges a little 2019-10-03 13:06:16 +08:00
Anthony Calosa
353263f936 Add slight drop shadow 2019-10-03 13:00:34 +08:00
swordshine
cecf532da8 Merge branch 'german-translation' into 'master' 
german translation update

See merge request core-developers/forge!2209
 2019-10-03 03:15:09 +00:00
Anthony Calosa
5c9edece87 Reduce edge aliasing 2019-10-02 23:38:29 +08:00
Dagin Svezek
677c19ca80 german translation update 2019-10-02 05:53:04 +00:00