swordshine
|
18e16368be
|
Merge branch 'master' into 'master'
Added puzzle PS_ELD3 - Possibility Storm - Throne of Eldraine 03
See merge request core-developers/forge!2257
|
2019-10-29 07:51:49 +00:00 |
|
Agetian
|
7ed84c4c3f
|
- Added puzzle PS_ELD3.
|
2019-10-29 09:34:39 +03:00 |
|
Michael Kamensky
|
f334211395
|
Merge branch 'newBranch' into 'master'
Mobile Forge: Card Sleeves & Round Border Refactor
See merge request core-developers/forge!2255
|
2019-10-26 14:46:09 +00:00 |
|
Anthony Calosa
|
42f4126aff
|
Prepare Sleeve for Desktop...
|
2019-10-25 15:37:13 +08:00 |
|
Anthony Calosa
|
5790e29daa
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-10-25 14:22:07 +08:00 |
|
Anthony Calosa
|
88a4a2c6cf
|
Update
|
2019-10-25 14:21:25 +08:00 |
|
swordshine
|
90b72fc11e
|
Merge branch '1194-resolute-rider-has-incorrect-activated-ability-cost' into 'master'
Resolve "Resolute Rider has incorrect activated ability cost"
Closes #1194
See merge request core-developers/forge!2256
|
2019-10-24 08:46:54 +00:00 |
|
Hans Mackowiak
|
00391df1f0
|
Fix Resolute Rider
|
2019-10-24 07:46:00 +00:00 |
|
swordshine
|
15de0c0bba
|
Merge branch 'master' into 'master'
Added puzzle PS_ELD2 - Possibility Storm - Throne of Eldraine 02
See merge request core-developers/forge!2254
|
2019-10-24 01:00:06 +00:00 |
|
Agetian
|
a2fdce9be9
|
- Added puzzle PS_ELD2.
|
2019-10-23 22:42:52 +03:00 |
|
klaxnek
|
fa6fce9589
|
Moved CardTranslation to forge-core. We need it to translate card info in forge-game.
|
2019-10-23 11:47:21 +02:00 |
|
Anthony Calosa
|
cc1f03fc94
|
Update
|
2019-10-23 12:57:36 +08:00 |
|
Anthony Calosa
|
8b25f6f129
|
Fix Foil Overlay when Round Border is enabled
|
2019-10-23 11:57:56 +08:00 |
|
Anthony Calosa
|
b37937421c
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2019-10-23 11:52:52 +08:00 |
|
klaxnek
|
4c3e4f2170
|
Translate PlayerControllerHuman.java. Discard, order of cards, delve, exile.
|
2019-10-22 13:23:57 +02:00 |
|
klaxnek
|
dc12c50c1a
|
Forgot lblCleanupPhase
|
2019-10-22 12:56:53 +02:00 |
|
klaxnek
|
2b986f5bac
|
Translate PlayerControllerHuman.java. Discard cards
|
2019-10-22 12:50:15 +02:00 |
|
klaxnek
|
2accf7543e
|
Translated Input Pay Mana. Expanded sentences in order to translate them.
|
2019-10-22 12:08:28 +02:00 |
|
klaxnek
|
ba37189410
|
Translate InputPassPriority.java
|
2019-10-22 11:36:36 +02:00 |
|
Hans Mackowiak
|
d578eee402
|
Add Pioneer Format
|
2019-10-22 08:47:00 +00:00 |
|
Hans Mackowiak
|
5107d89ef5
|
GameFormat: add Píoneer
|
2019-10-22 08:45:07 +00:00 |
|
Hans Mackowiak
|
72b8b5c98e
|
Update StaticData: are the Predicates even used?
|
2019-10-22 08:42:12 +00:00 |
|
Anthony Calosa
|
402885391f
|
Card Sleeves
|
2019-10-22 16:12:03 +08:00 |
|
klaxnek
|
b4d153ab3b
|
Translate Search word in search filters
|
2019-10-22 09:51:03 +02:00 |
|
klaxnek
|
1a0cb62ac8
|
Translate Preload Extended Art
|
2019-10-22 09:42:16 +02:00 |
|
klaxnek
|
c0baf70c59
|
Translate new Settings menú
|
2019-10-22 09:37:05 +02:00 |
|
swordshine
|
166cf2623c
|
Merge branch 'master' into 'master'
update Simplified Chinese translation
See merge request core-developers/forge!2249
|
2019-10-22 06:02:17 +00:00 |
|
CCTV-1
|
8567b69073
|
update 'Draft, Gauntlet and Puzzle Screens' Simplified Chinese translation
|
2019-10-22 13:01:37 +08:00 |
|
swordshine
|
3a4271e66d
|
Merge branch 'updatetranslation' into 'master'
update new settings translation
See merge request core-developers/forge!2246
|
2019-10-22 03:05:25 +00:00 |
|
swordshine
|
8b723aebd9
|
Merge branch 'master' into 'master'
update BitmapFontWriter.java to latest version
See merge request core-developers/forge!2243
|
2019-10-22 03:05:18 +00:00 |
|
swordshine
|
eb59d6c86b
|
Merge branch 'translation09' into 'master'
Mobile: Translate Draft, Gauntlet and Puzzle Screens.
See merge request core-developers/forge!2228
|
2019-10-22 03:05:04 +00:00 |
|
Sol
|
a291b75dd9
|
Merge branch 'patch-4' into 'master'
Questing Beast: fix Damage Trigger
See merge request core-developers/forge!2247
|
2019-10-22 00:41:25 +00:00 |
|
Hans Mackowiak
|
f1a76e1e76
|
Questing Beast: fix Damage Trigger
|
2019-10-22 00:41:25 +00:00 |
|
Sol
|
a391f7414f
|
Merge branch 'updateBanList' into 'master'
BanList 2019-10-21
See merge request core-developers/forge!2248
|
2019-10-22 00:40:49 +00:00 |
|
Hans Mackowiak
|
299de54ba5
|
BanList 2019-10-21
|
2019-10-22 00:40:49 +00:00 |
|
CCTV-1
|
37bae14dfd
|
update Simplified Chinese characters list
|
2019-10-19 10:26:43 +08:00 |
|
CCTV-1
|
d780aa43d4
|
update new settings translation
|
2019-10-18 18:30:59 +08:00 |
|
CCTV-1
|
91534776d1
|
convert \t to four spaces,makes the diff able to read
|
2019-10-17 11:07:00 +08:00 |
|
swordshine
|
bec4db6c6d
|
Merge branch '1187-reducecost-with-minmana-does-reduce-to-0-but-shouldn-t' into 'master'
Resolve "ReduceCost with MinMana does reduce to 0, but shouldn't"
Closes #1187
See merge request core-developers/forge!2244
|
2019-10-16 01:25:33 +00:00 |
|
Hans Mackowiak
|
40b1f89c8f
|
Resolve "ReduceCost with MinMana does reduce to 0, but shouldn't"
|
2019-10-16 01:25:33 +00:00 |
|
swordshine
|
544301e5ff
|
Merge branch 'elddeckgen' into 'master'
ELD Deckgen Data
See merge request core-developers/forge!2245
|
2019-10-16 01:24:03 +00:00 |
|
austinio7116
|
ed48bc2e0e
|
ELD Deckgen Data
|
2019-10-15 19:06:47 +01:00 |
|
Hans Mackowiak
|
b7b9013685
|
Merge branch 'playerKeywordRework' into 'master'
Player keyword rework
Closes #1179
See merge request core-developers/forge!2233
|
2019-10-15 11:12:20 +00:00 |
|
Hans Mackowiak
|
06b9dffa55
|
Player keyword rework
|
2019-10-15 11:12:20 +00:00 |
|
CCTV-1
|
31bb611ecf
|
update BitmapFontWriter.java to latest version(https://github.com/libgdx/libgdx/blob/master/extensions/gdx-tools/src/com/badlogic/gdx/tools/bmfont/BitmapFontWriter.java)
|
2019-10-15 18:35:16 +08:00 |
|
Michael Kamensky
|
173c9ac5f6
|
Merge branch 'master' into 'master'
Added puzzle PS_ELD1 - Possibility Storm - Throne of Eldraine #01
See merge request core-developers/forge!2242
|
2019-10-15 09:49:05 +00:00 |
|
Agetian
|
ad63987d01
|
- Added puzzle PS_ELD1.
|
2019-10-15 07:37:23 +03:00 |
|
Michael Kamensky
|
2c15810833
|
Merge branch 'isInZoneCleanup' into 'master'
replace .getZone().is with .isInZone, no null check needed
See merge request core-developers/forge!2241
|
2019-10-14 18:46:43 +00:00 |
|
Hans Mackowiak
|
773df25b53
|
replace .getZone().is with .isInZone, no null check needed
|
2019-10-14 18:46:43 +00:00 |
|
Michael Kamensky
|
6e2ac756c9
|
Merge branch 'newBranch' into 'master'
Rounded Border Highlight
See merge request core-developers/forge!2240
|
2019-10-14 04:55:11 +00:00 |
|