Commit Graph

42170 Commits

Author SHA1 Message Date
swordshine
5b659c433e C19: Update tokens 2019-08-10 10:51:30 +08:00
swordshine
1288830c0e C19: Update edition file 2019-08-10 10:21:37 +08:00
swordshine
ca06bc69a2 Merge branch 'patch' into 'master'
C19 cards

See merge request core-developers/forge!2014
2019-08-10 01:08:07 +00:00
NikolayHD
3c6d45ff0c Fix null reference exception when loading deck
in sealed or draft deck editor
2019-08-10 03:35:51 +03:00
swordshine
74af2b2423 C19: Add three charm cards 2019-08-09 23:34:44 +08:00
swordshine
004d3e5805 C19: Add Voice of Many 2019-08-09 23:12:24 +08:00
swordshine
6f6cb9296b Merge branch 'patch' into 'master'
C19 cards

See merge request core-developers/forge!2013
2019-08-09 15:11:57 +00:00
swordshine
1a3a920dba C19: add forgescribed cards (patch 8) 2019-08-09 21:47:20 +08:00
swordshine
0b1e552143 C19: add forgescribed cards (patch 7) 2019-08-09 19:47:50 +08:00
swordshine
708b5c8c9b C19: add forgescribed cards (patch 6) 2019-08-09 19:09:12 +08:00
swordshine
922c065149 C19: add forgescribed cards (patch 5) 2019-08-09 18:07:51 +08:00
swordshine
85d076bdd2 C19: add forgescribed cards (patch 4) 2019-08-09 17:35:32 +08:00
swordshine
14afacbf59 C19: add forgescribed cards (patch 3) 2019-08-09 14:10:54 +08:00
swordshine
25b7c3dd0f C19: add forgescribed cards (patch 2) 2019-08-09 12:26:22 +08:00
swordshine
f830e86612 - C19: add forgescribed cards (a) by Austinio7116 2019-08-09 09:36:26 +08:00
Hans Mackowiak
f0e22cf712 Merge branch '1112-effect-emblem-for-each-player' into 'master'
Resolve "Effect: Emblem for each player"

Closes #1112

See merge request core-developers/forge!2002
2019-08-08 18:32:52 +00:00
kms70847
ce32bdb0b5 don't rearrange frames if the cursor is in the frame's head region 2019-08-07 11:10:22 -04:00
swordshine
89e23077ca Merge branch 'german-translation' into 'master'
german translation update

See merge request core-developers/forge!2009
2019-08-07 00:24:52 +00:00
Sol
0dc2f2e398 Merge branch 'patch-3' into 'master'
Update ReplacementHandler: otherwise it causes crashes

See merge request core-developers/forge!2010
2019-08-06 20:55:40 +00:00
Hans Mackowiak
75cc8d3ee2 Update ReplacementHandler: otherwise it causes crashes 2019-08-06 20:55:40 +00:00
Dagin Svezek
3ef9a2fbee Replace de-DE.properties 2019-08-06 16:55:01 +00:00
swordshine
413de957a8 Merge branch 'patch' into 'master'
Fix Yanling's Harbinger

See merge request core-developers/forge!2007
2019-08-05 00:40:52 +00:00
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
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
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
kms70847
7b83c72e06 fix another batch of oracle text typos 2019-07-30 07:24:48 -04: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