Commit Graph

1419 Commits

Author SHA1 Message Date
Sol
6371e708b0 Merge branch 'master' into 'mulligans'
# Conflicts:
#   forge-game/src/main/java/forge/game/GameAction.java
2019-05-28 00:39:05 +00:00
Chris H
220e75a81b Extract mulligans from GameAction
- Add a few different types of Mulliganing that should be expandable
- To finish the work, we need the AI to better handle London mulligans
- And have the UI make this option selectable
2019-05-27 15:58:20 -04:00
swordshine
d4ac3153ce Merge branch 'master' into 'master'
Moving hard-coded text to res files

See merge request core-developers/forge!1632
2019-05-24 00:35:11 +00:00
Blacksmith
6c945608b3 [maven-release-plugin] prepare for next development iteration 2019-05-20 00:42:07 +00:00
Blacksmith
57786e7c81 [maven-release-plugin] prepare release forge-1.6.25 2019-05-20 00:42:02 +00:00
churrufli
70655c0f26 Moving hard-coded text to en-US.properties file 2019-05-09 00:03:38 +02:00
churrufli
e9b266e1d2 updating res files 2019-05-08 23:21:03 +02:00
churrufli
662d725aa4 updating res files 2019-05-08 23:21:03 +02:00
Blacksmith
52ad5d559a [maven-release-plugin] prepare for next development iteration 2019-05-02 01:16:44 +00:00
Blacksmith
711bc38276 [maven-release-plugin] prepare release forge-1.6.24 2019-05-02 01:16:39 +00:00
Agetian
fd3deec51f - Test for the Goblin type.
- Change assert to assertTrue for style similarity.
2019-05-01 12:41:15 +03:00
Agetian
2447df4dde - Some more superfluous lines removed. 2019-05-01 12:35:41 +03:00
Agetian
7ae287b880 - Removed a couple duplicate lines. 2019-05-01 12:34:17 +03:00
Agetian
16797e67cd - Added a test for Awakening of Vitu-Ghazi + Cytoshape. 2019-05-01 12:32:06 +03:00
Agetian
c609f199e4 - Minor code cleanup.
- Fix visualization of the Slumber counter.
2019-04-29 13:06:19 +03:00
Hans Mackowiak
1b47a81b8c ReplacementEffect: rewrite for Riot and Spark Double 2019-04-29 10:03:06 +00:00
Hans Mackowiak
f408950aad Bioessence Hydra: add new Trigger for counters on many game entities at once 2019-04-25 01:48:29 +00:00
Hanmac
b72f965725 Make LKI have Original State even in Facedown 2019-04-23 20:00:35 +02:00
Hanmac
f3222e4723 some fixes 2019-04-23 20:00:35 +02:00
Hanmac
e84bbaffc3 updates for clone states 2019-04-23 20:00:35 +02:00
Hanmac
97e9e6d822 more to debug GameSimTest 2019-04-23 20:00:35 +02:00
Hanmac
1bd762c0f8 GameSimTest: add test for Dimir Doppelganger 2019-04-23 20:00:35 +02:00
Agetian
14c2f7aad0 - Fix the unmorph test 2019-04-23 20:00:35 +02:00
Agetian
62f55b9ba3 - Even more unused imports. 2019-04-23 20:00:35 +02:00
Agetian
b5c92bf423 - Added a test for Volrath's Shapeshifter. 2019-04-23 20:00:35 +02:00
Hanmac
ba8a38c2f4 CloneRewrite 2019-04-23 20:00:35 +02:00
swordshine
1e338ec91e Merge branch 'master' into 'master'
Moving hard-coded text to en-US.properties file

See merge request core-developers/forge!1537
2019-04-22 04:32:33 +00:00
churrufli
b95022740b updating res files 2019-04-14 09:51:35 +02:00
Sol
13583d0aba Fix audit tool 2019-04-13 04:32:31 +00:00
Hans Mackowiak
4dd411d619 SimulationTestCase: fix Game init with Localizer 2019-04-11 11:35:22 +00:00
churrufli
5dd8619663 updating res files 2019-04-11 08:29:41 +02:00
churrufli
8d94663f4a Update language properties 2019-04-11 08:29:41 +02:00
Hans Mackowiak
2617795e37 War: Proliferate: rework effect now put each counter type on it 2019-04-10 10:23:00 +00:00
churrufli
fdf3d3588e updating res files 2019-04-10 00:44:52 +02:00
churrufli
cc19b2b39e Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-04-09 14:21:03 +02:00
Blacksmith
405cbd5ab3 [maven-release-plugin] prepare for next development iteration 2019-04-07 19:48:55 +00:00
Blacksmith
5b39be5fe9 [maven-release-plugin] prepare release forge-1.6.23 2019-04-07 19:48:50 +00:00
swordshine
af7cb0ae30 Merge branch 'fix-card-auditer' into 'master'
Add variants for Card Auditer

See merge request core-developers/forge!1516
2019-04-07 03:51:01 +00:00
Chris H
38b183b795 Add variants for Card Auditer 2019-04-06 23:26:20 -04:00
churrufli
ada8d59b2c Update language properties 2019-04-06 22:53:38 +02:00
Marc-André
9c578fb57c Fixed Card not updating in the stack on mouseover when targeting arcs isn't on Mouseover 2019-04-05 02:48:44 +00:00
Chris H
f5a4360339 TokenViewer doesn't crash now.. Just need it to display 2019-03-31 22:48:57 -04:00
Chris H
a050f7c26c TokenViewer Deck "editor" 2019-03-30 22:09:16 -04:00
Michael Kamensky
2937041c63 Merge branch 'card-and-image-audit-menu' into 'master'
Card and image audit menu

See merge request core-developers/forge!1451
2019-03-12 05:51:21 +00:00
Tim Scott
eafa4418d6 Reduce the size of the font for the audit report.
Change up the scroll window to allow for horizontal movement.

Add code/code2 info for easier reference.
2019-03-10 15:39:10 -05:00
Blacksmith
c3346c737e [maven-release-plugin] prepare for next development iteration 2019-03-10 13:57:44 +00:00
Blacksmith
db3c4d2d2f [maven-release-plugin] prepare release forge-1.6.22 2019-03-10 13:57:39 +00:00
Tim Scott
89df7694d9 Correct copy to clipboard action. 2019-03-10 08:51:51 -05:00
Tim Scott
02abe851c0 Organize images not found and cards not implemented into two separate lists for easier reference.
Add label to dialog after audit operation for easier reference.
2019-03-09 12:41:17 -06: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