external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,934 Commits 32 Branches 187 Tags
677ee26e91b1ce3d9dfaee0edb88c64db04dad3c
Commit Graph

38934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Agetian
5c0e70aa36 - C18 planeswalker achievements (initial commit). 2018-08-06 15:45:17 +03:00
Agetian
d5248e2d26 - M19 planeswalker achievements: initial commit. 2018-08-06 15:43:29 +03:00
Michael Kamensky
def2c3ed48 Merge branch 'tokenAttach' into 'master' 
TokenEffect: Add AttachTo effect for Estrid

See merge request core-developers/forge!839
 2018-08-06 12:20:07 +00:00
Hanmac
a98fdff570 Estrid the Masked: fixed Untap Effect 2018-08-06 13:25:09 +02:00
Hanmac
197880dda4 TokenEffect: refactor attachTo 2018-08-06 07:20:30 +02:00
Hanmac
08d984a699 TokenEffect: Add AttachTo effect for Estrid 2018-08-05 22:08:15 +02:00
Michael Kamensky
a56476645f Merge branch 'master' into 'master' 
Update prismatic_lace.txt

See merge request core-developers/forge!838
 2018-08-05 13:15:40 +00:00
Anthony Calosa
bb34d29a44 Update prismatic_lace.txt 2018-08-05 12:33:23 +00:00
Michael Kamensky
1dc2abb7a6 Merge branch 'updatedCommanderDeckgenData' into 'master' 
Updated Commander card-based deck generation data to include recent sets and…

See merge request core-developers/forge!837
 2018-08-05 06:39:44 +00:00
austinio7116
e59cd59ea2 Updated Commander card-based deck generation data to include recent sets and data from other sources. 2018-08-05 05:55:54 +01:00
Michael Kamensky
1d02087128 Merge branch 'morec18newcards' into 'master' 
Nesting Dragon update to trigger names to avoid text changing effects with "dragon"

See merge request core-developers/forge!835
 2018-08-05 03:27:15 +00:00
austinio7116
c106d856c0 Nesting Dragon update to trigger names to avoid text changing effects with "dragon" 2018-08-04 22:17:57 +01:00
Michael Kamensky
8d2668257c Merge branch 'morec18newcards' into 'master' 
Tuvasa, the Sunlit and Nesting Dragon

See merge request core-developers/forge!830
 2018-08-04 12:05:27 +00:00
Michael Kamensky
b0ce5a2a28 Merge branch 'fix_unzipped_path' into 'master' 
Fix incorrect file path when extracting downloaded .zip

See merge request core-developers/forge!833
 2018-08-04 11:57:03 +00:00
NikolayHD
7c32151d1f Fix incorrect file path when extracting downloaded .zip 2018-08-04 14:50:41 +03:00
Michael Kamensky
6a7584b3f2 Merge branch 'master' into 'master' 
Fix compile after the previous revert.

See merge request core-developers/forge!832
 2018-08-04 10:09:06 +00:00
Michael Kamensky
bef375650f - Fix compile after the previous revert. 2018-08-04 13:08:32 +03:00
Michael Kamensky
30fadb5912 Merge branch 'master' into 'master' 
Reverted Paths.get in Zip downloader (breaks Android). Forge for Android 1.6.13.002.

See merge request core-developers/forge!831
 2018-08-04 10:03:25 +00:00
Michael Kamensky
91ebc8549c - Preparing Forge for Android publish 1.6.13.002 [hotfix]. 2018-08-04 13:02:10 +03:00
Michael Kamensky
0a2dd16d83 - As much as I like Paths.get, it breaks Android. Reverting. 2018-08-04 13:01:37 +03:00