external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,916 Commits 33 Branches 187 Tags
1d1483185b621debc16510366c9785d350e4c6a8
Commit Graph

47916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bug Hunter
64c1f2dec9 Fix ExcludedDestinations logic 2021-02-16 16:29:55 +00:00
John
880729712f Update Secret Lair Drop Series.txt 2021-02-16 15:51:39 +00:00
Adam Pantel
87b821d628 Ach Hans Run 2021-02-16 09:37:03 -05:00
Adam Pantel
30980fdac2 Some un-set/cmb1 card scripts 2021-02-16 09:37:03 -05:00
Michael Kamensky
7a85918b04 Merge branch 'fixmissingmusicfolder' into 'master' 
Fix NullPointerException when music folder is not present

See merge request core-developers/forge!3867
 2021-02-16 11:26:03 +00:00
Michael Kamensky
f45e5f1fdf Merge branch 'translateFDeckChooser' into 'master' 
Translate missings strings in FDeckChooser

See merge request core-developers/forge!3866
 2021-02-16 11:25:55 +00:00
klaxnek
31a73d0887 Fix NullPointerException when music folder is not present 2021-02-16 11:33:44 +01:00
klaxnek
c2d8440583 Translate missings strings in FDeckChooser 2021-02-16 11:29:57 +01:00
Hans Mackowiak
54f1767d01 Merge branch 'fixCantBeCast' into 'master' 
Fix CantBeCast Origin check

See merge request core-developers/forge!3864
 2021-02-16 08:47:11 +00:00
Michael Kamensky
9fe18d95bb Merge branch 'master' into 'master' 
Resolve several issues in the Game State support for Mutate/merged cards.

See merge request core-developers/forge!3863
 2021-02-16 06:47:49 +00:00
Michael Kamensky
7ef07fa681 - Resolve several issues in the Game State support for Mutate/merged cards. 2021-02-16 09:46:17 +03:00
Michael Kamensky
de11dcd280 Merge branch 'tyvaremblem' into 'master' 
tyvar_kell.txt standardize emblem name

See merge request core-developers/forge!3862
 2021-02-16 04:12:06 +00:00
Sol
49be4bf74b Merge branch 'kathrilfix' into 'master' 
kathril_aspect_warper.txt fix

See merge request core-developers/forge!3860
 2021-02-16 01:29:29 +00:00
Sol
6c59c058e9 Merge branch '15FebBnR' into 'master' 
15 February Banned and Restricted

See merge request core-developers/forge!3859
 2021-02-16 01:27:45 +00:00
Tim Mocny
34b13579f5 15 February Banned and Restricted 2021-02-16 01:27:45 +00:00
Northmoc
825c0f431b tyvar_kell.txt standardize emblem name 2021-02-15 19:03:29 -05:00
Northmoc
d80455b900 kathril_aspect_warper.txt add SharedRestrictions 2021-02-15 17:08:01 -05:00
tool4EvEr
79d69ce4e7 Fix CantBeCast Origin 2021-02-15 22:17:12 +01:00
Michael Kamensky
ed6200b999 Merge branch 'fixCascade' into 'master' 
Add new cascade ruling

See merge request core-developers/forge!3850
 2021-02-15 20:15:24 +00:00
Anthony Calosa
b1fd265643 Merge branch 'master' into 'master' 
fix commander ability icon

See merge request core-developers/forge!3856
 2021-02-15 18:45:26 +00:00
Anthony Calosa
a87dd33712 commander ability icon 2021-02-16 02:44:26 +08:00
Michael Kamensky
0ae1b701ec Merge branch 'fixMarath' into 'master' 
Marath, Will of the Wild: Fix ability payment

See merge request core-developers/forge!3853
 2021-02-15 18:40:09 +00:00
Bug Hunter
3252c8f195 Marath, Will of the Wild: Fix ability payment 2021-02-15 18:40:08 +00:00
Michael Kamensky
c232bf9191 Merge branch 'fixLKI' into 'master' 
Fix cardscripts missing LKI usage

See merge request core-developers/forge!3839
 2021-02-15 18:17:20 +00:00
Bug Hunter
d6f77b1d96 Fix cardscripts missing LKI usage 2021-02-15 18:17:20 +00:00
Michael Kamensky
7936b5774c Merge branch 'master' into 'master' 
Fix auto mana payment for Chromatic Orrery and friends + fix desktop Forge crash on Haste icon

