external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,155 Commits 32 Branches 187 Tags
a89f2bc1d94eafb3c7f34b8a0ec99568cad8ce95
Commit Graph

46155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John
40784ca324 Update Secret Lair Drop Series.txt Extra Life 2020-10-19 16:41:44 +00:00
Anthony Calosa
f1dde167c5 Merge branch 'newBranch' into 'master' 
fix card Detail Panel for split cards on desktop version

See merge request core-developers/forge!3277
 2020-10-19 08:47:23 +00:00
Anthony Calosa
bcf858d3ec fix card Detail Panel for split cards on desktop version 2020-10-19 16:46:03 +08:00
Michael Kamensky
101757efea Merge branch 'newBranch' into 'master' 
Update generated deckbox & conquest commander image view

See merge request core-developers/forge!3276
 2020-10-19 05:00:11 +00:00
Anthony Calosa
240de1f1bc Update Commander ImageView 2020-10-19 11:13:30 +08:00
Anthony Calosa
442a8be31e Update generated deckbox 
-show generic deckbox if the generated deckbox is still loading or fails to load
 2020-10-19 10:18:44 +08:00
Michael Kamensky
494ca12dc3 Merge branch 'migratesld' into 'master' 
Migrate SLD

See merge request core-developers/forge!3275
 2020-10-16 04:22:07 +00:00
Northmoc
c8ecc6b738 migrate SLD 2020-10-15 16:08:32 -04:00
Michael Kamensky
6dea278e3f Merge branch 'master' into 'master' 
Don't add a null card to target in animateTgtAi

See merge request core-developers/forge!3272
 2020-10-15 09:53:34 +00:00
Michael Kamensky
cf1a559029 Merge branch 'newBranch' into 'master' 
Show suspended card to human player

See merge request core-developers/forge!3274
 2020-10-15 09:44:54 +00:00
Anthony Calosa
e8635fc873 Show suspended card to human player 2020-10-15 15:54:58 +08:00
Michael Kamensky
6777bef6ea Merge branch 'newBranch' into 'master' 
[Mobile] Add Double Tap/Click Favorite Deck in Image View

See merge request core-developers/forge!3273
 2020-10-15 04:45:08 +00:00
Anthony Calosa
dd7c830673 additional check 2020-10-15 10:21:17 +08:00
Anthony Calosa
e9a054ffa5 [Mobile] Add Double Tap/Click Favorite Deck in Image View 2020-10-15 04:46:28 +08:00
Michael Kamensky
a0a909d04c - Don't add a null card to target in animateTgtAi 2020-10-14 23:18:36 +03:00
Michael Kamensky
c98eaa9443 Merge branch 'master' into 'master' 
Added Zendikar Rising to the Zendikar plane in Planar Conquest.

See merge request core-developers/forge!3271
 2020-10-14 20:01:15 +00:00
Michael Kamensky
07ec0385de - Added Zendikar Rising to the Zendikar plane in Planar Conquest. 2020-10-14 23:00:17 +03:00
Michael Kamensky
af6a3751f0 Merge branch 'master' into 'master' 
Alternate Sound System: don't use it in LibGdx port, matters only for desktop Forge

See merge request core-developers/forge!3270
 2020-10-14 18:48:13 +00:00
Michael Kamensky
7808252c14 - Alternate Sound System: don't use it in LibGdx port, matters for the Forge backport (only needed in desktop Forge on *nix systems). 2020-10-14 21:47:03 +03:00
Anthony Calosa
68d5a0a954 Merge branch 'newBranch' into 'master' 
Fix Split Cards Display

See merge request core-developers/forge!3269
 2020-10-14 14:33:50 +00:00
Anthony Calosa
54430db6c1 update details 2020-10-14 22:11:34 +08:00
Anthony Calosa
fbf3c79c15 Fix Split Cards Display 
-Shows correct name & colors on card views, choice list and show correct border colors when an effect like Painter's Servant is in play...
 2020-10-14 21:30:55 +08:00
Anthony Calosa
96a40ec733 Merge branch 'newBranch' into 'master' 
Update border color tint

Closes #1608

See merge request core-developers/forge!3268
 2020-10-14 08:34:05 +00:00
Anthony Calosa
4bcbbf81d7 Merge remote-tracking branch 'core/master' into newBranch 2020-10-14 16:27:29 +08:00
Anthony Calosa
999e533a63 Update tint 
fix issue ##1608
 2020-10-14 16:25:51 +08:00