external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,946 Commits 31 Branches 187 Tags
5ae5fef43ee24f57f28548af9411bcc81c024b7f
Commit Graph

39946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris H
5ae5fef43e Fix more splits 2019-01-21 21:54:51 -05:00
Chris H
48a0ac6039 missing split for Depose//Deploy 2019-01-21 21:53:26 -05:00
Chris H
57a3462623 Cleanup weird Light up the Stage 2019-01-21 21:18:22 -05:00
Chris H
929b5fbcfe Fix some more broken cards 2019-01-21 21:08:36 -05:00
Chris H
56fda56807 Fixes 2019-01-21 21:08:35 -05:00
Chris H
872defd992 Fix Bedazzle 2019-01-21 21:08:30 -05:00
Chris H
e78202e432 Incubation // Incongruity 2019-01-21 21:08:28 -05:00
Chris H
657d85530a Repudiate//replicate 2019-01-21 21:08:27 -05:00
Chris H
a6e0f9b472 Warrant/Warden 2019-01-21 21:08:25 -05:00
Chris H
86abb0d1d5 Fixing more broken RNA cards 2019-01-21 21:08:24 -05:00
Chris H
28a5bd109e Move broken to upcoming 2019-01-21 21:08:22 -05:00
Chris H
b357096da2 Depost deploy 2019-01-21 21:08:21 -05:00
Chris H
d1d1df27bc Consecrate Consume 2019-01-21 21:08:20 -05:00
Chris H
d7ebafe883 Collision Colossus 2019-01-21 21:08:19 -05:00
Chris H
f09130eb86 Carnival Carnage 2019-01-21 21:08:18 -05:00
Chris H
50e6a06478 Fix split cards 2019-01-21 21:08:17 -05:00
Chris H
65fc4a4371 RNA Templates 2019-01-21 21:08:16 -05:00
Michael Kamensky
b8147a2e58 Merge branch 'master' into 'master' 
use multi-select for dig

Closes #799

See merge request core-developers/forge!1296
 2019-01-21 14:47:08 +00:00
Michael Kamensky
2b8a756932 Merge branch 'schnautzr-master-patch-51486' into 'master' 
Collector Number Sort update for RNA

See merge request core-developers/forge!1297
 2019-01-21 05:06:20 +00:00
Rob Schnautz
f78bfce802 RNA looks at artifact casting cost only 2019-01-21 03:31:16 +00:00
Peter F. Patel-Schneider
ebcb4e28de Add desktop GUI and Dig changes to CHANGES.txt 2019-01-20 21:23:16 -05:00
Peter F. Patel-Schneider
f0c45cf814 Add visual chooser for two lists and use it for and/or dig 2019-01-20 21:23:16 -05:00
Peter F. Patel-Schneider
aff8d5ce01 Use chooseEntitiesForEffect for dig (except and/or dig) 2019-01-20 21:23:16 -05:00
Peter F. Patel-Schneider
94064a2a13 Fix bug in chooseEntitiesforEffect in Mobile GUI 2019-01-20 21:16:34 -05:00
Sol
6359021370 Merge branch 'master' into 'master' 
Fix for Invalid Deck or Proxy File Names

Closes #560

See merge request core-developers/forge!1279
 2019-01-21 00:55:35 +00:00
Evan Murawski
6090bc8117 Fix for Invalid Deck or Proxy File Names 2019-01-21 00:55:35 +00:00
Peter F. Patel-Schneider
264744645e Merge branch 'highlighting' 2019-01-20 16:41:50 -05:00
Michael Kamensky
ab1e1d2386 Merge branch 'master' into 'master' 
put a cyan border on valid cards when selecting targets and costs (desktop UI only)

See merge request core-developers/forge!1281
 2019-01-20 19:27:11 +00:00
Hans Mackowiak
87ad257c46 Merge branch 'damageMapClear' into 'master' 
DamageMap: add clear after being triggered

See merge request core-developers/forge!1290
 2019-01-20 09:12:04 +00:00
Sol
bc5e7f07ae Merge branch 'gift-pack-edition' into 'master' 
M19 Gift Pack edition file

See merge request core-developers/forge!1293
 2019-01-20 02:59:39 +00:00
Chris H
f18651be7a M19 Gift Pack edition file 2019-01-19 21:02:24 -05:00
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