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

4819 Commits

Author SHA1 Message Date
Hans Mackowiak
a624cf565a GameAction: copy changed card traits when moving to stack 2021-02-14 15:21:12 +01:00
Hans Mackowiak
0bf7770cf1 Merge branch 'fixCountersAddedThisTurn' into 'master' 
Enable Trigger/Replacements to use CountersAddedThisTurn

See merge request core-developers/forge!3821
 2021-02-14 02:01:12 +00:00
Northmoc
bc5dce6fad remove old unwanted boolean 2021-02-13 20:18:10 -05:00
Northmoc
6749aa271b remove bad Override 2021-02-13 20:17:43 -05:00
Tim Mocny
d7f0665bae Nethroi (IKO) 2021-02-14 00:57:22 +00:00
tool4EvEr
46525a2369 Enable Trigger/Replacements to use CountersAddedThisTurn 2021-02-13 23:17:45 +01:00
Sol
dbcc277abb Merge branch 'mutate' into 'master' 
Mutate

See merge request core-developers/forge!3772
 2021-02-13 20:13:37 +00:00
Michael Kamensky
da6bf2c358 [maven-release-plugin] prepare for next development iteration 2021-02-13 18:00:08 +03:00
Michael Kamensky
0503686649 [maven-release-plugin] prepare release forge-1.6.38 2021-02-13 17:59:59 +03:00
Hans Mackowiak
543fa42b29 EffectEffect: fix trigger on Effects 2021-02-13 07:58:14 +01:00
Lyu Zong-Hong
39659f40c1 Also imprint all merged components 2021-02-13 15:01:36 +09:00
Michael Kamensky
2f8433eb9e [maven-release-plugin] prepare for next development iteration 2021-02-13 08:49:39 +03:00
Michael Kamensky
ab8502e86c [maven-release-plugin] prepare release forge-1.6.37 2021-02-13 08:49:30 +03:00
Lyu Zong-Hong
d099ea0828 Minor fixes 2021-02-13 10:36:44 +09:00
Adam Pantel
1103b36479 Some minor cleanup 2021-02-12 21:21:29 +00:00
Lyu Zong-Hong
7938e6bb84 Fix triggered object issue 2021-02-13 00:09:55 +09:00
Lyu Zong-Hong
bca0282cae Merge branch 'master' into mutate 2021-02-12 22:32:58 +09:00
Lyu Zong-Hong
58f27c4466 Fix commander damage record and view, also other bugs 2021-02-12 22:25:47 +09:00
Hans Mackowiak
6ed3f8ab3e Merge branch 'fixCards' into 'master' 
Update more cards with ValidSA

See merge request core-developers/forge!3804
 2021-02-12 13:22:41 +00:00
Bug Hunter
d08a64bb69 Update more cards with ValidSA 2021-02-12 13:22:40 +00:00
Michael Kamensky
23cdccc479 Merge branch 'triggerReplacementSvars' into 'master' 
Trigger & Replacement: ensure abilities

See merge request core-developers/forge!3808
 2021-02-12 12:10:10 +00:00
Hans Mackowiak
c7c9a3b402 GameActionUtil: fix mana with non-mana sub abilities 2021-02-12 12:36:21 +01:00
Hans Mackowiak
8217adbc32 Trigger & Replacement: ensure abilities 2021-02-12 12:21:50 +01:00
Michael Kamensky
f79e42abfd Merge branch 'manaReplacementEffect' into 'master' 
AbilityMana: better ReplacementEffect logic

Closes #1266

See merge request core-developers/forge!2650
 2021-02-12 08:50:24 +00:00
Hans Mackowiak
d6788b2803 Refactor: Taps for mana to differ between the Player who gets the Mana and the Player to taps the card 2021-02-12 08:50:24 +00:00
tool4EvEr
3c4bf234c9 Fix DamagedBy logic 2021-02-11 21:30:49 +01:00
Lyu Zong-Hong
8128aba4f8 Handle merged permanent as commander 2021-02-12 00:52:24 +09:00
Lyu Zong-Hong
e987ccd743 Handle 721.3e 2021-02-11 20:32:18 +09:00
Lyu Zong-Hong
da63182b3a Handle rule 721.3b 2021-02-11 16:41:25 +09:00
Hans Mackowiak
9050d2ffac Merge branch 'card-fixes' into 'master' 
Check for invalid CloneTarget

Closes #1716

See merge request core-developers/forge!3800
 2021-02-11 07:17:09 +00:00
Lyu Zong-Hong
e3b0c9e0cf Remember merged cards after change zone 2021-02-11 15:03:00 +09:00
Lyu Zong-Hong
ef13a84d43 Fix crash when getting triggered controler for merged permanent 2021-02-11 14:32:49 +09:00
Lyu Zong-Hong
78928f186d Use a better way to handle change zone of merged permanent 2021-02-11 12:24:16 +09:00
Bug Hunter
8e2a29bf13 Fix casting spells after canceling with extra costs 2021-02-10 19:18:06 +00:00
Adam Pantel
77d39a2c48 Check for invalid CloneTarget 2021-02-10 12:22:12 -05:00
Lyu Zong-Hong
b320ac12a1 Handle 721.3d (except commander) 2021-02-10 22:46:07 +09:00
Lyu Zong-Hong
221f5da473 Update mutated card view panel to show correct merged cards 2021-02-10 21:26:10 +09:00
Lyu Zong-Hong
3812a85a8e Revert unnecessary changes of getCards() 2021-02-10 19:48:22 +09:00
Hans Mackowiak
9d0433f812 - Use the original implementation for orderAndPlaySimultaneousSa for the AI for the time being until the AI side of the implementation can be improved. 2021-02-10 04:00:37 +00:00
Hans Mackowiak
a82f035211 TestCase: fix Manifest test 2021-02-09 22:47:31 +01:00
Hans Mackowiak
c830641bc9 fix Manifest Adventure cards 2021-02-09 14:57:08 +01:00
Hans Mackowiak
97d3dd294a GameAction: reset backstate when card to other zone than stack 2021-02-09 10:39:01 +01:00
Lyu Zong-Hong
24800840be Merge master 2021-02-09 17:15:06 +09:00
Lyu Zong-Hong
218e21fcd3 Handle TurnFace, Flip, Transform for merged permanent 2021-02-09 15:36:45 +09:00
Michael Kamensky
7a13cc9d54 Merge branch 'display_localization_cardname' into 'master' 
support choose/search localization card name

See merge request core-developers/forge!2469
 2021-02-09 04:53:33 +00:00
Bug Hunter
01c7aa5889 PlayEffect: support restrictions for both MDFC sides & split halves 2021-02-08 19:09:38 +00:00
Lyu Zong-Hong
2208dc4199 Handle change zone of merged permanent 2021-02-09 03:46:51 +09:00
Lyu Zong-Hong
94de589620 Small fix on mutate keyword 2021-02-09 01:47:03 +09:00
CCTV-1
f67a2eb456 Merge remote-tracking branch 'upstream/master' into display_localization_cardname 2021-02-08 22:20:58 +08:00
Lyu Zong-Hong
0eef317c42 Try to keep original card and not migrate to new card 2021-02-08 22:36:20 +09:00