Commit Graph

47065 Commits

Author SHA1 Message Date
Michael Kamensky
38fa7a07d5 Merge branch 'ramirez' into 'master'
CMR: Ghost of Ramirez DePietro and keyword support

See merge request core-developers/forge!3312
2020-11-01 04:36:06 +00:00
Michael Kamensky
72285b73d9 Merge branch 'cmr31a' into 'master'
CMR - 31 Oct part 2

See merge request core-developers/forge!3317
2020-11-01 04:34:40 +00:00
Northmoc
9392d3be83 kill CMR folder again 2020-10-31 20:30:18 -04:00
Northmoc
d719e84aa1 court_of_ambition.txt (script by Benjamin) 2020-10-31 20:08:12 -04:00
Northmoc
59f4024ee0 emberwilde_captain.txt (script by medusa) 2020-10-31 19:38:34 -04:00
Northmoc
10586e84fe apex_devastator.txt (script by Marvel) 2020-10-31 19:32:14 -04:00
Northmoc
96ae49f698 colfenor_the_last_yew.txt and RememberTriggeringCard!!! 2020-10-31 15:25:06 -04:00
Michael Kamensky
e922f7b7e8 Merge branch 'cmr30' into 'master'
CMR - 30 Oct

See merge request core-developers/forge!3311
2020-10-31 17:34:19 +00:00
Michael Kamensky
fff0b48166 Merge branch 'fall_from_favor' into 'master'
CMR: Fall from Favor and support

See merge request core-developers/forge!3310
2020-10-31 17:33:45 +00:00
Michael Kamensky
4b81465c4d Merge branch 'master' into 'master'
CMR: Belbe and Cascade

See merge request core-developers/forge!3308
2020-10-31 17:33:08 +00:00
Michael Kamensky
05dd6b0a50 Merge branch 'cmr31' into 'master'
CMR - 31 Oct

See merge request core-developers/forge!3314
2020-10-31 17:32:30 +00:00
Michael Kamensky
8a61776699 Merge branch 'cmr29' into 'master'
CMR - 29 Oct

See merge request core-developers/forge!3309
2020-10-31 17:32:15 +00:00
Northmoc
05870f5d17 fixed keyword support 2020-10-31 10:05:22 -04:00
Northmoc
1b4a0a3381 archon_of_coronation.txt and support 2020-10-31 09:38:17 -04:00
Northmoc
2fb62b9849 Editions update, upcoming cleanup 2020-10-31 08:19:27 -04:00
Northmoc
9bb425c2ab ValidCards > Defined 2020-10-31 00:28:03 -04:00
Northmoc
8ee13d7abe few more little tweaks 2020-10-30 23:46:09 -04:00
Northmoc
be6d633763 Clean up card detail mess 2020-10-30 19:48:13 -04:00
Northmoc
64131f15e5 Encore keyword/reminder text 2020-10-30 18:44:09 -04:00
Northmoc
ea908ce5ad rest of Encore mechanic 2020-10-30 18:43:45 -04:00
Northmoc
dc8be8c0a0 Encore mechanic 2020-10-30 18:40:35 -04:00
Northmoc
fa619ee16e - small typo 2020-10-30 18:39:36 -04:00
Northmoc
347dfa05bf amphin_mutineer.txt and token 2020-10-30 14:22:25 -04:00
Northmoc
0dd0b50e6f jewelled_lotus.txt (guytrash) 2020-10-30 14:07:52 -04:00
Northmoc
ca9714bbc4 StaticAbility.java add UnlessDefinedPlayer param 2020-10-30 13:50:31 -04:00
Northmoc
60b1b223eb fall_from_favor.txt 2020-10-30 13:49:46 -04:00
Northmoc
25b211012f amareth_the_lustrous.txt 2020-10-30 11:12:08 -04:00
Northmoc
b546b99daf ghost_of_ramirez_depietro.txt and keyword support 2020-10-30 09:42:07 -04:00
Northmoc
0218aee82a AI improvements 2020-10-30 08:15:10 -04:00
Northmoc
a17060bb89 jeskas_will.txt 2020-10-30 08:15:09 -04:00
Northmoc
d4b9d54674 kamahls_will.txt 2020-10-30 08:15:09 -04:00
Northmoc
7925ba2cbb szats_will.txt cleanup 2020-10-30 08:15:09 -04:00
Northmoc
e21f793cfe seraphic_greatsword.txt 2020-10-30 08:15:08 -04:00
Northmoc
0ffc6be2cd szats_will.txt 2020-10-30 08:15:08 -04:00
Northmoc
e7854ab069 kodis_emberclaw_familiar.txt (guytrash) 2020-10-30 08:15:07 -04:00
Northmoc
38174b8b29 kamahl_heart_of_krosa.txt (guytrash) 2020-10-30 08:15:07 -04:00
swordshine
3721873093 Merge branch 'cmr27' into 'master'
CMR - 27 Oct

See merge request core-developers/forge!3296
2020-10-30 04:37:07 +00:00
Michael Kamensky
5438abe24e Merge branch 'triggerDamageAllExtend' into 'master'
TriggerDamageAll: add triggered objects for Sources and Targets, AbilityUtils supports Sets now

Closes #1620

See merge request core-developers/forge!3307
2020-10-30 03:43:47 +00:00
Hythonia
f455b95f80 Belbe, Corrupted Observer 2020-10-29 18:55:21 +01:00
Hythonia
a48db1829f Meteoric Mace and Natural Reclamation 2020-10-29 17:48:00 +01:00
Hythonia
780a877c4b Merge remote-tracking branch 'origin/master' 2020-10-29 17:02:55 +01:00
Hythonia
afbe9ccfe9 Local cards 2020-10-29 17:02:17 +01:00
Hans Mackowiak
ffc4cfebec TriggerDamageAll: add triggered objects for Sources and Targets, AbilityUtils supports Sets now 2020-10-29 14:32:47 +01:00
swordshine
8aabeb0d75 Merge branch 'profane' into 'master'
CMR: Profane Transfusion and support

See merge request core-developers/forge!3302
2020-10-29 11:16:58 +00:00
swordshine
16fac06695 Merge branch 'cmr28' into 'master'
CMR :: 28 Oct

See merge request core-developers/forge!3305
2020-10-29 11:14:46 +00:00
swordshine
0f95d631c2 Merge branch 'master' into 'master'
CMR: Court of Cunning + support

See merge request core-developers/forge!3306
2020-10-29 11:13:41 +00:00
Hythonia
322e26c7bf Revert "Add "isNotMonarch" property"
This reverts commit ec0c826bf2
2020-10-29 10:51:19 +00:00
Hythonia
79daf02db6 Fix "Count$Monarch" 2020-10-29 10:50:38 +00:00
Hythonia
e01fae1daf Fix Court of Cunning 2020-10-29 10:42:36 +00:00
Hythonia
fef9ca7690 Add court_of_cunning.txt 2020-10-29 09:08:20 +00:00