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,672 Commits 32 Branches 187 Tags
5e90679d76b2080e01a78a8cf0c46f1d5370db8c
Commit Graph

42672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
82adc2383e Fix Yanling's Harbinger 2019-08-05 08:40:27 +08:00
Michael Kamensky
865ba29766 Merge branch 'patch-3' into 'master' 
Update CardRenderer: for Loyalty

See merge request core-developers/forge!2005
 2019-08-04 12:47:10 +00:00
Hans Mackowiak
877da770d2 Update CardRenderer: for Loyalty 2019-08-04 12:47:09 +00:00
Michael Kamensky
e024df9f2f Merge branch 'patch-3' into 'master' 
Update VAssignDamage: for Loyality

See merge request core-developers/forge!2004
 2019-08-04 10:00:55 +00:00
Hans Mackowiak
c58882c046 Update VAssignDamage: for Loyality 2019-08-04 10:00:55 +00:00
Michael Kamensky
b3ad190920 Merge branch '1092-core-2020-planeswalker-loyalty-ability' into 'master' 
Resolve "Core 2020: Planeswalker loyalty ability"

Closes #1092

See merge request core-developers/forge!2000
 2019-08-04 09:44:12 +00:00
Hanmac
e5b9c313b4 CardView: updateStateForView on GameAction changeZone 2019-08-03 10:39:15 +02:00
Michael Kamensky
9128ae2f93 Merge branch 'typofix4' into 'master' 
Various ability text typo fixes

See merge request core-developers/forge!2003
 2019-08-03 03:43:46 +00:00
kms70847
a3c859ca74 Various ability text typo fixes 2019-08-02 19:18:10 -04:00
Hanmac
e45babe243 EffectEffect: make an Effect for each Owner 2019-08-02 07:22:43 +02:00
Michael Kamensky
fbf99a7e52 Merge branch 'patch-2' into 'master' 
Update Brawl.txt

See merge request core-developers/forge!2001
 2019-08-02 03:31:44 +00:00
Sol
b2fc49e582 Update Brawl.txt 2019-08-02 00:50:59 +00:00
Hanmac
773f2b280f Loyalty: use String Property for X 2019-08-01 21:16:07 +02:00
Peter
3e2c9ad162 Wrong translation of Forest... 🤯 2019-08-01 19:43:02 +02:00
Peter
11aa2e37da Replaced with new translation files (fixed wrong regex applied) 2019-08-01 17:51:56 +02:00
Peter
734f584a2e Removed regex formatting (problems with UTF-8...) 
Add an additional step of manual patching of language files
 2019-08-01 17:49:50 +02:00
Peter
f473baa730 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-08-01 17:00:46 +02:00
Michael Kamensky
e509931f34 Merge branch 'patch-3' into 'master' 
Updated cards, by sorting them into alphabetical order.

See merge request core-developers/forge!1999
 2019-08-01 14:08:22 +00:00
Viktor Azorius
89c5df5eed Updated cards, by sorting them into alphabetical order. 2019-08-01 14:08:22 +00:00
Michael Kamensky
e193ca9873 Merge branch 'fix-drakuseth' into 'master' 
Fix an issue with multitargeting the same card while UniqueTargets is set.

Closes #1113

See merge request core-developers/forge!1998
 2019-08-01 14:08:09 +00:00
Michael Kamensky
88ed810e4a Fix an issue with multitargeting the same card while UniqueTargets is set. 2019-08-01 14:08:09 +00:00
Peter
dd607c82b4 Fixed oracleformat function. 
Now the resulting translation files are sorted
 2019-07-31 18:19:16 +02:00
Peter
e4f41903d4 Changed delimiter from # to | (reminder texts fixed). 
Python script now downloads the big json file from scryfall.
Updated spanish and deutsch translations
 2019-07-31 17:57:47 +02:00
Peter
00899ff4ce Extract getting translation texts to CardTranslation 2019-07-31 11:59:54 +02:00
Peter
4dc08e04c7 Fix call to new getText function 2019-07-31 11:30:41 +02:00
Peter
23b083d9ab Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation 2019-07-31 11:17:26 +02:00
Michael Kamensky
a6d30137df Merge branch 'gui-mobile-desktop-cursorkeys' into 'master' 
Mobile Backport: Cursor keys emulate swipe gestures

