Commit Graph

56126 Commits

Author SHA1 Message Date
Anthony Calosa
b0f3bc111b Merge branch 'rocks' into 'master'
Fix Chained to the Rocks crash

See merge request core-developers/forge!6098
2022-01-30 22:39:16 +00:00
Bug Hunter
b3b777b487 Fix Chained to the Rocks crash 2022-01-30 22:39:13 +00:00
Northmoc
91c1e3311a various card cleanup 2022-01-30 14:42:12 -05:00
Sol
d2e6b6a0fe Update gold.atlas 2022-01-30 18:54:41 +00:00
Sol
d137f13b20 Update treasure.atlas 2022-01-30 18:54:15 +00:00
Sol
bafcba9de6 Update enemies.json 2022-01-30 18:48:43 +00:00
Sol
3cc2b6ee1d Fix vampire caps issue 2022-01-30 18:46:10 +00:00
Sol
20d55135da Fix capitalization issues 2022-01-30 18:44:35 +00:00
Michael Kamensky
a7773a34f1 Merge branch 'pictureurl' into 'master'
Remove remaining Picture URL

See merge request core-developers/forge!6100
2022-01-30 17:13:07 +00:00
Michael Kamensky
b0a4d95afa Merge branch 'CLEANUP2' into 'master'
Card cleanup by Dracontes

See merge request core-developers/forge!6099
2022-01-30 17:13:05 +00:00
tool4EvEr
f21f54d589 Remove remaining Picture URL 2022-01-30 17:17:46 +01:00
tool4EvEr
7ed6cba779 Remove redundant DeckHints 2022-01-30 17:14:52 +01:00
tool4EvEr
55d6d7318e Card cleanup by Dracontes 2022-01-30 16:10:54 +01:00
Michael Kamensky
0b3dc00c95 Merge branch 'neo_recon' into 'master'
NEO: Initial Reconfigure keyword support and cards

See merge request core-developers/forge!6089
2022-01-30 04:40:57 +00:00
Tim Mocny
0c333a0c9a NEO: Initial Reconfigure keyword support and cards 2022-01-30 04:40:52 +00:00
Michael Kamensky
0b2aa793fe Merge branch 'neo_29' into 'master'
NEO – 29 Jan

See merge request core-developers/forge!6096
2022-01-29 18:32:06 +00:00
Tim Mocny
39eb53d297 NEO – 29 Jan 2022-01-29 18:32:06 +00:00
Michael Kamensky
a72f897d81 Merge branch 'nickname' into 'master'
More Nickname

See merge request core-developers/forge!6093
2022-01-29 18:31:00 +00:00
Tim Mocny
67626ddfc4 More Nickname 2022-01-29 18:31:00 +00:00
Michael Kamensky
73889dd6a5 Merge branch 'castFrom' into 'master'
Extend wasCastFrom

Closes #1958 and #2072

See merge request core-developers/forge!6086
2022-01-29 18:30:32 +00:00
Bug Hunter
9c4fdb487e Extend wasCastFrom 2022-01-29 18:30:29 +00:00
Michael Kamensky
e79a445b61 Merge branch 'neo_leaks' into 'master'
NEO – 7 Jan

See merge request core-developers/forge!6020
2022-01-29 18:30:00 +00:00
Northmoc
4142045215 eiganjo_uprising.txt add AI hints 2022-01-29 08:03:21 -05:00
Northmoc
b8cb1866ef eiganjo_uprising.txt and samurai token 2022-01-29 08:02:12 -05:00
Northmoc
2c1fb81203 Legendary channel land leaks (Dracontes) 2022-01-29 08:02:12 -05:00
Paul Hammerton
865bd8f19b Merge branch 'neo_nec_updates' into 'master'
NEO edition update and NEC edition file

See merge request core-developers/forge!6094
2022-01-29 10:37:25 +00:00
paul_snoops
8de67bf91b NEO edition update and NEC edition file 2022-01-29 10:36:26 +00:00
Michael Kamensky
a4c68dae56 Merge branch 'aov' into 'master'
anointer_of_valor.txt use ImmediateTrigger

See merge request core-developers/forge!6091
2022-01-29 05:24:23 +00:00
Michael Kamensky
afec1f86c1 Merge branch 'paco-aicannotplaybyarea' into 'master'
[Desktop] Display which DeckZone the unplayable cards are from

See merge request core-developers/forge!6088
2022-01-29 05:24:16 +00:00
Paco Ito
0a396a44d8 [Desktop] Display which DeckZone the unplayable cards are from 2022-01-29 05:24:16 +00:00
Michael Kamensky
b3a6da46f7 Merge branch 'neo_28' into 'master'
NEO - 28 Jan

See merge request core-developers/forge!6092
2022-01-29 05:23:54 +00:00
Northmoc
e5d0bc2b04 ancestral_katana.txt 2022-01-28 23:50:24 -05:00
Northmoc
e5d1b68782 imperial_subduer.txt 2022-01-28 18:20:45 -05:00
Northmoc
a38a116a1c greater_tanuki.txt 2022-01-28 16:54:40 -05:00
Northmoc
f93b863102 dokuchi_shadow_walker.txt (Medusa) 2022-01-28 15:23:05 -05:00
Northmoc
1d87fc8995 akki_ember_keeper.txt 2022-01-28 15:18:14 -05:00
Northmoc
c341d993bf unstoppable_ogre.txt 2022-01-28 15:00:21 -05:00
Northmoc
d343720b58 befriending_the_moths_imperial_moth.txt 2022-01-28 14:55:29 -05:00
Northmoc
6e35cf2b44 mirror_box.txt 2022-01-28 14:53:45 -05:00
Northmoc
bd74bfc50f invoke_despair.txt 2022-01-28 14:38:33 -05:00
Northmoc
d057834964 anointer_of_valor.txt use ImmediateTrigger 2022-01-28 14:14:10 -05:00
Michael Kamensky
c8d9e00904 Merge branch 'neo_lp' into 'master'
NEO [leaked]: Light-Paws, Emperor's Voice

See merge request core-developers/forge!6035
2022-01-28 16:04:04 +00:00
Paul Hammerton
bbd72968c9 Merge branch 'neo_edition' into 'master'
Update NEO edition file

See merge request core-developers/forge!6090
2022-01-28 10:46:24 +00:00
Paul Hammerton
b444cce177 Update Kamigawa Neon Dynasty.txt 2022-01-28 10:43:59 +00:00
Michael Kamensky
3e9639d0fd Merge branch 'neo_kw_ok' into 'master'
NEO: The Kami War // O-Kagachi Made Manifest and support

See merge request core-developers/forge!5997
2022-01-28 04:32:02 +00:00
Tim Mocny
b6a4ed2a4c Merge branch 'revert-9d32ec86' into 'master'
Revert "Merge branch 'paco-aicannotplaybyarea' into 'master'"

See merge request core-developers/forge!6087
2022-01-27 21:50:13 +00:00
Tim Mocny
fbb7308747 Revert "Merge branch 'paco-aicannotplaybyarea' into 'master'"
This reverts merge request !6085
2022-01-27 21:48:54 +00:00
Northmoc
fd6c308325 fix typo 2022-01-27 13:57:39 -05:00
Northmoc
0472b9f91b tweak Saga reminder builder for double-faced 2022-01-27 13:56:58 -05:00
Northmoc
b25edbc6f1 the_kami_war_o_kagachi_made_manifest.txt 2022-01-27 13:56:58 -05:00