Sol
|
3ade967f85
|
Merge branch 'patch-1' into 'master'
Update skitter_eel.txt
See merge request core-developers/forge!1292
|
2019-01-20 01:44:01 +00:00 |
|
Sol
|
243c90ced9
|
Update skitter_eel.txt
|
2019-01-20 01:43:46 +00:00 |
|
Hanmac
|
c1c421fff0
|
DamageMap: add clear after being triggered
|
2019-01-19 18:11:55 +01:00 |
|
Michael Kamensky
|
bf6f8048d6
|
Merge branch 'spellCostReduceTarget' into 'master'
CostAdjustment: use Relative for Amount that depends on the SpellAbility
See merge request core-developers/forge!1289
|
2019-01-19 12:52:12 +00:00 |
|
Hanmac
|
f26935f37f
|
CostAdjustment: use Relative for Amount that depends on the SpellAbility, only works for Self
|
2019-01-19 13:27:19 +01:00 |
|
Michael Kamensky
|
f3f7700ba9
|
Merge branch 'patch-1' into 'master'
Update sharktocrab.txt
See merge request core-developers/forge!1288
|
2019-01-19 10:41:41 +00:00 |
|
Hans Mackowiak
|
2817c4ef61
|
Update sharktocrab.txt
|
2019-01-19 10:28:33 +00:00 |
|
Michael Kamensky
|
166700b573
|
Merge branch 'master' into 'master'
Added puzzle PS_RNA0 (Ravnica Allegiance Card Preview Puzzle).
See merge request core-developers/forge!1287
|
2019-01-19 10:14:20 +00:00 |
|
Agetian
|
6edb5ad591
|
- Added puzzle PS_RNA0 (Ravnica Allegiance Card Preview Puzzle).
|
2019-01-19 13:13:41 +03:00 |
|
Hans Mackowiak
|
66f2ab4e91
|
Merge branch 'patch-1' into 'master'
Update sharktocrab
See merge request core-developers/forge!1286
|
2019-01-19 10:11:43 +00:00 |
|
Hans Mackowiak
|
1f211e6ed5
|
Update sharktocrab
|
2019-01-19 10:11:15 +00:00 |
|
Michael Kamensky
|
41093c2f7f
|
Merge branch 'ai-hints-rna' into 'master'
First pass of AI hints for RNA.
See merge request core-developers/forge!1284
|
2019-01-19 10:02:13 +00:00 |
|
Agetian
|
f4df89dca8
|
Merge remote-tracking branch 'origin/ai-hints-rna' into ai-hints-rna
# Conflicts:
# forge-gui/res/cardsfolder/upcoming/ethereal_absolution.txt
# forge-gui/res/cardsfolder/upcoming/watchful_giant.txt
|
2019-01-19 10:27:27 +03:00 |
|
Agetian
|
ffabf14192
|
- AI hints for RNA.
|
2019-01-19 10:25:43 +03:00 |
|
Michael Kamensky
|
5ce9db0b08
|
Merge branch 'upcomingFix20190119' into 'master'
Fix for upcoming cards
Closes #798
See merge request core-developers/forge!1285
|
2019-01-19 07:23:14 +00:00 |
|
Hanmac
|
5165c16233
|
Fix for upcoming cards
|
2019-01-19 07:57:08 +01:00 |
|
Agetian
|
1e34fd27fe
|
- AI hints for RNA.
|
2019-01-19 09:34:58 +03:00 |
|
Sol
|
12b464dbcb
|
Merge branch 'Austin/forge-ravnicaallegiance' into 'master'
Austin/forge ravnicaallegiance
See merge request core-developers/forge!1275
|
2019-01-19 02:53:56 +00:00 |
|
Chris H
|
76e3f0305b
|
Do Type changes affect Svar keys? That sounds bad
|
2019-01-18 21:29:24 -05:00 |
|
Chris H
|
bb57003518
|
Biogenic Ooze -> TokenScripts
|
2019-01-18 21:26:47 -05:00 |
|
Chris H
|
dfbfcf0a11
|
Hero of Precinct One -> TokenScripts
|
2019-01-18 21:24:29 -05:00 |
|
Chris H
|
c4c061d669
|
Fix Rampage of the Clans
|
2019-01-18 21:23:05 -05:00 |
|
Chris H
|
e76db8e7ff
|
Fix Gruul Spellbreaker affected
|
2019-01-18 21:15:23 -05:00 |
|
Chris H
|
9c4fd8b570
|
Fix Spectacle
|
2019-01-18 21:02:36 -05:00 |
|
Chris H
|
5d2e7a16d3
|
Fix Afterlife crashes
|
2019-01-18 21:02:36 -05:00 |
|
Chris H
|
cf3a28b120
|
Remove bogus card
|
2019-01-18 21:02:35 -05:00 |
|
austinio7116
|
10f8616e37
|
First pass of remaining spoilers, commiting and fixing up those that forgescribe got close
|
2019-01-18 21:02:32 -05:00 |
|
maustin
|
1bade895e1
|
Complete Ravnica Allegiance editions file
|
2019-01-18 21:00:53 -05:00 |
|
austinio7116
|
1940bca932
|
More straightforward RNA cards
|
2019-01-18 21:00:46 -05:00 |
|
austinio7116
|
620c27a117
|
Attempts to fix comments in MR - correct RemAI, fix combine guildname move counters and add X Svar to electrodominance
|
2019-01-18 21:00:43 -05:00 |
|
austinio7116
|
3071f1f74b
|
First batch of easy forgescribe cleanups with editions file
|
2019-01-18 21:00:42 -05:00 |
|
Michael Kamensky
|
0f44b644c1
|
Merge branch 'bugfix' into 'master'
fix crash when selecting players
See merge request core-developers/forge!1282
|
2019-01-18 05:08:51 +00:00 |
|
Peter F. Patel-Schneider
|
427b2973b8
|
Merge branch 'bugfix'
|
2019-01-17 16:09:50 -05:00 |
|
Peter F. Patel-Schneider
|
25d1d2bb20
|
Merge branch 'bugfix' into highlighting
Bring bug fix into highlight code
|
2019-01-17 16:07:49 -05:00 |
|
Peter F. Patel-Schneider
|
8f2123f183
|
add fix to crash when selecting targets
|
2019-01-17 16:02:22 -05:00 |
|
Peter F. Patel-Schneider
|
595fbae34f
|
Fix crash when selecting a player
|
2019-01-17 15:37:59 -05:00 |
|
Peter F. Patel-Schneider
|
3fd842c1e4
|
Merge branch 'master' of https://git.cardforge.org/core-developers/forge
Bactrack to upstream master to fix bug
|
2019-01-17 15:30:09 -05:00 |
|
Peter F. Patel-Schneider
|
11f9520c1e
|
Highlight sa targets in Desktop GUI
|
2019-01-17 09:35:52 -05:00 |
|
Michael Kamensky
|
40c64a943a
|
Merge branch 'patch-1' into 'master'
FIX Protean Raider
See merge request core-developers/forge!1280
|
2019-01-17 06:01:13 +00:00 |
|
Hans Mackowiak
|
4f953bf2e1
|
FIX Protean Raider
|
2019-01-17 05:42:10 +00:00 |
|
Peter F. Patel-Schneider
|
c7d9646f7f
|
adjust highlighting for new manipulation interface
|
2019-01-16 13:10:56 -05:00 |
|
Peter F. Patel-Schneider
|
d4b4dc5ba0
|
Remove debugging print
|
2019-01-16 12:09:13 -05:00 |
|
Peter F. Patel-Schneider
|
2cd86bfe1e
|
put yellow border on selectable cards
|
2019-01-16 12:09:13 -05:00 |
|
Peter F. Patel-Schneider
|
2f9fb96d29
|
use Iterators instead of Lists where possible in manipulateCardList
|
2019-01-16 12:06:21 -05:00 |
|
Michael Kamensky
|
39204513fb
|
Merge branch 'master' into 'master'
Added puzzle PS_CFB (Possibility Storm: How Much Fireball Can You Channel).
See merge request core-developers/forge!1278
|
2019-01-16 07:17:02 +00:00 |
|
Agetian
|
ebaa96004f
|
- Added puzzle PS_CFB (How Much Fireball Can You Channel).
|
2019-01-16 10:16:20 +03:00 |
|
Michael Kamensky
|
d381251472
|
Merge branch 'master' into 'master'
code cleanup for moveable card displays; add movement by clicking to display-based scry
See merge request core-developers/forge!1276
|
2019-01-16 07:07:16 +00:00 |
|
Michael Kamensky
|
f00e759a93
|
Merge branch 'removeCountersAnyNumber' into 'master'
CountersRemoveEffect: add ValidSource and CounterNum$ Any
See merge request core-developers/forge!1277
|
2019-01-16 07:05:06 +00:00 |
|
Hanmac
|
aab63e2029
|
CountersRemoveEffect: add ValidSource and CounterNum$ Any
|
2019-01-16 07:30:24 +01:00 |
|
Peter F. Patel-Schneider
|
3749f2a5de
|
fix bug in computing manipulable card views
|
2019-01-15 22:10:05 -05:00 |
|