Alessandro Coli
facb85f74f
Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git
2019-03-09 13:34:44 +01:00
Michael Kamensky
c0103815be
Merge branch 'clash-log-post-action' into 'master'
...
Log after clashing so players know what happened to top of library
See merge request core-developers/forge!1449
2019-03-09 03:53:17 +00:00
tehdiplomat
f7d40687b6
Log after clashing so players know what happened to top of library
2019-03-08 10:11:15 -05:00
Michael Kamensky
a24a844078
Merge branch 'master' into 'master'
...
Fix the AI not considering Adapt P/T bonus correctly on attack
Closes #892
See merge request core-developers/forge!1448
2019-03-08 09:52:13 +00:00
Michael Kamensky
a820ba35f7
Fix the AI not considering Adapt P/T bonus correctly on attack
2019-03-08 09:52:13 +00:00
Sol
baa4f8cd74
Merge branch '894-dies-leaves-triggers-don-t-work-on-copied-permanents' into 'master'
...
Resolve "Dies/Leaves triggers don't work on copied permanents"
Closes #894
See merge request core-developers/forge!1447
2019-03-08 02:32:58 +00:00
Hanmac
9067d676eb
GameAction: register from LKI to fix leave the battlefield
2019-03-07 20:34:32 +01:00
Michael Kamensky
4b6cf610a7
Merge branch 'master' into 'master'
...
Added puzzle PS_RNA6 (Possibility Storm - Ravnica Allegiance 06)
See merge request core-developers/forge!1446
2019-03-06 17:58:41 +00:00
Agetian
12ee419158
- Fix PS_RNA6.
2019-03-06 20:57:52 +03:00
Michael Kamensky
53075e5099
Merge branch 'master' into 'master'
...
Sound support for multicolor lands
See merge request core-developers/forge!1445
2019-03-06 17:56:56 +00:00
Agetian
33ee5a0a17
- Added puzzle PS_RNA6.
2019-03-06 20:54:06 +03:00
Alessandro Coli
0bd29eb1e7
Merge branch 'master' of https://git.cardforge.org/core-developers/forge.git
2019-03-05 22:52:20 +01:00
Alessandro Coli
c4d859cb03
Sound support for multicolor lands
2019-03-05 19:17:48 +01:00
Michael Kamensky
0cbd22ae69
Merge branch 'estrid-fix' into 'master'
...
Fix Estrid, the Masked -1 ability
See merge request core-developers/forge!1443
2019-03-05 11:56:51 +00:00
Michael Kamensky
05ecffcbd1
Merge branch 'master' into 'master'
...
Forge for Android 1.6.21.003
See merge request core-developers/forge!1444
2019-03-05 06:13:19 +00:00
Agetian
3f15be2732
- Fix inverse logic in TokenEffect (fixes e.g. Estrid, the Masked -1 ability)
2019-03-05 09:10:48 +03:00
Agetian
cc13020b4b
- Preparing Forge for Android publish 1.6.21.003 [hotfix].
2019-03-05 08:35:36 +03:00
Agetian
1a27142f1f
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
2019-03-05 08:02:13 +03:00
Sol
89348173a5
Merge branch 'revert-fc987a81' into 'master'
...
Revert "Merge branch 'fix-bad-art-deck-art-corruption' into 'master'"
See merge request core-developers/forge!1442
2019-03-04 15:58:17 +00:00
Sol
8a9c27f9ae
Revert "Merge branch 'fix-bad-art-deck-art-corruption' into 'master'"
...
This reverts merge request !1440
2019-03-04 15:58:06 +00:00
Agetian
7da2316c0a
- Preparing Forge for Android publish 1.6.21.002 [incremental].
2019-03-04 16:34:33 +03:00
Michael Kamensky
6807257630
Merge branch 'custom-pool-options' into 'master'
...
Swanky new Choose Sets Dialog randomizer
See merge request core-developers/forge!1431
2019-03-04 13:13:50 +00:00
Michael Kamensky
223136dd6f
Merge branch 'android-max-size-image-cache' into 'master'
...
Android max size image cache
See merge request core-developers/forge!1432
2019-03-04 13:13:35 +00:00
Sol
0b997a2937
Android max size image cache
2019-03-04 13:13:35 +00:00
Michael Kamensky
66debd6806
Merge branch 'master' into 'master'
...
Added puzzle PS_RNA5 (Possibility Storm - Ravnica Allegiance 05)
See merge request core-developers/forge!1441
2019-03-04 13:13:10 +00:00
Agetian
063ebf2f70
- Added puzzle PS_RNA5.
2019-03-04 15:04:21 +03:00
Michael Kamensky
940cd71d34
Merge branch 'master' into 'master'
...
ManaBurn sound working again + Edition files for Mythic Edition of Guild of Ravnica and Ravnica Allegiance
See merge request core-developers/forge!1437
2019-03-04 03:22:56 +00:00
Michael Kamensky
fc987a81a0
Merge branch 'fix-bad-art-deck-art-corruption' into 'master'
...
If a DeckList references a bogus card set/art combo ignore parts of it until it works
Closes #132
See merge request core-developers/forge!1440
2019-03-04 03:22:44 +00:00
Chris H
888f5953b1
If a DeckList references a bogus card set/art combo ignore parts of it until it works
2019-03-03 21:47:28 -05:00
Sol
c30086390d
Merge branch 'master' into 'master'
...
Moving hard-coded text to en-US.properties file
See merge request core-developers/forge!1413
2019-03-03 20:44:33 +00:00
Sol
37207559e6
Merge branch 'patch-2' into 'master'
...
Update Bug.md
See merge request core-developers/forge!1439
2019-03-03 17:47:25 +00:00
Sol
93bd90f139
Update Bug.md
2019-03-03 17:47:01 +00:00
Alessandro Coli
df55bc5d34
Fixing of tabs as required
2019-03-03 10:13:22 +01:00
Sol
ce7b66652c
Merge branch 'add-gitlab-templates' into 'master'
...
Add gitlab templates
See merge request core-developers/forge!1438
2019-03-03 02:23:03 +00:00
Chris H
c091eefc84
Add gitlab templates
2019-03-02 21:20:47 -05:00
Alessandro
b7508b8c3a
ManaBurn sound working again
2019-03-02 16:10:13 +01:00
Alessandro
b5a0e15327
Merge remote-tracking branch 'upstream/master'
2019-03-02 13:14:33 +01:00
Alessandro
d29ed9a5fe
New editions files for "Mythic editions" of Guilds of Ravnica and
...
Ravnica Allegiance
2019-03-02 12:45:15 +01:00
Michael Kamensky
62cf8533e0
Merge branch 'ai-damage-crash' into 'master'
...
Ai damage crash
See merge request core-developers/forge!1434
2019-03-01 18:59:07 +00:00
Chris H
7a96ff2d4b
Verify AI divided damage always fills out divided hash with proper values
2019-02-28 22:16:44 -05:00
Sol
cafd7d9c64
Merge branch 'quest-load-npe-fix' into 'master'
...
Fix NPE when no quests are available to load
See merge request core-developers/forge!1433
2019-02-28 02:52:49 +00:00
KrazyTheFox
5377376585
Fix NPE when no quests are available to load
2019-02-27 21:49:31 -05:00
Chris H
69661cab63
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-27 21:36:32 -05:00
Chris H
15520fcc67
Merge branch 'master' of https://git.cardforge.org/friarsol/forge
2019-02-27 21:35:55 -05:00
KrazyTheFox
eedbdeca99
Add release notes
2019-02-27 20:55:37 -05:00
Churrufli
34380befaf
Update AddBasicLandsDialog.java
2019-02-27 19:36:16 +00:00
churrufli
da5b1a18bf
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-27 20:13:44 +01:00
churrufli
a546339ea2
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-27 19:58:25 +01:00
churrufli
558442a6bb
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-27 17:35:06 +01:00
Michael Kamensky
16c9cc7eac
Merge branch 'lq-image-download-tweak' into 'master'
...
Update server download URL parsing
Closes #858
See merge request core-developers/forge!1421
2019-02-27 12:22:14 +00:00