See merge request core-developers/forge!3855
 2021-02-15 18:09:35 +00:00
Michael Kamensky
71f191e71b - Fix auto mana payment for Chromatic Orrery and friends 
- Fix the Haste icon crashing in desktop Forge
 2021-02-15 21:08:51 +03:00
Michael Kamensky
e54e1e285f Merge branch 'CommanderPrecon-Austinio' into 'master' 
Commander Precons added to decktype with all pre C18 commander precons included by Austinio

See merge request core-developers/forge!3854
 2021-02-15 17:49:19 +00:00
Michael Kamensky
dbdef270aa Merge branch 'fix_imprint_mutate' into 'master' 
Fix imprint cards that are not working correctly with mutate

See merge request core-developers/forge!3844
 2021-02-15 17:48:41 +00:00
Adam Pantel
dd57c86846 HTR edition files 2021-02-15 12:30:32 -05:00
Anthony Calosa
c883217cda Commander Precons added to decktype with all pre C18 commander precons included 2021-02-16 01:17:48 +08:00
Adam Pantel
1ed434ab75 Edition file for cmb1 2021-02-15 11:50:23 -05:00
Anthony Calosa
fad61a00fb Merge branch 'master' into 'master' 
[Desktop] add ability icons

See merge request core-developers/forge!3851
 2021-02-15 16:42:01 +00:00
tool4EvEr
76d3b089f7 Add new cascade ruling 2021-02-15 17:41:11 +01:00
Anthony Calosa
49ad6d999e [Desktop] add ability icons 2021-02-16 00:41:02 +08:00
Hans Mackowiak
519e3565f0 Merge branch 'fixTargetSpells' into 'master' 
Fix TargetSelection adding spell as card when choosing from multiple zones

Closes #1417

See merge request core-developers/forge!3836
 2021-02-15 16:01:19 +00:00
Bug Hunter
0d08cfd1f5 Fix TargetSelection adding spell as card when choosing from multiple zones 2021-02-15 16:01:19 +00:00
Hans Mackowiak
71a55999e5 Merge branch 'card-fixes' into 'master' 
Fix static cleanup triggers

Closes #1696 and #1721

See merge request core-developers/forge!3849
 2021-02-15 16:00:06 +00:00
Adam Pantel
e374769016 Fix static cleanup triggers 2021-02-15 10:29:46 -05:00
Anthony Calosa
98dc6edc99 Merge branch 'twosat-master-patch-85282' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3848
 2021-02-15 14:56:38 +00:00
Andreas Bendel
706b5c1841 Update de-DE.properties 
translated exil order and creature on top
 2021-02-15 12:32:58 +00:00
Michael Kamensky
e2c0b6467f Merge branch 'ai-ignore-color-and-type' into 'master' 
Make the AI account for "you may pay X with any color" or "...with any type"

See merge request core-developers/forge!3845
 2021-02-15 08:45:54 +00:00
Michael Kamensky
19686a8d4e Make the AI account for "you may pay X with any color" or "...with any type" 2021-02-15 08:45:54 +00:00
Michael Kamensky
1b770df558 Merge branch 'fix_subgame_mutate' into 'master' 
Handle mutate and subgame interaction

See merge request core-developers/forge!3846
 2021-02-15 08:23:52 +00:00
Michael Kamensky
3bb71486cf Merge branch 'master' into 'master' 
Added an AI hint to Mystic Archaeologist.

See merge request core-developers/forge!3847
 2021-02-15 08:22:59 +00:00
Michael Kamensky
5be63a2581 - Added an AI hint to Mystic Archaeologist. 2021-02-15 11:22:31 +03:00
Lyu Zong-Hong
88faa0ee5f Handle mutate and subgame interaction 2021-02-15 17:14:06 +09:00
Hans Mackowiak
b6a2232776 fix copied trigger 2021-02-15 08:38:29 +01:00
Hans Mackowiak
b315fc18fd fix open the omenpaths 2021-02-15 08:25:01 +01:00
Lyu Zong-Hong
2ff7d25a85 Fix imprint cards that are not working correctly with mutate 2021-02-15 15:49:20 +09:00