Michael Kamensky
|
c6b4a2b27f
|
Merge branch 'etbcounters' into 'master'
ETB counters fix
See merge request core-developers/forge!6109
|
2022-01-31 12:26:33 +00:00 |
|
Bug Hunter
|
f4f0a82b40
|
ETB counters fix
|
2022-01-31 12:26:32 +00:00 |
|
Michael Kamensky
|
cd5a24fa52
|
Merge branch 'presence' into 'master'
Presence fixes
See merge request core-developers/forge!6103
|
2022-01-31 12:25:48 +00:00 |
|
Bug Hunter
|
74d2c68b12
|
Presence fixes
|
2022-01-31 12:25:47 +00:00 |
|
Paul Hammerton
|
1993aa7644
|
Merge branch 'jin_name_fix' into 'master'
Jin-Gitaxias name fix
See merge request core-developers/forge!6108
|
2022-01-31 09:07:55 +00:00 |
|
paul_snoops
|
81f86d4d01
|
Jin-Gitaxias name fix
|
2022-01-31 09:06:47 +00:00 |
|
Paul Hammerton
|
da6b5a972d
|
Merge branch 'neo_update' into 'master'
NEO edition update
See merge request core-developers/forge!6107
|
2022-01-31 09:01:49 +00:00 |
|
paul_snoops
|
e45d7a9d23
|
NEO edition update
|
2022-01-31 09:00:31 +00:00 |
|
Michael Kamensky
|
59b687bb59
|
Merge branch 'typo' into 'master'
Typo cleanup
See merge request core-developers/forge!6104
|
2022-01-31 05:40:30 +00:00 |
|
Tim Mocny
|
39cdad2353
|
Typo cleanup
|
2022-01-31 05:40:29 +00:00 |
|
Michael Kamensky
|
2fdbaada41
|
Merge branch 'neo_30' into 'master'
NEO – 30 Jan
See merge request core-developers/forge!6105
|
2022-01-31 05:40:14 +00:00 |
|
Tim Mocny
|
a6f0ca8476
|
NEO – 30 Jan
|
2022-01-31 05:40:06 +00:00 |
|
Anthony Calosa
|
51fee69a3b
|
Merge branch 'master' into 'master'
[Mobile] Add AI Status to Deck ImageView
See merge request core-developers/forge!6106
|
2022-01-31 04:59:30 +00:00 |
|
Anthony Calosa
|
c267bc5ddd
|
[Mobile] Add AI Status to Deck ImageView
|
2022-01-31 12:58:35 +08:00 |
|
Anthony Calosa
|
d91af76ca9
|
Merge branch 'adventure-case-issues' into 'master'
Fix capitalization issues
See merge request core-developers/forge!6101
|
2022-01-30 22:41:54 +00:00 |
|
Anthony Calosa
|
08cd2611e5
|
Merge branch 'cleanup' into 'master'
various card cleanup
See merge request core-developers/forge!6102
|
2022-01-30 22:39:40 +00:00 |
|
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 |
|