external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,404 Commits 31 Branches 187 Tags
f1f96557c2a08d30a84a68f9bd731c94b0fc715c
Commit Graph

38404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
f1f96557c2 Merge branch 'patch-1' into 'master' 
Update loyal_subordinate.txt Trigger Zone Fix

See merge request core-developers/forge!858
 2018-08-15 06:24:41 +00:00
Michael Kamensky
cdf9e3693d Merge branch 'patch-2' into 'master' 
Update loyal_guardian.txt Trigger Zone Fix

See merge request core-developers/forge!859
 2018-08-15 06:24:38 +00:00
Michael Kamensky
4cdc7b62ed Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M195.

See merge request core-developers/forge!861
 2018-08-15 06:05:02 +00:00
Agetian
5817a795f3 - Added puzzle PS_M195. 2018-08-15 08:38:15 +03:00
Michael Kamensky
0c5cab8d12 Merge branch 'c18_cards' into 'master' 
More C18 cards

See merge request core-developers/forge!857
 2018-08-15 05:01:40 +00:00
Computica
8c1f4c5720 Update loyal_guardian.txt Trigger Zone Fix 2018-08-15 04:20:14 +00:00
Computica
4ddfe40ff1 Update loyal_subordinate.txt Trigger Zone Fix 2018-08-15 04:19:00 +00:00
tehdiplomat
7be9ef06e0 Add Forge of Heroes 2018-08-14 17:37:53 -04:00
tehdiplomat
3dfa54e4da Add Saheeli, the Gifted 2018-08-14 17:10:04 -04:00
Sol
58c1bd35a9 Merge branch 'c18_cards' into 'master' 
Boreas Charger, Endless Atlas, Ever-Watching Threshold

See merge request core-developers/forge!856
 2018-08-14 20:22:02 +00:00
tehdiplomat
9c517070e4 Added Varchild 2018-08-14 16:18:50 -04:00
tehdiplomat
75caf0643a Added Tawnos 2018-08-14 16:02:25 -04:00
tehdiplomat
41ce31497b Add Tawnos Urza's Apprentice 2018-08-14 13:36:33 -04:00
tehdiplomat
fa1128b94c Magus of the Balance and Reality Scramble 2018-08-14 12:22:42 -04:00
tehdiplomat
e147900618 Move cards from upcoming to their appropriate letter 2018-08-14 09:04:40 -04:00
tehdiplomat
28c2aceba3 Boreas Charger, Endless Atlas, Ever-Watching Threshold 2018-08-14 08:35:38 -04:00
Sol
c45cf8df10 Merge branch 'network-play' into 'master' 
Network play

See merge request core-developers/forge!854
 2018-08-13 15:09:27 +00:00
Michael Kamensky
a0803cfce6 Merge branch 'rounded-corners' into 'master' 
round image corners when No Border is selected

See merge request core-developers/forge!855
 2018-08-13 06:16:36 +00:00
Jamin W. Collins
385fa74c6e round image corners when No Border is selected 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-12 23:53:59 -06:00
Jamin W. Collins
2aa8d4bb1a use CardFaceView for selecting CardFaces 
needed for Runed Halo and similar

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-11 13:27:26 -06:00
Jamin W. Collins
269d6ead0c use CardView for Splice onto Arcane choice 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-11 13:24:40 -06:00
Jamin W. Collins
b980bbf66e adding check to ensure all args are Serializable 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-11 13:24:40 -06:00
Jamin W. Collins
e236202ddb ensure that charms use SpellAbilityView for choices 
- needed for Funeral Charm

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-08-11 13:24:40 -06:00
Michael Kamensky
2174672511 Merge branch 'patch-1' into 'master' 
Update yuriko_the_tigers_shadow.txt Ninjas You Control Fix

See merge request core-developers/forge!853
 2018-08-11 12:04:19 +00:00
David Ellis
75ebadac10 Update yuriko_the_tigers_shadow.txt Ninjas You Control Fix 2018-08-11 10:49:43 +00:00
Michael Kamensky
2e994a4e89 Merge branch 'aftermathPlayEffect' into 'master' 
Aftermath fix with PlayEffect

See merge request core-developers/forge!852
 2018-08-11 10:07:30 +00:00
Hanmac
95568d2975 AbilityUtils: playEffect need to check the other restrictions 
Aftermath: add extra check in SpellAbilityRestriction
 2018-08-11 10:32:55 +02:00
