T.J. Tillman
ebddcb3210
Update spear_spewer.txt
2019-02-07 06:40:11 +00:00
T.J. Tillman
526104104c
Merge branch 'forPushing' into 'master'
...
For pushing
See merge request tjtillmancoag/forge!5
2019-02-07 06:35:27 +00:00
T.J. Tillman
ebd5e7b419
Merge branch 'SpearSpewerFix' into 'master'
...
Spear spewer fix et all
See merge request tjtillmancoag/forge!4
2019-02-07 06:14:18 +00:00
Michael Kamensky
d491972995
Merge branch 'master' into 'master'
...
Translating hard-coded text to res en-US.properties
See merge request core-developers/forge!1283
2019-02-07 05:54:47 +00:00
Michael Kamensky
60c68b10d9
Merge branch 'master' into 'master'
...
Guardian Project fix by friarsol: patch and integrate
See merge request core-developers/forge!1371
2019-02-07 05:05:44 +00:00
Agetian
471fcaa938
- Revert an accidental change in CardProperty.
2019-02-07 08:05:06 +03:00
Agetian
7111c3f3aa
Merge branch 'fix-guardian-project' of https://git.cardforge.org/friarsol/forge into agetian-master
2019-02-07 08:04:27 +03:00
Michael Kamensky
384b5c2c5b
Merge branch 'SpearSpewerFix' into 'master'
...
Several RNA fixes
See merge request core-developers/forge!1369
2019-02-07 04:20:13 +00:00
Sol
84a2fed516
Update guardian_project.txt
2019-02-07 03:42:23 +00:00
Chris H
a1c137a86b
Fix Guardian Project
2019-02-06 22:04:31 -05:00
T.J. Tillman
87359257fd
Update end_raze_forerunners.txt
2019-02-07 02:06:54 +00:00
T.J. Tillman
4e8c18b232
Update angel_of_grace.txt
2019-02-07 01:42:51 +00:00
T.J. Tillman
95f46dfde3
Update smothering_tithe.txt
2019-02-07 01:01:59 +00:00
T.J. Tillman
20c978a64f
Revert "Update spear_spewer.txt"
...
This reverts commit c7d8a112d0
2019-02-06 21:39:56 +00:00
T.J. Tillman
bb57cb1e1b
Update kaya_orzhov_usurper.txt
2019-02-06 20:28:43 +00:00
T.J. Tillman
29b0c6eb69
Update kaya_orzhov_usurper.txt
2019-02-06 20:17:25 +00:00
T.J. Tillman
76b929b814
Revert "Update arresters_zeal.txt"
...
This reverts commit fbde2483e4
2019-02-06 18:47:19 +00:00
T.J. Tillman
fbde2483e4
Update arresters_zeal.txt
2019-02-06 18:41:40 +00:00
T.J. Tillman
55ccd88790
Update descriptions on swirling_torrent.txt
2019-02-06 18:38:32 +00:00
T.J. Tillman
5b9e121674
Update Contamination.dck
2019-02-06 18:29:37 +00:00
T.J. Tillman
d86e04222d
Revert "Update Contamination.dck"
...
This reverts commit 5b10cb0e26
2019-02-06 18:29:08 +00:00
T.J. Tillman
5b10cb0e26
Update Contamination.dck
2019-02-06 18:28:41 +00:00
T.J. Tillman
5d99a0e918
Update pestilent_spirit.txt
2019-02-06 18:21:31 +00:00
T.J. Tillman
8385e80fd3
Revert guardian_project.txt for this branch
2019-02-06 18:00:09 +00:00
T.J. Tillman
c7d8a112d0
Update spear_spewer.txt
2019-02-06 17:56:56 +00:00
Sol
6a715bdab7
Merge branch 'patch-1' into 'master'
...
Update imperiosaur: fix P/T
See merge request core-developers/forge!1367
2019-02-06 14:22:08 +00:00
Hans Mackowiak
2284964c88
Update imperiosaur: fix P7T
2019-02-06 12:20:37 +00:00
Michael Kamensky
bd83fc675c
Merge branch 'lumberingFix' into 'master'
...
Lumbering Battlement fix using Hidden
See merge request core-developers/forge!1366
2019-02-06 07:07:06 +00:00
Hanmac
7ea81fce8b
cards: add missing empty Oracle
2019-02-06 07:28:13 +01:00
Hanmac
519b05fcc1
Lumbering Battlement: use Hidden for ChangeType
2019-02-06 07:25:02 +01:00
Michael Kamensky
8ab3a00a3a
Merge branch 'addendumFix' into 'master'
...
Addendum fix
See merge request core-developers/forge!1362
2019-02-06 05:08:17 +00:00
Hans Mackowiak
544327330d
Addendum fix
2019-02-06 05:08:17 +00:00
T.J. Tillman
c3e895936e
WIP - Guardian Project
...
- Works for Nth copy on the Battlefield
- Does NOT work for any copies in the graveyard
- Does not work for flickering the 1st copy on the battlefield (incorrectly draws), need a way to count all the cards on the BF except the triggered card
2019-02-05 22:11:47 +00:00
tehdiplomat
d223089c05
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
2019-02-05 16:20:07 -05:00
Michael Kamensky
f5725766c0
Merge branch 'master' into 'master'
...
Added puzzle PS_RNA2.
See merge request core-developers/forge!1364
2019-02-05 19:59:28 +00:00
Agetian
585f0299b2
- Revert an accidental debug change commit.
2019-02-05 22:58:39 +03:00
Agetian
3a8c07d9c1
- Added puzzle PS_RNA2.
2019-02-05 22:57:00 +03:00
Agetian
30109aaeba
- Added puzzle PS_RNA2.
2019-02-05 22:49:56 +03:00
Michael Kamensky
c02f4cf081
Merge branch 'master' into 'master'
...
Update dovin_grand_arbiter.txt
See merge request core-developers/forge!1363
2019-02-05 19:26:20 +00:00
T.J. Tillman
2c0ec81812
Update dovin_grand_arbiter.txt
2019-02-05 17:47:34 +00:00
Michael Kamensky
2d8286adf1
Merge branch 'cst' into 'master'
...
Add "Coldsnap Theme Decks" edition.
See merge request core-developers/forge!1314
2019-02-05 04:33:41 +00:00
Michael Kamensky
95cb17849e
Merge branch 'master' into 'master'
...
"ANA" / Arena New Experience cards added, other card script updates
See merge request core-developers/forge!1299
2019-02-05 04:33:30 +00:00
Michael Kamensky
e42608f856
Merge branch 'master' into 'master'
...
Update unbreakable_formation.txt (Addendum)
See merge request core-developers/forge!1361
2019-02-05 04:31:52 +00:00
Michael Kamensky
cdb47e0e10
Merge branch 'optimize' into 'master'
...
optimize redisplay of floating card areas
See merge request core-developers/forge!1337
2019-02-04 20:34:45 +00:00
Michael Kamensky
b008a75043
Merge branch 'bugfix' into 'master'
...
fix crash when hiding temporarily shown zones
See merge request core-developers/forge!1360
2019-02-04 20:32:39 +00:00
T.J. Tillman
81d3ab86f9
Update unbreakable_formation.txt
2019-02-04 20:23:03 +00:00
Peter F. Patel-Schneider
efe71e8384
fix crash when hiding temporarily shown zones
2019-02-04 14:24:34 -05:00
Sol
cb494280a9
Merge branch 'master' into 'master'
...
Update kayas_wrath.txt
See merge request core-developers/forge!1359
2019-02-04 13:35:15 +00:00
T.J. Tillman
ba587ea702
Update kayas_wrath.txt
2019-02-04 06:14:39 +00:00
Michael Kamensky
4b00795f3d
Merge branch 'transfigureKeyword' into 'master'
...
CardFactoryUtil: Transfigure as Keyword
See merge request core-developers/forge!1358
2019-02-04 03:36:11 +00:00
