external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,609 Commits 32 Branches 187 Tags
e4a0ce916519e44b58ad97d7bf17f06b0d23017c
Commit Graph

48609 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hans Mackowiak
78d41c7da8 Merge branch 'fix_spell_ability_mutate' into 'master' 
Fix some spells that is not working correctly with mutated creatures

See merge request core-developers/forge!3841
 2021-02-15 06:47:00 +00:00
Michael Kamensky
75d4892aea Merge branch 'card-fixes' into 'master' 
Missing SubAbility in Birgi/Harnfel

See merge request core-developers/forge!3843
 2021-02-15 06:24:13 +00:00
Adam Pantel
644e1ae93c Missing SubAbility in Birgi/Harnfel 2021-02-15 00:54:57 -05:00
Anthony Calosa
e50ef4d530 Merge branch 'master' into 'master' 
[Mobile] add zoom view for mutated cards

See merge request core-developers/forge!3842
 2021-02-15 05:41:13 +00:00
Anthony Calosa
14da7efe1d [Mobile] add zoom view for mutated cards 2021-02-15 13:38:07 +08:00
Lyu Zong-Hong
8b43b24eb1 Fix some spells that is not working correctly with mutated creatures 2021-02-15 14:02:12 +09:00
Michael Kamensky
635968a637 Merge branch 'update_nightmare_shepherd' into 'master' 
Update Nightmare Shepherd script to shorter form and not use imprint

See merge request core-developers/forge!3840
 2021-02-15 04:07:42 +00:00
Lyu Zong-Hong
37b00ba547 Update Nightmare Shepherd script to shorter form and not use imprint 2021-02-15 10:35:18 +09:00
Michael Kamensky
837957a9fe Merge branch 'master' into 'master' 
Fix the AI failing to bounce stuff e.g. with Riddlemaster Sphinx

See merge request core-developers/forge!3838
 2021-02-14 19:53:56 +00:00
Michael Kamensky
128b10614f - Fix the AI failing to bounce stuff e.g. with Riddlemaster Sphinx 2021-02-14 22:52:31 +03:00
Michael Kamensky
abd0715c28 Merge branch 'master' into 'master' 
Fix the starting phase in puzzle PS_IKO1.

See merge request core-developers/forge!3837
 2021-02-14 19:10:17 +00:00
Michael Kamensky
c5c946a5f9 - Fix the starting phase in puzzle PS_IKO1. 2021-02-14 22:09:39 +03:00
Hans Mackowiak
a624cf565a GameAction: copy changed card traits when moving to stack 2021-02-14 15:21:12 +01:00