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
45,815 Commits 32 Branches 187 Tags
2709968e2529b83273f5c3ff0b33636093d0fb65
Commit Graph

45815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
cb54a36d96 Merge branch 'master' into 'master' 
Added puzzle PS_ZNR1 - Possibility Storm - Zendikar Rising 01.

See merge request core-developers/forge!3267
 2020-10-14 05:59:33 +00:00
Michael Kamensky
3539241630 - Added puzzle PS_ZNR1. 2020-10-14 08:58:53 +03:00
Michael Kamensky
9fd5c4ae7c Merge branch 'master' into 'master' 
Added two cubes ported from XMage.

See merge request core-developers/forge!3266
 2020-10-14 04:50:49 +00:00
Michael Kamensky
1ed5a40f8e - Added two cubes ported from XMage. 2020-10-14 07:49:51 +03:00
Michael Kamensky
499c934f05 Merge branch 'master' into 'master' 
Fix a NPE in AnimateAi and CardFactoryUtil.

Closes #1607

See merge request core-developers/forge!3265
 2020-10-14 04:29:18 +00:00
Michael Kamensky
0ba785bf11 - Fix a NPE in AnimateAi and CardFactoryUtil. 2020-10-14 07:27:41 +03:00
Michael Kamensky
ad5dc98d2b Merge branch 'master' into 'master' 
[Bug] - Allow games that throw exceptions or timer runs out to allow GameOutcomes to return with a NPE being thrown

See merge request core-developers/forge!3264
 2020-10-14 04:21:48 +00:00
Arona Daal
58ed7d572f [Bug] - Allow games that throw exceptions or timer runs out to allow GameOutcomes to return with a NPE being thrown 2020-10-14 04:21:48 +00:00
Michael Kamensky
a0650baca5 Merge branch 'lopfix' into 'master' 
Various fixes

See merge request core-developers/forge!3262
 2020-10-14 03:57:26 +00:00
Northmoc
7e1135a0aa typo fix 2020-10-13 14:29:06 -04:00
Anthony Calosa
4337244b98 Merge branch 'newBranch' into 'master' 
Auto pause AI Match when viewing Settings or Deck Lists

See merge request core-developers/forge!3263
 2020-10-13 05:46:28 +00:00
Anthony Calosa
ed74a8010c Merge remote-tracking branch 'core/master' into newBranch 2020-10-13 13:30:47 +08:00
Anthony Calosa
2a361ab1b0 Auto pause AI Match when opening decks and settings 
-Fixes WinLose overlay not showing when the match suddenly ends when viewing settings or decks on mobile
during AI vs AI match.
 2020-10-13 13:25:03 +08:00
Michael Kamensky
977a3d6239 Merge branch 'translationsfixes' into 'master' 
Translation fixes (es-ES)

See merge request core-developers/forge!3260
 2020-10-13 05:22:40 +00:00
Michael Kamensky
dfd0a77659 Merge branch '12OctBnR' into 'master' 
October 12, 2020 Banned and Restricted

See merge request core-developers/forge!3261
 2020-10-13 05:22:10 +00:00
Northmoc
ad4aacba57 might as well use nickname :) 2020-10-12 20:16:37 -04:00
Northmoc
1230bcc572 this is apparently an ultimate? 2020-10-12 20:06:53 -04:00
Northmoc
87f02d051a Forsaken Monument granting C when Moxes tapped for mana! 2020-10-12 19:59:53 -04:00
Northmoc
f39013141f Orah triggering from weird zones 2020-10-12 19:43:48 -04:00
Northmoc
4c92fade9c Light of Promise fixes 2020-10-12 19:18:15 -04:00
klaxnek
c1c001273b Fix phyrexian translation (ES) 2020-10-12 19:38:47 +02:00
klaxnek
089a40426c Fix lowercase (ES) 2020-10-12 19:19:40 +02:00
Northmoc
cd40c55c83 October 12, 2020 Banned and Restricted 2020-10-12 13:02:04 -04:00
klaxnek
7facc4803b More translation fixes (ES) 2020-10-12 18:45:01 +02:00
klaxnek
82ac89732f Some translation fixes (ES) 2020-10-12 18:37:09 +02:00
klaxnek
d83d57ed7b Fix translated string and translate some of them 2020-10-12 18:31:41 +02:00
klaxnek
6ac6a6510d Merge remote-tracking branch 'core-developers/master' into translationsfixes 2020-10-12 17:16:25 +02:00
Michael Kamensky
e2c8990539 Merge branch 'newBranch' into 'master' 
[Mobile] Refactor Deckbox ImageView

See merge request core-developers/forge!3257
 2020-10-12 05:33:59 +00:00
Michael Kamensky
d4442df4cb Merge branch 'master' into 'master' 
Nahiri's Lithoforming: RemAIDeck until the AI can be figured out for it.

See merge request core-developers/forge!3259
 2020-10-12 05:30:08 +00:00
Michael Kamensky
8dc6b3d9cf Merge branch 'master' into 'master' 
translate new setting

See merge request core-developers/forge!3258
 2020-10-12 05:29:45 +00:00
Michael Kamensky
ddee1ff556 - Nahiri's Lithoforming: RemAIDeck until the AI can be figured out for it. 2020-10-12 08:28:57 +03:00
Anthony Calosa
4126b651a4 add dispose to shaderOutline 2020-10-12 12:59:42 +08:00
Anthony Calosa
3caa1b2ea1 use shader for deck selector 2020-10-12 12:54:00 +08:00
CCTV-1
d50d64e1a3 translate new setting 2020-10-12 12:34:56 +08:00
Anthony Calosa
ad3809f57a update filter 2020-10-12 10:55:47 +08:00
Anthony Calosa
df7a8ca0d0 [Mobile] Refactor Deckbox ImageView 
-fix Mana Icons and Deck Name on Portrait and Landscape Mode
 2020-10-12 10:36:03 +08:00
Michael Kamensky
936d07bd86 Merge branch 'newBranch' into 'master' 
[Mobile] Update some GUI Elements

See merge request core-developers/forge!3255
 2020-10-11 13:26:28 +00:00
Michael Kamensky
d1e97cc186 Merge branch 'questMode_wildOpponents' into 'master' 
Implementation to make available (for Wild opponents in quest mode) also the decks stored in subfolders

See merge request core-developers/forge!3256
 2020-10-11 13:25:00 +00:00
Alessandro Coli
77938a8b90 Implementation to make available (for Wild opponents) also the decks 
stored in subfolders of the main "constructed" folder
 2020-10-11 14:22:51 +02:00
Anthony Calosa
6fd5c35b1c add todo scaling for portrait mode on deck image view for deck colors 2020-10-11 19:28:12 +08:00