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
45,880 Commits 32 Branches 187 Tags
64131f15e56cc7c470764a34e7d3258e987f1dcc
Commit Graph

45880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
130a7e0d33 Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3294
 2020-10-27 04:09:33 +00:00
Northmoc
183bb7759c djinn_of_wishes.txt fix 2020-10-26 19:44:55 -04:00
Andreas Bendel
8a292df8c3 Update de-DE.properties 
lblGauntletProgress
 2020-10-26 20:29:48 +00:00
Michael Kamensky
54032c4bdb Merge branch 'master' into 'master' 
update translation

See merge request core-developers/forge!3293
 2020-10-26 14:07:05 +00:00
CCTV-1
4fa9856244 Merge remote-tracking branch 'upstream/master' 2020-10-26 14:56:46 +08:00
CCTV-1
f61329c4fe translate "Gauntlet Progress" 2020-10-25 20:20:49 +08:00
Michael Kamensky
156ccc8535 Merge branch 'revealFixes' into 'master' 
Reveal fixes and NPE

See merge request core-developers/forge!3291
 2020-10-24 15:32:37 +00:00
Hans Mackowiak
4cd297b6c8 Rushing River: fix missing Reference 2020-10-24 10:45:23 +02:00
Hans Mackowiak
617ca47c19 AbilityUtils: fix possible NPE when sa is null 2020-10-24 10:42:49 +02:00
Hans Mackowiak
c0bb61b0b0 Reveal: also reveal cards for the AI too 2020-10-24 10:42:03 +02:00
Anthony Calosa
cee0ec6d5b Merge branch 'newBranch' into 'master' 
Fix leftsplit manacost display

See merge request core-developers/forge!3290
 2020-10-23 22:38:30 +00:00
Anthony Calosa
152c7dd564 Fix leftsplit manacost display 2020-10-24 06:32:25 +08:00
Anthony Calosa
f33382a4fc Merge branch 'newBranch' into 'master' 
revert accidental change here, this is device specific

See merge request core-developers/forge!3289
 2020-10-23 10:47:20 +00:00
Anthony Calosa
02181593cc revert accidental change here, this is device specific 2020-10-23 18:46:11 +08:00
Anthony Calosa
df6d8488a9 Merge branch 'newBranch' into 'master' 
[Mobile] Minor Improvements

See merge request core-developers/forge!3288
 2020-10-23 10:10:41 +00:00
