external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,575 Commits 31 Branches 187 Tags
bca0282caed2a2d615f85b3d03b7af3b92f82231
Commit Graph

47575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anthony Calosa
53e1d766f2 Merge branch 'master' into 'master' 
[Mobile] Fix exception on dispose texture

See merge request core-developers/forge!3807
 2021-02-12 09:37:19 +00:00
Anthony Calosa
aad88f7d64 Merge remote-tracking branch 'core/master' 2021-02-12 17:35:08 +08:00
Anthony Calosa
9581aec00b [Mobile] Fix exception on dispose 2021-02-12 17:34:45 +08: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
Anthony Calosa
b6a94c9f92 Merge branch 'master' into 'master' 
[Mobile] Keep FScreen array from growing

See merge request core-developers/forge!3806
 2021-02-12 07:44:23 +00:00
Anthony Calosa
02fb87d666 [Mobile] Keep FScreen array from growing 2021-02-12 15:40:11 +08:00
Hans Mackowiak
1b933b380e Merge branch 'fixDamagedBy' into 'master' 
Fix DamagedBy logic

See merge request core-developers/forge!3805
 2021-02-11 20:49:56 +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
Michael Kamensky
adfd0bf19f Merge branch 'Williams-master-patch-12212' into 'master' 
Masked Vandal Fix

See merge request core-developers/forge!3799
 2021-02-11 04:36:20 +00:00
Michael Kamensky
414b7d2b44 Merge branch 'cleanupimport' into 'master' 
Cleanup import

See merge request core-developers/forge!3802
 2021-02-11 04:36:09 +00:00
Lyu Zong-Hong
78928f186d Use a better way to handle change zone of merged permanent 2021-02-11 12:24:16 +09:00
Hans Mackowiak
395ea80ff0 Merge branch 'fix' into 'master' 
Some card fixes

See merge request core-developers/forge!3803
 2021-02-11 00:02:23 +00:00
Tim Mocny
07de907236 Some card fixes 2021-02-11 00:02:22 +00:00
tool4EvEr
793f75a020 Cleanup import 2021-02-10 22:11:39 +01:00
Sol
c29a267d07 Merge branch 'twosat-master-patch-35964' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3801
 2021-02-10 20:02:55 +00:00
Andreas Bendel
9ec9e526ad Update de-DE.properties 
translated 'download skins' entries
 2021-02-10 19:55:32 +00:00
Michael Kamensky
29b877ff1e Merge branch 'new_sld' into 'master' 
SLD smitten cards

See merge request core-developers/forge!3798
 2021-02-10 19:18:56 +00:00
Michael Kamensky
4af3b259dc Merge branch 'fixCastCancel' into 'master' 
Fix casting spells after canceling with extra costs

See merge request core-developers/forge!3793
 2021-02-10 19:18:07 +00: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
John
f167e5ce8b Update masked_vandal.txt 2021-02-10 16:21:24 +00:00
John
cd3b35e377 Update masked_vandal.txt 2021-02-10 16:18:45 +00:00
paul_snoops
74551aa238 SLD smitten cards 2021-02-10 16:14:38 +00:00
Michael Kamensky
6fcb1323b2 Merge branch 'edition_file_fixes' into 'master' 
Some KHC fixes

See merge request core-developers/forge!3797
 2021-02-10 15:05:58 +00:00
paul_snoops
29bbe02383 Some KHC fixes 2021-02-10 13:47:43 +00:00
Lyu Zong-Hong
b320ac12a1 Handle 721.3d (except commander) 2021-02-10 22:46:07 +09:00
Sol
781d59008b Merge branch 'Williams-master-patch-30693' into 'master' 
Narfi Betrayer King fix

See merge request core-developers/forge!3796
 2021-02-10 13:34:10 +00:00
Lyu Zong-Hong
221f5da473 Update mutated card view panel to show correct merged cards 2021-02-10 21:26:10 +09:00
Anthony Calosa
450a7f199f Merge branch 'master' into 'master' 
Move custom skins to cache

See merge request core-developers/forge!3795
 2021-02-10 12:17:54 +00:00
Anthony Calosa
8dcb4818a5 add todo 2021-02-10 20:16:37 +08:00
Lyu Zong-Hong
3812a85a8e Revert unnecessary changes of getCards() 2021-02-10 19:48:22 +09:00
Anthony Calosa
0c3248deff Merge remote-tracking branch 'core/master' 2021-02-10 18:31:36 +08:00
John
e0044cb561 Update narfi_betrayer_king.txt 2021-02-10 10:05:47 +00:00
Hans Mackowiak
2c765630c0 fix unused import 2021-02-10 09:15:16 +01:00
Hans Mackowiak
749fa157d0 Merge branch 'khc9' into 'master' 
Missing KHC cards and KHM fixes

See merge request core-developers/forge!3792
 2021-02-10 07:24:15 +00:00
Tim Mocny
5767847124 Missing KHC cards and KHM fixes 2021-02-10 07:24:14 +00:00