See merge request core-developers/forge!1997
 2019-07-31 05:10:03 +00:00
Peter
782c594938 Mobile Backport: Cursor keys emulate swipe gestures 
First we touch the screen and later swipe (fling) in the direction of the key pressed
 2019-07-30 17:24:37 +02:00
Michael Kamensky
8a6a317f56 Merge branch 'typofix3' into 'master' 
fix another batch of oracle text typos

See merge request core-developers/forge!1995
 2019-07-30 12:39:16 +00:00
Michael Kamensky
4fba4522ba Merge branch 'hqpicdownloaderfix01' into 'master' 
Fix HQ Pics Downloader - Backface images

See merge request core-developers/forge!1996
 2019-07-30 12:38:57 +00:00
Peter
b23f3d9acc Fix: We need to pass &face=back to API in order to download backface 
images correctly.
 2019-07-30 14:24:54 +02:00
Peter
cb18a369dd Changed oracle translation using the original getText function (before we lost the getText additional hints when translating). 
Needs more translation fixes.
Splitted cards (e.g. Grizzled Outcasts) don't update the translated oracle text.
 2019-07-30 13:56:41 +02:00
kms70847
7b83c72e06 fix another batch of oracle text typos 2019-07-30 07:24:48 -04:00
Peter
c7b1e764c6 Not needed to read Forge Preferences because the language selected in UI 
is passed when preloading translations.
 2019-07-30 12:31:14 +02:00
Peter
98cb151929 Merge branch 'master' into ui-card-translation 2019-07-30 12:19:51 +02:00
Peter
3c23019577 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-07-30 12:16:15 +02:00
Hans Mackowiak
61c42275e6 Dash: reworked and better Haste part 2019-07-30 12:05:29 +02:00
kms70847
200e191f14 When adding cards to library, insert "closest to top" card last 2019-07-30 12:05:29 +02:00
Michael Kamensky
dd8ba357aa Merge branch 'master' into 'master' 
Added puzzle PS_M203 - Possibility Storm - Magic Core Set 2020 03.

See merge request core-developers/forge!1994
 2019-07-30 08:32:28 +00:00
Agetian
eab262aa7e - Added puzzle PS_M203. 2019-07-30 11:30:26 +03:00
Michael Kamensky
9b62afa7e8 Merge branch 'master' into 'master' 
Added SS2 edition (Signature Spellbook: Gideon)

See merge request core-developers/forge!1993
 2019-07-30 08:22:08 +00:00
Agetian
bbe324a790 - Added SS2 edition (Signature Spellbook: Gideon) 2019-07-30 11:20:03 +03:00
Michael Kamensky
91327b7310 Merge branch 'controllerInWeirdZonesFix' into 'master' 
Cards in graveyards (etc) are always controlled by their owners

See merge request core-developers/forge!1991
 2019-07-30 05:37:04 +00:00
Michael Kamensky
d9899636c7 Merge branch 'nicerLondonMulliganMessage' into 'master' 
Show the number of cards you need to put back when London mulliganning

See merge request core-developers/forge!1990
 2019-07-30 03:27:17 +00:00
Michael Kamensky
01f179168c Merge branch 'hqpicdownloader' into 'master' 
Add Download HQ Card Pictures from Scryfall

See merge request core-developers/forge!1983
 2019-07-30 03:19:29 +00:00
Michael Kamensky
1c0736d7be Merge branch 'android-language-selector' into 'master' 
Android: Add Language selector in Settings

See merge request core-developers/forge!1984
 2019-07-30 03:19:18 +00:00
Michael Kamensky
c48b1ea225 Merge branch 'reboundTypoFix' into 'master' 
Rebound: "it's manacost" -> "its mana cost"

See merge request core-developers/forge!1992
 2019-07-30 03:17:46 +00:00
kms70847
89da830c6c Rebound: "it's manacost" -> "its mana cost" 2019-07-29 23:03:58 -04:00
kms70847
b9cf836c1a Fix for https://git.cardforge.org/core-developers/forge/issues/619 2019-07-29 22:48:54 -04:00
kms70847
60c2119f16 Show the number of cards you need to put back when London mulliganning 2019-07-29 22:01:34 -04:00