Anthony Calosa
2709968e25 Merge remote-tracking branch 'core/master' into newBranch 2020-10-23 18:00:36 +08:00
Anthony Calosa
e80d6d66d0 Update Libgdx Dependency 
-update to 1.9.11, and use specific nightly build for gdx (pre 1.9.12, fixes for glyph, etc..) for mobile version (newer nightly build than August 13, 2020 changed the android path so unless we adopt scoped storage, we can't upgrade to newer libgdx versions)
 2020-10-23 18:00:08 +08:00
Anthony Calosa
e82ae6f507 preload nonAI Decks 2020-10-23 17:54:36 +08:00
Anthony Calosa
04be4ce993 Refactor ReplaceAll 2020-10-23 17:51:57 +08:00
Anthony Calosa
1e3be648ca Minimum Column Count 2020-10-23 17:50:03 +08:00
Michael Kamensky
0cc174fe99 Merge branch 'themed-chaos-drafts' into 'master' 
Themed Chaos Drafts

See merge request core-developers/forge!3283
 2020-10-23 08:03:37 +00:00
Michael Kamensky
4835e4c1d8 Merge branch 'newBranch' into 'master' 
[Mobile] Prevent Conceding while on Mulligan

Closes #1376

See merge request core-developers/forge!3287
 2020-10-23 07:59:47 +00:00
pfirpfel
f277b72a67 Move empty init exception into BagRandomizer 2020-10-22 22:42:27 +02:00
pfirpfel
7204f4369c Add graveyard matters theme 2020-10-22 22:08:33 +02:00
pfirpfel
fd1ece9aea Add more documentation 2020-10-22 21:42:06 +02:00
Anthony Calosa
63e67b0aa5 [Mobile] Prevent Conceding while on Mulligan 
closes issue #1376
 2020-10-22 20:36:59 +08:00
Anthony Calosa
dfc4b5af13 Merge branch 'newBranch' into 'master' 
[Mobile] Update Stack Description

See merge request core-developers/forge!3285
 2020-10-22 12:34:15 +00:00
Anthony Calosa
c9f21830fc Merge remote-tracking branch 'core/master' into newBranch 2020-10-22 20:07:10 +08:00
swordshine
fdf65e6a5c Merge branch 'patch' into 'master' 
Fixed Jace, Mirror Mage

See merge request core-developers/forge!3286
 2020-10-22 11:42:29 +00:00
swordshine
943c4d7171 Fixed Jace, Mirror Mage 2020-10-22 19:41:35 +08:00
pfirpfel
dd1642670f Fix: shuffle bag initially 2020-10-22 13:20:32 +02:00
Anthony Calosa
2ef07f7a9c [Mobile] Update Stack Description 
-adds Optional Costs payment to Stack Description text.
 2020-10-22 18:58:28 +08:00
Michael Kamensky
4359799efb Merge branch 'newBranch' into 'master' 
Reveal cards to human player and add game log when the cards from Command Zone...

Closes #1550

See merge request core-developers/forge!3284
 2020-10-22 04:24:42 +00:00
Anthony Calosa
fcb76f341b Reveal cards to human player and add game log when the cards from Command Zone moves to Player's hand. 
closes issue #1550
 2020-10-22 11:26:55 +08:00
pfirpfel
1f2c41a729 Fix format filter 2020-10-21 23:13:40 +02:00
pfirpfel
eaada0b2ec Adding Mirrodin chaos theme 2020-10-21 22:34:06 +02:00
pfirpfel
2b07183ef9 Add more theme data 2020-10-21 22:15:02 +02:00
pfirpfel
01992c62e6 Add initial new themed chaos draft functionality 
Add new randomizer
 2020-10-21 22:14:55 +02:00
Michael Kamensky
7b5984557a Merge branch 'newBranch' into 'master' 
Reveal transformed cards to human player/controller

Closes #382

See merge request core-developers/forge!3282
 2020-10-21 07:09:51 +00:00
Anthony Calosa
4b318bda5a Reveal transformed cards to human player/controller 
closes issue #382
 2020-10-21 12:30:04 +08:00
Michael Kamensky
abc6bb02c0 Merge branch 'newBranch' into 'master' 
[Mobile] Don't stack token creature with different PT

See merge request core-developers/forge!3281
 2020-10-21 04:04:19 +00:00
Michael Kamensky
a1c1a0e1d7 Merge branch 'master' into 'master' 
RaiseTo param for Trinisphere-likes

See merge request core-developers/forge!3280
 2020-10-21 04:03:48 +00:00
Anthony Calosa
df64794372 [Mobile] Don't stack token creature with different PT 
- ie Shark Typhoon produces same shark token with different PT
 2020-10-21 06:53:15 +08:00
Hythonia
29841b18a4 Fix CostAdjustment.java #2 2020-10-20 17:01:10 +00:00
Hythonia
2ba11ae009 Fix CostAdjustment.java 2020-10-20 16:59:23 +00:00
Hythonia
15e6a21428 Update trinisphere.txt 2020-10-20 14:12:16 +00:00
Hythonia
0ad0c048b5 RaiseTo param for cost adjustment (Trinisphere) 2020-10-20 14:03:59 +00:00
Michael Kamensky
16d5adbe4f Merge branch 'newBranch' into 'master' 
[Mobile] Add Delirium Indicator

See merge request core-developers/forge!3279
 2020-10-20 04:10:34 +00:00
Anthony Calosa
d3bfef974d [Mobile] Add Delirium Indicator 
-the highlight selector for graveyard tab will change color to Active Phase Color (color according to theme color) if the player has delirium
 2020-10-20 09:43:41 +08:00
Michael Kamensky
4f7f108361 Merge branch 'patch-12' into 'master' 
Update Secret Lair Drop Series.txt Extra Life

See merge request core-developers/forge!3278
 2020-10-19 19:39:50 +00:00