Commit Graph

12335 Commits

Author SHA1 Message Date
Anthony Calosa
fbe1e63b1a Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-07 13:19:02 +08:00
Anthony Calosa
87e9c93264 New Faster Cache for Mobile - Cache2k, Add Border Masking Option 2019-10-07 12:59:52 +08:00
Agetian
48c90e3908 - Remove a duplicate DB definition in Disintegrate. 2019-10-07 07:38:38 +03:00
swordshine
d4b2897b49 Merge branch 'patch' into 'master'
Fix three cards

See merge request core-developers/forge!2224
2019-10-07 03:49:11 +00:00
swordshine
79b99afbef Merge branch 'contributors' into 'master'
Contributors

See merge request core-developers/forge!2215
2019-10-07 03:45:30 +00:00
swordshine
131aa8b5a2 Fix Disintegrate 2019-10-07 11:43:38 +08:00
swordshine
748e91d8ac Fix Dance of the Manse and Blow Your House Down 2019-10-07 11:18:32 +08:00
CCTV-1
e7588c6ea0 supplement ELD card translation 2019-10-06 19:23:16 +08:00
Ryan1729
d53eb3a3fe pull all URLDecoder.decode calls into one method and suppress the warning since changing it appears to have broken things before. 2019-10-06 02:00:12 -06:00
Ryan1729
4969547938 inline capitalize 2019-10-06 01:36:37 -06:00
Ryan1729
6808be7a42 route all capitalize calls through a new method 2019-10-06 01:33:52 -06:00
swordshine
eb82d454b8 Merge branch 'start_replacement_run_keys_refactor' into 'master'
Start replacement run keys refactor

See merge request core-developers/forge!2175
2019-10-06 06:22:54 +00:00
Ryan1729
f6134e3ccf update canReplace method 2019-10-05 22:24:05 -06:00
Agetian
f95cdd6ab4 - Added puzzle PS_ELD0. 2019-10-05 10:51:34 +03:00
leriomaggio
780343a746 Added myself to the list of contributors 2019-10-03 19:37:29 +01:00
swordshine
92077f1647 Fix Tome of Legends 2019-10-03 20:47:13 +08:00
Michael Kamensky
3b47b51bb7 Merge branch 'newBranch' into 'master'
Manaicons update

See merge request core-developers/forge!2210
2019-10-03 07:18:21 +00:00
Anthony Calosa
ed5d654ac3 Rounded edges a little 2019-10-03 13:06:16 +08:00
Anthony Calosa
353263f936 Add slight drop shadow 2019-10-03 13:00:34 +08:00
Anthony Calosa
5c9edece87 Reduce edge aliasing 2019-10-02 23:38:29 +08:00
Dagin Svezek
677c19ca80 german translation update 2019-10-02 05:53:04 +00:00
swordshine
873d4dfc0a Fix Rowan, Fearless Sparkmage 2019-10-02 10:45:58 +08:00
Michael Kamensky
e2f7358970 Merge branch 'newBranch' into 'master'
Upscale some sprites

See merge request core-developers/forge!2201
2019-10-01 17:34:05 +00:00
Michael Kamensky
d2666caf73 Merge branch 'master' into 'master'
No need to separately add the Food card by name to AI sac preferences.

See merge request core-developers/forge!2206
2019-10-01 17:30:39 +00:00
Agetian
6e906888cb - No need to separately add the Food card by name to AI sac preferences. 2019-10-01 20:22:21 +03:00
Anthony Calosa
7a614352bd Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-01 20:13:51 +08:00
swordshine
5ccc6ca10f Merge branch 'patch' into 'master'
Update some cards

See merge request core-developers/forge!2204
2019-10-01 09:04:03 +00:00
swordshine
5f9f22ddab Update 5 scripts 2019-10-01 16:56:46 +08:00
CCTV-1
d405fd7ae6 update simplified chinese translation 2019-10-01 16:31:43 +08:00
swordshine
af2ac7e611 Fix Rohgahh of Kher Keep 2019-10-01 16:02:54 +08:00
Anthony Calosa
bf5f581cf6 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-01 14:28:38 +08:00
Anthony Calosa
1345bbe671 Revert to allow merge 2019-10-01 14:18:04 +08:00
Michael Kamensky
b01c4220d2 Fix a couple AI hints for Throne of Eldraine, add some more hints 2019-10-01 06:16:21 +00:00
swordshine
474e7f42d9 Merge branch 'translation08' into 'master'
Translated strings related to Win/Lose/Concede

See merge request core-developers/forge!2197
2019-10-01 06:16:08 +00:00
swordshine
f3206bfe27 Fix two cards 2019-10-01 14:02:44 +08:00
Anthony Calosa
91674ef0b2 Seperate some Sprite Icons, Upscaled sprite_planar_conquest,
added some ability icons, Enabled texture filter on some textures
2019-10-01 13:41:52 +08:00
Anthony Calosa
a939a8a042 Merge remote-tracking branch 'remotes/core/master' into newBranch 2019-10-01 11:27:54 +08:00
Anthony Calosa
c988ecfefa fix guttergrime 2019-10-01 09:46:05 +08:00
Michael Kamensky
4e48ffbd20 Throne of Eldraine AI hints 2019-09-30 18:50:12 +00:00
Peter
17fabb0bec Translated strings related to Win/Loose/Concede 2019-09-30 11:25:27 +02:00
swordshine
116ab5da29 Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!2188
2019-09-30 07:26:25 +00:00
Peter
608d84dc4d Updated Throne of Eldraine card translations 2019-09-29 14:00:35 +02:00
Blacksmith
821f95f483 Clear out release files in preparation for next release 2019-09-29 00:29:38 +00:00
Blacksmith
d028cd2918 [maven-release-plugin] prepare for next development iteration 2019-09-29 00:23:27 +00:00
Blacksmith
4803d74c33 [maven-release-plugin] prepare release forge-1.6.29 2019-09-29 00:23:21 +00:00
Blacksmith
403d3a6aec Update README.txt for release 2019-09-29 00:20:17 +00:00
Hans Mackowiak
398796999f Resolve "Questing Beast and Damage Prevention" 2019-09-29 00:03:10 +00:00
Hans Mackowiak
f347786f3d Merge branch 'enchanged-carriage-stats' into 'master'
Power/toughness for Enchanted Carriage

See merge request core-developers/forge!2191
2019-09-28 17:03:11 +00:00
Hans Mackowiak
52843a3ba6 Merge branch 'resolute-rider-text-fix' into 'master'
Text fix for Resolute Rider

See merge request core-developers/forge!2192
2019-09-28 17:02:58 +00:00
Brock Fanning
5b8ab80cb0 Fix for Irencrag Pyromancer trigger 2019-09-28 11:57:47 -04:00