Commit Graph

48875 Commits

Author SHA1 Message Date
Michael Kamensky
0ac4f98ffa Merge branch 'practical' into 'master'
Practical Research and support

See merge request core-developers/forge!4323
2021-04-01 08:02:02 +00:00
Anthony Calosa
ebd3c72170 Merge branch 'master' into 'master'
fix check

See merge request core-developers/forge!4328
2021-04-01 07:54:41 +00:00
Anthony Calosa
839a91d144 fix check 2021-04-01 15:53:10 +08:00
Anthony Calosa
5c3df787bb Merge branch 'kevlahnota-master-patch-83054' into 'master'
Update blood_of_the_martyr.txt

See merge request core-developers/forge!4327
2021-04-01 06:30:26 +00:00
Anthony Calosa
daeec63b71 Update blood_of_the_martyr.txt 2021-04-01 06:30:09 +00:00
Anthony Calosa
7f0b819993 Merge branch 'master' into 'master'
[Mobile] preload ItemPool and fix Planar Conquest new game

See merge request core-developers/forge!4324
2021-03-31 18:35:35 +00:00
Anthony Calosa
c0af1fa1eb [Mobile] preload ItemPool and fix Planar Conquest new game 2021-04-01 02:34:14 +08:00
Northmoc
2a841e4ae2 AI multi UnlessType support 2021-03-31 09:59:54 -04:00
Northmoc
0033de0831 human multi UnlessType support 2021-03-31 09:58:54 -04:00
Northmoc
f70af84e16 practical_research.txt 2021-03-31 09:32:56 -04:00
Michael Kamensky
d9571f3c4d Merge branch 'Williams-master-patch-43202' into 'master'
STX some more cards

See merge request core-developers/forge!4317
2021-03-31 09:59:08 +00:00
Michael Kamensky
fda2f1ff15 Merge branch 'refactor_loadnonlegal' into 'master'
refactor enable non legal cards

See merge request core-developers/forge!4322
2021-03-31 09:58:54 +00:00
John
0d4824b7e0 Update sudden_breakthrough.txt 2021-03-31 07:45:18 +00:00
Hans Mackowiak
0cd376e039 CopySpellAbilityEffect: better description for optional 2021-03-31 09:26:45 +02:00
Hans Mackowiak
101c953020 Culmination of studies: better use of Remembered 2021-03-31 09:18:24 +02:00
John
46bf18cbfa Update resculpt.txt 2021-03-31 07:09:08 +00:00
Anthony Calosa
5348cd3f22 refactor enable non legal cards 2021-03-31 14:01:25 +08:00
Michael Kamensky
9591ed744b Merge branch 'stx_30' into 'master'
STX - 30 Mar

See merge request core-developers/forge!4316
2021-03-31 04:51:15 +00:00
Michael Kamensky
efed8bbd4b Merge branch 'new-cards' into 'master'
STX cards

See merge request core-developers/forge!4319
2021-03-31 04:50:11 +00:00
Michael Kamensky
7e0025d3fc Merge branch 'sym-master' into 'master'
Master Symmetrist

See merge request core-developers/forge!4308
2021-03-31 04:49:11 +00:00
Michael Kamensky
b016b56a30 Merge branch 'typo' into 'master'
typo

See merge request core-developers/forge!4321
2021-03-31 04:48:57 +00:00
Michael Kamensky
167d577f4d Merge branch 'gold' into 'master'
Fix Bound in Gold typos

See merge request core-developers/forge!4318
2021-03-31 04:48:50 +00:00
Adam Pantel
39b09c5b25 Symmetry Master 2021-03-30 19:31:41 -04:00
Adam Pantel
86842735bf STX cards 2021-03-30 18:37:33 -04:00
Northmoc
05cf67d3e1 prompt support for Wandering Archaic 2021-03-30 18:19:00 -04:00
Northmoc
9f10d1b923 wandering_archaic_explore_the_vastlands.txt 2021-03-30 18:19:00 -04:00
Northmoc
db66c6cde4 culmination_of_studies.txt 2021-03-30 18:19:00 -04:00
Northmoc
0eaa99a91a prismari_campus.txt 2021-03-30 18:18:59 -04:00
Northmoc
11de057064 extus_oriq_overlord_awaken_the_blood_avatar.txt and token 2021-03-30 18:18:59 -04:00
Northmoc
d206ed5c0b tanazir_quandrix.txt 2021-03-30 18:18:58 -04:00
Northmoc
6dd0275e5a galazeth_prismari.txt 2021-03-30 18:18:58 -04:00
Hans Mackowiak
cefaa78832 Semester's End: needs to be ReplacementEffect like Spark Double 2021-03-30 22:52:10 +02:00
John
7253c56086 Add new file 2021-03-30 20:27:39 +00:00
tool4EvEr
38dc4274ff Fix Bound in Gold typos 2021-03-30 21:59:30 +02:00
John
833a5bd974 Update sudden_breakthrough.txt 2021-03-30 19:43:18 +00:00
John
2443772e78 Add new file 2021-03-30 19:41:50 +00:00
John
243a24c7f2 Add new file 2021-03-30 19:34:22 +00:00
Northmoc
1166297dda fetch counter 2021-03-30 15:29:33 -04:00
Anthony Calosa
58bfc4b36c Merge branch 'tweaks' into 'master'
Tweaks

See merge request core-developers/forge!4315
2021-03-30 17:53:20 +00:00
Anthony Calosa
1b07c8838f Merge branch 'kevlahnota-master-patch-57147' into 'master'
fix NPE

See merge request core-developers/forge!4314
2021-03-30 17:28:31 +00:00
Anthony Calosa
6592694778 fix NPE 2021-03-30 17:28:08 +00:00
Northmoc
08d5735af9 one SubAbility per line 2021-03-30 13:22:07 -04:00
Northmoc
4cd69a52f6 better prompt 2021-03-30 13:21:13 -04:00
Michael Kamensky
542bab816f Merge branch 'new-cards' into 'master'
STX cards

See merge request core-developers/forge!4306
2021-03-30 17:19:24 +00:00
Michael Kamensky
357be5296f Merge branch 'Williams-master-patch-83839' into 'master'
STX some cards 30/03

See merge request core-developers/forge!4310
2021-03-30 17:18:19 +00:00
Hans Mackowiak
57816a4f3a fixup DestroyAi use getMaxXValue 2021-03-30 19:08:15 +02:00
John
7486eb640f Add new file 2021-03-30 16:51:31 +00:00
John
e946e23360 Update illustrious_historian.txt 2021-03-30 16:47:00 +00:00
Adam Pantel
e233eed8eb STX cards 2021-03-30 12:44:14 -04:00
Michael Kamensky
80ac8906b3 Merge branch 'stx_29' into 'master'
STX - 29 Mar

See merge request core-developers/forge!4302
2021-03-30 16:24:46 +00:00