Michael Kamensky
|
7b6543e7fa
|
Merge branch 'staticEffectCleanup' into 'master'
StaticEffect: cleanup old methods
See merge request core-developers/forge!2208
|
2019-10-02 05:06:15 +00:00 |
|
Hans Mackowiak
|
9fefaa58fc
|
StaticEffect: cleanup old methods
|
2019-10-02 05:06:15 +00:00 |
|
swordshine
|
297b7e9728
|
Merge branch 'patch' into 'master'
Fix Rowan, Fearless Sparkmage
See merge request core-developers/forge!2207
|
2019-10-02 02:50:55 +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
|
72ab3cc690
|
adjust spacing - rendered icons
|
2019-10-01 21:47:53 +08: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 |
|
swordshine
|
aa75871aae
|
Merge branch 'master' into 'master'
update simplified chinese translation
See merge request core-developers/forge!2205
|
2019-10-01 08:47:42 +00:00 |
|
CCTV-1
|
d405fd7ae6
|
update simplified chinese translation
|
2019-10-01 16:31:43 +08:00 |
|
CCTV-1
|
eb05ce8da7
|
Merge remote-tracking branch 'upstream/master'
|
2019-10-01 16:11:06 +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 |
|
swordshine
|
e998eb379e
|
Merge branch 'eld-ai-hints' into 'master'
Fix a couple AI hints for Throne of Eldraine, add some more hints
See merge request core-developers/forge!2202
|
2019-10-01 06:16:21 +00: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
|
11c3e17c98
|
Merge branch 'patch' into 'master'
Fix two cards
See merge request core-developers/forge!2203
|
2019-10-01 06:12:20 +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
|
059264c2f9
|
Merge branch 'eld-ai-hints' into 'master'
Throne of Eldraine AI hints
See merge request core-developers/forge!2198
|
2019-09-30 18:50:12 +00:00 |
|
Michael Kamensky
|
4e48ffbd20
|
Throne of Eldraine AI hints
|
2019-09-30 18:50:12 +00:00 |
|
Anthony Calosa
|
11c8dd0f44
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-09-30 19:48:36 +08:00 |
|
Peter
|
e869c6ac6b
|
Remove unused imports
|
2019-09-30 11:35:18 +02:00 |
|
Peter
|
17fabb0bec
|
Translated strings related to Win/Loose/Concede
|
2019-09-30 11:25:27 +02:00 |
|
CCTV-1
|
88448366d5
|
Merge remote-tracking branch 'upstream/master'
|
2019-09-30 16:21:22 +08: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 |
|
swordshine
|
37d0d52d51
|
Merge branch 'eldtranslation' into 'master'
Updated Throne of Eldraine card translations
See merge request core-developers/forge!2194
|
2019-09-30 07:25:35 +00:00 |
|
Michael Kamensky
|
264a7e7b23
|
Merge branch '1169-sedge-sliver-isn-t-working-correct-with-pt-boost' into 'master'
Resolve "Sedge Sliver isn't working correct with PT boost"
Closes #1169
See merge request core-developers/forge!2196
|
2019-09-30 04:55:08 +00:00 |
|
CCTV-1
|
37f33f1c07
|
Merge remote-tracking branch 'upstream/master'
|
2019-09-30 08:09:02 +08:00 |
|
Hanmac
|
3c3a7f3f62
|
GameAction: ignore isTemporary StaticAbilities
|
2019-09-29 22:03:23 +02:00 |
|
Michael Kamensky
|
cf2811132a
|
Merge branch 'master' into 'master'
Preparing Forge for Android publish 1.6.29.001
See merge request core-developers/forge!2195
|
2019-09-29 15:54:18 +00:00 |
|
Jamin W. Collins
|
59b01aba8f
|
- Preparing Forge for Android publish 1.6.29.001
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
|
2019-09-29 08:54:32 -06: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
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 |
|
Sol
|
521a3c3b7b
|
Merge branch '1157-questing-beast-and-damage-prevention' into 'master'
Resolve "Questing Beast and Damage Prevention"
Closes #1157
See merge request core-developers/forge!2183
|
2019-09-29 00:03:10 +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 |
|
Hans Mackowiak
|
ce3546393a
|
Merge branch 'irencrag-pyromancer-trigger-fix' into 'master'
Fix for Irencrag Pyromancer trigger
See merge request core-developers/forge!2193
|
2019-09-28 17:02:00 +00:00 |
|
Brock Fanning
|
5b8ab80cb0
|
Fix for Irencrag Pyromancer trigger
|
2019-09-28 11:57:47 -04:00 |
|
Brock Fanning
|
9ee5989553
|
Text fix for Resolute Rider
|
2019-09-28 11:43:55 -04:00 |
|