Hans Mackowiak
e37a470127 Merge branch 'patch-jiang' into 'master' 
Update jiang_yanggu.txt

See merge request core-developers/forge!851
 2018-08-10 15:02:20 +00:00
Hans Mackowiak
8e80c8c5f5 Update jiang_yanggu.txt 2018-08-10 15:01:27 +00:00
Michael Kamensky
4e17dcc332 Merge branch 'cloneFix' into 'master' 
GameAction: fix for Cloner leaving battlefield

See merge request core-developers/forge!850
 2018-08-09 04:15:57 +00:00
Hanmac
7bf6aa7f6e add Estrid's Invocation using CorrectedSelf 2018-08-08 22:53:13 +02:00
Hanmac
36bf0344b0 GameAction: fix for Cloner leaving battlefield 2018-08-08 13:35:53 +02:00
Michael Kamensky
739d3abfe6 Merge branch 'mirari_conjecture_description_fix' into 'master' 
Use the correct text for The Mirari Conjecture's third ability.

See merge request core-developers/forge!849
 2018-08-08 03:00:01 +00:00
Michael Kamensky
2be7a22217 Merge branch 'iss644_thantis_fix' into 'master' 
Thantis should cause all creatures to attack if able, not block if able.

See merge request core-developers/forge!848
 2018-08-08 02:59:34 +00:00
kms70847
571029508f Use the correct text for The Mirari Conjecture's third ability. 2018-08-07 18:03:43 -04:00
kms70847
d1945e2c33 Thantis should cause all creatures to attack if able, not block if able. 
Resolves the first third of https://git.cardforge.org/core-developers/forge/issues/644
 2018-08-07 17:01:34 -04:00
Hans Mackowiak
eff8720500 Merge branch 'replicate_cost_display_fix' into 'master' 
Resolves https://git.cardforge.org/core-developers/forge/issues/641.

Closes #641

See merge request core-developers/forge!842
 2018-08-07 17:39:29 +00:00
Hans Mackowiak
780bae107b Merge branch 'master' into 'master' 
Fixed Animate Dead and related cards.

Closes #643 and #620

See merge request core-developers/forge!847
 2018-08-07 16:40:17 +00:00
Agetian
331d173a93 - Fixed Animate Dead. 
- Fixed Dance of the Dead description.
- Added a couple related NPE prevention checks.
 2018-08-07 19:21:39 +03:00
Michael Kamensky
1038dbbe0d Merge branch 'aminatousaugury' into 'master' 
Fixed issues with Aminatou's Augury

See merge request core-developers/forge!845
 2018-08-07 08:55:27 +00:00
austinio7116
7ac6bccf9f Fixed issues with Aminatou's Augury 2018-08-07 06:44:34 +01:00
Michael Kamensky
cb5222c997 Merge branch 'master' into 'master' 
Fixed an issue with some cards still being shown incorrectly in the "choose a card name" dialog box.

See merge request core-developers/forge!844
 2018-08-07 04:49:35 +00:00
Agetian
b91261bc06 - Fixed an issue with some cards still being shown an incorrect (transformed) image in a "choose a card name" dialog box in Desktop GUI (e.g. Treasure Map shown as Treasure Cove). 2018-08-07 07:47:52 +03:00
Michael Kamensky
49db080e06 Merge branch 'aminatousaugury' into 'master' 
Aminatous Augury

See merge request core-developers/forge!841
 2018-08-07 04:10:48 +00:00
Michael Kamensky
131c7d5a75 Merge branch 'puzzle-engine' into 'master' 
Added puzzles PS_M193 and PS_M194.

See merge request core-developers/forge!843
 2018-08-07 04:01:57 +00:00
Agetian
09bfe089de - Added puzzles PS_M193 and PS_M194. 2018-08-07 07:00:45 +03:00
kms70847
347707f74e Resolves https://git.cardforge.org/core-developers/forge/issues/641. 
Updates the card file syntax for Replicate so it uses a colon, just like Kicker, Entwine, etc.
 2018-08-06 21:43:18 -04:00
austinio7116
03d66b9ea1 Aminatous Augury 2018-08-06 19:35:18 +01:00
Michael Kamensky
a9ade92946 Merge branch 'master' into 'master' 
M19 and C18 Planeswalker/Alt Wincon achievements by Marek.

See merge request core-developers/forge!840
 2018-08-06 16:45:46 +00:00
Agetian
3c4b81f2ac - M19 alt wincon achievement (initial commit). 2018-08-06 19:40:27 +03:00