Commit Graph

45815 Commits

Author SHA1 Message Date
klaxnek
ef75fad04d Fix some translations 2020-10-11 10:34:45 +02:00
klaxnek
a878841963 Merge remote-tracking branch 'core-developers/master' 2020-10-11 10:20:21 +02:00
Anthony Calosa
688fad9023 [Mobile] Added Deckbox and Commander Background for ImageView
- updated Assets required!
2020-10-11 14:18:21 +08:00
Anthony Calosa
35a4316261 [Mobile] Replace ManaCost Strings to show ManaCost Symbols 2020-10-11 14:13:53 +08:00
Michael Kamensky
56ad59da18 Merge branch 'oracle-updates' into 'master'
Oracle updates

See merge request core-developers/forge!3254
2020-10-11 05:05:57 +00:00
Michael Kamensky
a345ae5438 Merge branch 'znrtranslations' into 'master'
Zendikar Rising (ZNR) Card Translations

See merge request core-developers/forge!3253
2020-10-11 04:33:45 +00:00
Rob Schnautz
cdb2e41e83 damage instead 2020-10-11 04:09:57 +00:00
Rob Schnautz
c42c771306 eat your veggies 2020-10-11 03:04:30 +00:00
Rob Schnautz
bc2c7a1669 this-spelling the myths 2020-10-11 02:57:47 +00:00
Rob Schnautz
4a8d062c24 modular reminder 2020-10-11 02:34:23 +00:00
Rob Schnautz
cfca5f3d34 dichotomancing the stone 2020-10-11 02:13:31 +00:00
Rob Schnautz
a54d5d73a6 die, brutal expulsion, die 2020-10-11 02:10:38 +00:00
Rob Schnautz
b6a8b14c3f cryptoplasm conformity 2020-10-11 02:08:22 +00:00
Rob Schnautz
2319ebb909 what's in a name? 2020-10-11 02:06:15 +00:00
Rob Schnautz
c722a11491 many a treasured thing 2020-10-11 01:55:58 +00:00
Rob Schnautz
f2c76d4979 It continues to deal 2020-10-11 01:19:10 +00:00
Rob Schnautz
23d09d1776 your CARDNAME is showing 2020-10-11 00:09:41 +00:00
Rob Schnautz
a94de2b8d2 tamping down trample 2020-10-10 23:50:35 +00:00
Rob Schnautz
1f8f2240f4 M19 oracle changes 2020-10-10 23:25:19 +00:00
klaxnek
78d59b6a11 All Cards Scryfall database downloaded by API 2020-10-10 09:16:04 +02:00
klaxnek
148eccc20a ZNR Card Translations
Updated from Scryfall database
2020-10-09 20:03:25 +02:00
Michael Kamensky
dd023cdb08 Merge branch 'patch-6' into 'master'
Update de-DE.properties

See merge request core-developers/forge!3252
2020-10-09 17:56:07 +00:00
klaxnek
2174a68d77 Fix typo 2020-10-09 19:48:13 +02:00
klaxnek
7f477ed5c8 Add missing spanish card translations 2020-10-09 19:46:45 +02:00
klaxnek
d533c6a97b Merge branch 'master' into core-developers/master 2020-10-09 19:45:08 +02:00
klaxnek
70568b3095 Merge remote-tracking branch 'core-developers/master' 2020-10-09 19:41:36 +02:00
Andreas Bendel
87f541b91f Update de-DE.properties
Corrected typo
2020-10-09 16:47:46 +00:00
Michael Kamensky
34d27d628b Merge branch 'sim-draw-npe' into 'master'
fix sw.stop bug, added draw condition for timeouts and both players life 0

See merge request core-developers/forge!3251
2020-10-08 14:16:20 +00:00
MisterVito
715aec7e54 fix sw.stop bug, added draw condition for timeouts and both players life 0 2020-10-08 03:12:52 -07:00
MisterVito
e7d1ee98d2 remove sw.stop as the stopwatch is not running by this point 2020-10-07 23:39:17 -07:00
Michael Kamensky
6d62159e3e Merge branch 'thisspell' into 'master'
Enforcing an Oracle template change

See merge request core-developers/forge!3243
2020-10-08 05:32:20 +00:00
Michael Kamensky
007718f658 Merge branch 'sim-draw-npe' into 'master'
add a draw condition for sim if players life total both equal 0

See merge request core-developers/forge!3248
2020-10-08 05:29:11 +00:00
Michael Kamensky
63788018b4 Merge branch 'preconimg' into 'master'
updating precon-images.txt

See merge request core-developers/forge!3246
2020-10-08 04:51:48 +00:00
MisterVito
e4df5fe4ff add a draw condition for sim if players life total both equal 0 2020-10-07 17:34:58 -07:00
Northmoc
145669bb38 more "this spell" 2020-10-07 16:04:28 -04:00
Northmoc
3c61d6a9e3 lowercase first letter only, after bFlag only 2020-10-07 16:04:27 -04:00
Northmoc
5a9e7ab57d "this spell" instead of "CARDNAME" 2020-10-07 16:04:27 -04:00
Northmoc
7b8b4f3f46 updating precon-images.txt 2020-10-07 15:45:00 -04:00
Michael Kamensky
a266fd6a6e Merge branch 'return' into 'master'
Support "Return" phrasing in ChangeZoneEffect StackDesc

See merge request core-developers/forge!3245
2020-10-07 19:22:51 +00:00
Michael Kamensky
9967a21a00 Merge branch 'master' into 'master'
Add some older preconstructed decks

See merge request core-developers/forge!3244
2020-10-07 19:22:43 +00:00
Michael Kamensky
9f4f174ee5 Merge branch 'statecraft' into 'master'
statecraft.txt repair

See merge request core-developers/forge!3242
2020-10-07 19:21:49 +00:00
Northmoc
45e3feb575 Support "Return" phrasing in StackDesc 2020-10-07 14:35:59 -04:00
Pux
a83f46c06c Add some older preconstructed decks 2020-10-07 19:04:10 +02:00
Northmoc
7837e6f003 statecraft.txt repair 2020-10-07 07:45:28 -04:00
Michael Kamensky
00146ed417 Merge branch 'patch-12' into 'master'
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!3241
2020-10-07 10:56:31 +00:00
John
272ec2cc21 Update Secret Lair Drop Series.txt 2020-10-07 09:09:49 +00:00
Michael Kamensky
db45511859 Merge branch 'twd' into 'master'
Walking Dead Secret Lair (adding NICKNAME)

See merge request core-developers/forge!3215
2020-10-07 04:10:41 +00:00
Michael Kamensky
f4ddb91768 Merge branch 'string' into 'master'
ChangeZone stackdesc sb : commas in the target lists

See merge request core-developers/forge!3238
2020-10-07 04:09:55 +00:00
Michael Kamensky
bee4aebe53 Merge branch 'tidy' into 'master'
Tidying up a few cards

See merge request core-developers/forge!3239
2020-10-07 04:09:37 +00:00
Michael Kamensky
c5c6c06305 Merge branch 'newBranch' into 'master'
Update Border Colors

See merge request core-developers/forge!3240
2020-10-07 04:09:19 +00:00