Commit Graph

42170 Commits

Author SHA1 Message Date
austinio7116
49d57a0365 Added Random Modern World 2019-06-19 06:40:15 +01:00
kms70847
c82950555d Use FMouseAdapter's onLeftDoubleClick event for double click detection in ListChooser. 2019-06-19 01:34:19 -04:00
swordshine
680d8e1c9c add some scripts 2019-06-19 13:19:24 +08:00
swordshine
ff7d4cfc31 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into m20 2019-06-19 12:15:37 +08:00
swordshine
707638c0c5 Merge branch 'master' into 'master'
Moving hard-coded text to res files

See merge request core-developers/forge!1886
2019-06-19 04:14:47 +00:00
swordshine
9c1c075de2 The unimplemented m20 cards 2019-06-19 12:08:53 +08:00
swordshine
6d663f8933 Merge branch 'm20' into 'master'
Core Set 2020 cards

See merge request core-developers/forge!1882
2019-06-19 04:06:50 +00:00
swordshine
7e5cc4d9fe Temporarily removed unscripted cards for merge 2019-06-19 12:00:25 +08:00
Rob Schnautz
8b8a61dd74 Tuesday evening spoilers 2019-06-19 03:04:58 +00:00
swordshine
879d01b1ec Merge branch 'm20spoilers' into m20
Update some scripts
2019-06-19 10:17:56 +08:00
swordshine
17d0a5c0f1 Merge branch 'm20' of https://git.cardforge.org/core-developers/forge into m20 2019-06-19 10:09:05 +08:00
swordshine
7b41e9b19d Merge branch 'master' of https://git.cardforge.org/core-developers/forge into m20 2019-06-19 10:04:02 +08:00
churrufli
e029ee713d Moving hard-coded text to res files 2019-06-19 00:05:20 +02:00
Michael Kamensky
495f6946bf Merge branch 'puzzle-survive1' into 'master'
Puzzle Engine: add several features, add PS_GRNS (disabled) as an example of how to code these features

See merge request core-developers/forge!1885
2019-06-18 19:41:17 +00:00
Agetian
f17a3f2500 - Add a comment to PS_GRNS 2019-06-18 22:34:23 +03:00
Agetian
769a3f6dd8 - Remove empty line. 2019-06-18 22:32:23 +03:00
Agetian
ecd48916c0 - Restore functionality for remove sickness and choose cards 2019-06-18 22:31:45 +03:00
Agetian
9831995db3 - Patch GameState to work with the latest changes. 2019-06-18 22:24:57 +03:00
Agetian
113409516c - Disable PS_GRNS until a way can be found to make the AI behave correctly. 2019-06-18 22:23:29 +03:00
Agetian
78e78bb3d5 - Added puzzle PS_GRNS (Survive the Turn: GRN edition).
- Currently doesn't work well because the AI doesn't prioritize cards in such a way that they would play the cards in such a way they'd actually win on their first turn.
2019-06-18 22:18:41 +03:00
Michael Kamensky
064b686ac0 Merge branch 'master' into 'master'
Added puzzle PS_WAR7 - Possibility Storm - War of the Spark 07

See merge request core-developers/forge!1884
2019-06-18 19:16:33 +00:00
Agetian
af6d437407 - Added puzzle PS_WAR7. 2019-06-18 22:15:48 +03:00
Rob Schnautz
03769a5600 pacifism 2019-06-18 18:18:20 +00:00
Rob Schnautz
1a6d3a0dd3 leyline of anticipation reprint 2019-06-18 17:47:33 +00:00
Michael Kamensky
74c097fef3 Merge branch 'master' into 'master'
Improve logic for Ajani, the Greathearted.

See merge request core-developers/forge!1883
2019-06-18 16:58:27 +00:00
Agetian
4b38c614fa - Improve logic for Ajani, the Greathearted. 2019-06-18 19:57:44 +03:00
Rob Schnautz
66fcd517ea rest of tuesday morning spoilers 2019-06-18 16:45:50 +00:00
Michael Kamensky
cec1956ffd Merge branch 'patch' into 'master'
M20: Add Leyline of Combustion

See merge request core-developers/forge!1881
2019-06-18 16:42:12 +00:00
Rob Schnautz
376a2821e8 more spoilers 2019-06-18 16:33:43 +00:00
Rob Schnautz
18777d9224 more 2019-06-18 16:07:01 +00:00
Rob Schnautz
f1737b993c more 2019-06-18 15:38:55 +00:00
Rob Schnautz
21356478e0 move oracle to bottom 2019-06-18 15:03:52 +00:00
swordshine
a5679cab49 Add Atemsis, All-Seeing 2019-06-18 22:39:02 +08:00
swordshine
39df559050 Update Ajani, Strength of the Pride 2019-06-18 22:26:44 +08:00
swordshine
7c92e75359 M20: Add Leyline of Combustion 2019-06-18 20:23:48 +08:00
Michael Kamensky
7e78b233d4 Merge branch 'fix-alesha' into 'master'
Fix defender selection on "enters attacking" effects

See merge request core-developers/forge!1872
2019-06-18 05:26:45 +00:00
Michael Kamensky
74d3af3c20 Merge branch 'master' into 'master'
War of the Spark: it looks like there are only 3 booster covers

See merge request core-developers/forge!1880
2019-06-18 04:27:55 +00:00
Agetian
680e2d63e3 - War of the Spark: it looks like there are only 3 booster covers (except for color-themed boosters and other stuff) 2019-06-18 07:27:25 +03:00
schnautzr
7fc32ae4ca Merge branch 'm20' of https://git.cardforge.org/core-developers/forge into m20 2019-06-17 16:04:09 -05:00
schnautzr
21fe950df0 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into m20 2019-06-17 16:02:34 -05:00
Rob Schnautz
62ae636dd5 Merge branch 'master' into 'm20'
update from master

See merge request core-developers/forge!1878
2019-06-17 20:56:11 +00:00
Rob Schnautz
6cdbcf3a0b - Somewhat better logic for Might of Old Krosa and Arrester's Zeal, allowing the AI to use them in Main 1 in overwhelming situations. 2019-06-17 20:56:11 +00:00
schnautzr
f0345438da dragon mage and stuff 2019-06-17 15:52:10 -05:00
schnautzr
7492891db7 moar cardz 2019-06-17 13:58:21 -05:00
schnautzr
c30505ad8d cavalier of flame, ajani strength of pride. note that ajani's third ability needs work yet to prevent graying out when the condition is false, but this would rarely if ever be a problem 2019-06-17 13:32:40 -05:00
Michael Kamensky
697b4d66ca Merge branch 'master' into 'master'
Added AI cast preference to Mass Hysteria and Concordant Crossroads

Closes #1059

See merge request core-developers/forge!1876
2019-06-17 16:10:57 +00:00
Agetian
077bfc4fdf - Added AI cast preference to Mass Hysteria and Concordant Crossroads 2019-06-17 19:08:14 +03:00
Rob Schnautz
e927b6f6de empyrean eagle 2019-06-17 15:49:43 +00:00
Rob Schnautz
68f8b9800c add ajani 2019-06-17 15:46:41 +00:00
Rob Schnautz
7a7cf01caf Rienne is a secret card, add Ironroot Warlord and Unsummon. 2019-06-17 15:38:48 +00:00