Michael Kamensky
def434bdb7
Merge branch 'cleanup' into 'master'
...
Minor Cleanup
See merge request core-developers/forge!5322
2021-09-11 09:35:17 +00:00
Michael Kamensky
e781825f31
Merge branch 'Meerkov-master-patch-21940' into 'master'
...
Unban Orcish Artillery
See merge request core-developers/forge!5321
2021-09-11 09:34:21 +00:00
Michael Kamensky
88658dcf87
Merge branch 'Meerkov-master-patch-67925' into 'master'
...
AI Ban: False Orders
See merge request core-developers/forge!5320
2021-09-11 09:33:57 +00:00
paul_snoops
1bb053adaf
MID update
2021-09-11 10:29:04 +01:00
Anthony Calosa
01b80cfc78
Merge remote-tracking branch 'remotes/core/master'
2021-09-11 17:14:17 +08:00
Anthony Calosa
eddbc1e94a
[Mobile] Disable cardBG Texture for Android 9 and below
...
on Android 10+ (4 GB RAM) it works fine however Android 9 and below with at least 4 GB RAM, it crashes at startup if it tries to read and load the big texture file. Needs investigation
2021-09-11 17:13:20 +08:00
tool4EvEr
052b73bda2
Minor Cleanup
2021-09-11 10:26:01 +02:00
Meerkov
49fdfdbe61
Unban Orcish Artillery
2021-09-11 08:15:36 +00:00
Meerkov
cefc86b13f
The AI doesn't know how to use this card, and currently it's clogging up AI decks in LEB.
2021-09-11 08:04:08 +00:00
Churrufli
d327e789c1
Net Decks Archive Updates
2021-09-10 20:41:21 +02:00
Grimm
6d2dd7ad92
Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure
2021-09-10 17:41:33 +02:00
Grimm
639cd42c43
Added some comments, cleaned up names and code
2021-09-10 17:36:05 +02:00
leriomaggio
e90b0323b7
Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format
2021-09-10 16:10:13 +01:00
leriomaggio
3d3ed1a281
Merge remote-tracking branch 'upstream/master' into artpreference-carddb-fix
2021-09-10 14:22:14 +01:00
leriomaggio
edfbbfb789
CardPreferences to work with latest setPreferredArt API in CardDb w/ backward compatibility
2021-09-10 14:10:21 +01:00
Michael Kamensky
9faae6009e
Merge branch 'master' into 'master'
...
Update formats
See merge request core-developers/forge!5315
2021-09-10 11:38:22 +00:00
Snoops
b62d9fd375
Update Vintage.txt
2021-09-10 10:10:23 +00:00
Snoops
7305f8e949
Update Legacy.txt
2021-09-10 10:03:46 +00:00
Snoops
e19062267f
Update Standard.txt
2021-09-10 09:54:23 +00:00
Snoops
bd989f1e1d
Update Extended.txt
2021-09-10 09:48:06 +00:00
Snoops
45ff8c8919
Update Oathbreaker.txt
2021-09-10 09:46:37 +00:00
Snoops
e686eaa0de
Update Commander.txt
2021-09-10 09:38:44 +00:00
Snoops
58d660a682
Update Pauper.txt
2021-09-10 09:01:35 +00:00
Hans Mackowiak
63cc173c79
Merge branch 'flashbackCostFix' into 'master'
...
GameActionUtil: fix Flashback cost so it only replaces ManaCost
See merge request core-developers/forge!5310
2021-09-10 05:19:45 +00:00
Hans Mackowiak
7d7964aae3
GameActionUtil: fix Flashback cost so it only replaces ManaCost
2021-09-10 05:19:44 +00:00
Michael Kamensky
5dae60be29
Merge branch 'mid_9' into 'master'
...
MID - 9 Sep
See merge request core-developers/forge!5312
2021-09-10 04:09:29 +00:00
Michael Kamensky
8e8a383771
Merge branch 'fix' into 'master'
...
Small keyword fix
See merge request core-developers/forge!5313
2021-09-10 04:04:00 +00:00
Sol
39cd84f7f3
Update guardian_of_faith.txt
2021-09-10 03:52:52 +00:00
Northmoc
07bbd32af5
devoted_grafkeeper_departed_soulkeeper.txt
2021-09-09 22:18:27 -04:00
Northmoc
6ebff84f72
curse_of_silence.txt
2021-09-09 22:17:27 -04:00
Northmoc
d390be2812
blast_from_the_past.txt
2021-09-09 21:42:14 -04:00
Northmoc
e22069021c
card is now implemented
2021-09-09 20:50:22 -04:00
Northmoc
d82a412480
make all Coven hyphens long
2021-09-09 20:49:41 -04:00
Northmoc
b90b2477fd
hobbling_zombie.txt
2021-09-09 20:48:39 -04:00
Northmoc
554f34c0f1
contortionist_troupe.txt
2021-09-09 20:48:16 -04:00
leriomaggio
b9d468bf70
Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format
2021-09-09 20:20:16 +01:00
Michael Kamensky
8c49535c6e
Merge branch 'mid_7' into 'master'
...
MID - 8 Sep
See merge request core-developers/forge!5309
2021-09-09 04:02:51 +00:00
Grimm
5f0656bf03
Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure
2021-09-09 03:56:39 +02:00
Grimm
b5450d47d3
commit res
2021-09-09 02:43:59 +02:00
Northmoc
cd6b7963c4
geistflame_reservoir.txt
2021-09-08 19:27:56 -04:00
Northmoc
78b23e4316
heirloom_mirror_inherited_fiend.txt and ritual counters
2021-09-08 08:17:51 -04:00
Grimm
70f8302bcf
commit res
2021-09-08 03:49:54 +02:00
paul_snoops
8e865b939e
MID update
2021-09-07 18:33:27 +01:00
paul_snoops
fda597a3c9
MID update
2021-09-07 15:05:31 +01:00
leriomaggio
e3eb012b20
Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format
2021-09-07 10:43:40 +01:00
Northmoc
9cc6c1772d
brackish_trudge.txt fix bad SpellDescription
2021-09-07 10:43:22 +01:00
John Williams
36a5ae3573
Update Online Promos.txt
2021-09-07 08:33:20 +00:00
Michael Kamensky
2ccdfb7ce0
Merge branch 'MID_update' into 'master'
...
MID 06 Sep
See merge request core-developers/forge!5301
2021-09-07 03:38:58 +00:00
Michael Kamensky
d27b8e9a57
Merge branch 'mid_6' into 'master'
...
MID - 6 Sep
See merge request core-developers/forge!5302
2021-09-07 03:38:25 +00:00
Michael Kamensky
88b1206df2
Merge branch 'tweaks' into 'master'
...
MID – Various Q.O.L. fixes tied to Corpse Cobble
See merge request core-developers/forge!5300
2021-09-07 03:38:01 +00:00
