swordshine
c75d3b2d04
Merge branch 'updatedspanish01' into 'master'
...
Updated spanish translations
See merge request core-developers/forge!2311
2019-12-01 04:38:19 +00:00
Peter
dde3e08e6a
Updated spanish translations
2019-11-30 14:39:46 +01:00
Michael Kamensky
39f695f120
Merge branch 'master' into 'master'
...
Added puzzle PS_ELD6 - Possibility Storm - Throne of Eldraine 06
See merge request core-developers/forge!2309
2019-11-29 19:44:20 +00:00
Agetian
61839df123
- Added puzzle PS_ELD6.
2019-11-29 21:22:08 +03:00
Michael Kamensky
e6b3ec048a
Merge branch 'newBranch' into 'master'
...
Add Unstable Set to ExtendedArt
See merge request core-developers/forge!2308
2019-11-29 13:40:51 +00:00
Anthony Calosa
4fb5e7d305
Add Unstable Set to ExtendedArt
2019-11-29 13:40:25 +08:00
swordshine
8d4a80089e
Merge branch 'patch' into 'master'
...
Game Night 2019 edition file
See merge request core-developers/forge!2307
2019-11-28 09:50:34 +00:00
swordshine
539e321c53
Removed an unused token
2019-11-28 16:53:40 +08:00
swordshine
737700719a
Add Game Night 2019 edition file
2019-11-28 16:50:52 +08:00
swordshine
b2bc26142a
Update Thoughtbound Phantasm's description
2019-11-28 16:50:52 +08:00
swordshine
9a125bf4f5
Merge branch 'master' into 'master'
...
Game Night 2019 Mythics
See merge request core-developers/forge!2306
2019-11-28 08:33:01 +00:00
Tim Mocny
b53135d83a
Game Night 2019 Mythics
2019-11-28 08:33:00 +00:00
swordshine
87bad70939
Merge branch 'master' into 'master'
...
translate some controller button
See merge request core-developers/forge!2305
2019-11-27 14:25:51 +00:00
CCTV-1
047bc9c5cd
remove duplicate keys
2019-11-27 13:36:07 +08:00
CCTV-1
f098e333d2
translate some controller button
2019-11-27 13:32:05 +08:00
swordshine
785835632d
Merge branch 'byebyeoko' into 'master'
...
Updated standard deckgen data - no more ELKs
See merge request core-developers/forge!2304
2019-11-27 01:43:56 +00:00
austinio7116
360b72fd91
Updated standard deckgen data - no more ELKs
...
(cherry picked from commit 42eafee)
2019-11-26 20:36:59 +00:00
Michael Kamensky
19082049e7
Merge branch 'master' into 'master'
...
Better AI logic spec for Heraldic Banner
Closes #1207
See merge request core-developers/forge!2302
2019-11-25 16:26:57 +00:00
Agetian
eacc29672f
- Better AI logic spec for Heraldic Banner
2019-11-25 19:19:15 +03:00
Agetian
c7b6ac1670
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2019-11-25 12:40:04 +03:00
swordshine
0aa54cea23
Merge branch 'master' into 'master'
...
update simplified chinese translation
See merge request core-developers/forge!2300
2019-11-25 05:57:04 +00:00
Michael Kamensky
9fe50f6c66
Merge branch 'newBranch' into 'master'
...
Fix path seperator, Fix newdeck editor
See merge request core-developers/forge!2301
2019-11-25 05:27:44 +00:00
Anthony Calosa
2bb84cf79f
Merge remote-tracking branch 'remotes/core/master' into newBranch
2019-11-25 13:04:29 +08:00
Anthony Calosa
8d0ade1eab
Fix path seperator
...
(android now works for filtering download if you have existing fullborder cards)
Fix newdeck editor not loading if a user deleted unwanted edition file
(TODO: Don't include setless cards on deck editor...)
2019-11-25 13:01:19 +08:00
CCTV-1
242c7c3b21
update simplified chinese translation
2019-11-25 12:36:07 +08:00
CCTV-1
ff272b89fd
added missing translation label
2019-11-25 12:35:13 +08:00
Michael Kamensky
4e83e73dca
Merge branch 'master' into 'master'
...
Update CHANGES.txt
See merge request core-developers/forge!2299
2019-11-24 05:01:49 +00:00
Michael Kamensky
7d1ffa4e90
Update CHANGES.txt
2019-11-24 05:01:49 +00:00
Agetian
aab83d882a
- Updating CHANGES.txt, part 2.
2019-11-24 07:56:59 +03:00
Agetian
4f69b673bf
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2019-11-24 07:54:14 +03:00
Michael Kamensky
7d17e58e1f
Merge branch 'newBranch' into 'master'
...
Update additional check
See merge request core-developers/forge!2298
2019-11-24 04:53:54 +00:00
Agetian
3d6677bbd5
- Update CHANGES.txt.
2019-11-24 07:52:42 +03:00
Anthony Calosa
30d57a5745
Update
2019-11-24 12:35:12 +08:00
Michael Kamensky
2fb2b64d33
Merge branch 'newBranch' into 'master'
...
Update LQ Downloader
See merge request core-developers/forge!2297
2019-11-24 04:35:01 +00:00
Anthony Calosa
1dc8fed6e8
Merge remote-tracking branch 'remotes/core/master' into newBranch
2019-11-24 12:11:12 +08:00
Anthony Calosa
44c6605804
Update LQ downloader
...
(dont download full image equivalent to an existing fullborder images)
2019-11-24 12:05:45 +08:00
Michael Kamensky
560f8ac14a
Merge branch 'master' into 'master'
...
Stack Addition Modal Panel
See merge request core-developers/forge!2294
2019-11-23 12:35:48 +00:00
Alessandro Coli
b99dea604d
Labels for changes to stack effect notification panel
2019-11-23 12:07:36 +01:00
Alessandro Coli
f3ff419462
Changes for the stack effect notifications - request by Michael Kamensky
...
@Agetian in merge request
https://git.cardforge.org/core-developers/forge/merge_requests/2294
2019-11-23 12:05:08 +01:00
Alessandro Coli
d79c2469ec
Merge remote-tracking branch 'upstream/master'
2019-11-23 09:44:59 +01:00
swordshine
94de9e7cf2
Merge branch 'fix-broken-start' into 'master'
...
Fix start crash
See merge request core-developers/forge!2296
2019-11-23 02:40:36 +00:00
Chris H
a9d9c800b8
Fix start crash
2019-11-22 21:02:02 -05:00
swordshine
678d09558c
Merge branch 'patch-5' into 'master'
...
Syr Konrad, the Grim: The Leave the Graveyard Trigger is only for your Graveyard
See merge request core-developers/forge!2295
2019-11-23 01:25:30 +00:00
Hans Mackowiak
831edab34b
Syr Konrad, the Grim: The Leave the Graveyard Trigger is only for your Graveyard
2019-11-23 01:25:30 +00:00
Alessandro Coli
5b64b41f21
Merge remote-tracking branch 'upstream/master'
2019-11-22 13:40:18 +01:00
Alessandro Coli
78a5827976
Fixed some code indentations
2019-11-22 08:17:45 +01:00
Michael Kamensky
a9b6faeb7c
Merge branch 'remove_some_build_warnings' into 'master'
...
Remove some build warnings
See merge request core-developers/forge!2219
2019-11-22 04:56:48 +00:00
Ryan1729
bebc58d91d
Merge branch 'master' of git.cardforge.org:core-developers/forge into remove_some_build_warnings
...
# Conflicts:
# forge-gui-mobile/src/forge/assets/FSkin.java
2019-11-21 10:24:52 -07:00
Alessandro Coli
2c70b8b7e0
End of the stack modal panel implementation, rollback about the Wild
...
Quests implementation
2019-11-21 16:49:50 +01:00
Alessandro Coli
07d7b7cb58
Merge remote-tracking branch 'upstream/master'
2019-11-21 16:35:45 +01:00
