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

47039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
b1a57c3ac5 Merge branch 'fixEditorCards' into 'master' 
improvements for alternate state cards in editors (desktop)

See merge request core-developers/forge!3613
 2021-01-31 05:13:09 +00:00
Bug Hunter
cb6d39231d improvements for alternate state cards in editors (desktop) 2021-01-31 05:13:09 +00:00
Michael Kamensky
33d26f02e6 Merge branch 'fixAuras' into 'master' 
Fix multiplayer losing keeping auras & stolen permanents

Closes #1333

See merge request core-developers/forge!3640
 2021-01-31 05:12:03 +00:00
Bug Hunter
eb34f91727 Fix multiplayer losing keeping auras & stolen permanents 2021-01-31 05:12:03 +00:00
Michael Kamensky
23f9da083a Merge branch 'fix_deck_list_scale' into 'master' 
Fix deck list viewer is too large issue on high DPI display

See merge request core-developers/forge!3662
 2021-01-31 05:11:20 +00:00
Michael Kamensky
f0bca527b4 Merge branch 'fixPrio' into 'master' 
Fix human being able to play opponents spells by default

Closes #1700

See merge request core-developers/forge!3649
 2021-01-31 05:10:51 +00:00
Michael Kamensky
62e4d6261e Merge branch 'trickery' into 'master' 
KHM: Tibalt's Trickery and support

See merge request core-developers/forge!3680
 2021-01-31 05:09:55 +00:00
Michael Kamensky
b61ca9732e Merge branch 'modalDev' into 'master' 
Dev Menu improvement for alternate card states

See merge request core-developers/forge!3665
 2021-01-31 05:09:19 +00:00
Michael Kamensky
86f83f4814 Merge branch 'fix_transmute_artifact' into 'master' 
Fix Transmute Artifact

See merge request core-developers/forge!3677
 2021-01-31 05:09:09 +00:00
Michael Kamensky
894b6bd7ef Merge branch 'fix_takklemaggot' into 'master' 
Fix Takklemaggot

See merge request core-developers/forge!3673
 2021-01-31 05:08:45 +00:00
Michael Kamensky
d6bdae87b7 Merge branch 'Williams-master-patch-56587' into 'master' 
Update Kaldheim Commander.txt

See merge request core-developers/forge!3676
 2021-01-31 05:08:38 +00:00
Michael Kamensky
0cec5a8599 Merge branch 'TRT-master-patch-28684' into 'master' 
Update phyrexian portal

See merge request core-developers/forge!3664
 2021-01-31 05:08:21 +00:00
Bug Hunter
5ca5cd1840 Update phyrexian portal 2021-01-31 05:08:21 +00:00
Michael Kamensky
c5e6d875c1 Merge branch 'TRT-master-patch-07444' into 'master' 
Update mnemonic deluge

See merge request core-developers/forge!3663
 2021-01-31 05:07:44 +00:00
Michael Kamensky
7c7da6d98c Merge branch 'fix_puppet_master' into 'master' 
Fix Puppet Master

See merge request core-developers/forge!3678
 2021-01-31 05:07:36 +00:00
Anthony Calosa
d279eb110e Merge branch 'master' into 'master' 
[Mobile] fix optional discard GUI

See merge request core-developers/forge!3682
 2021-01-31 03:57:10 +00:00
Anthony Calosa
337ab0f3e5 [Mobile] fix optional discard GUI 2021-01-31 11:55:24 +08:00
Northmoc
0846fa687d add ForgetOtherRemembered param to DigUntilEffect 2021-01-30 16:57:39 -05:00
Northmoc
7638f2dab2 tibalts_trickery.txt 2021-01-30 16:57:03 -05:00
Lyu Zong-Hong
55fb2ab300 Fix Puppet Master 2021-01-30 23:49:36 +09:00
Lyu Zong-Hong
040111c2a7 Fix Transmute Artifact 2021-01-30 19:58:58 +09:00
John
8a3f480a1b Update Kaldheim Commander.txt 2021-01-30 10:08:45 +00:00
Michael Kamensky
38814b71c7 Merge branch 'twosat-master-patch-14739' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3675
 2021-01-30 05:25:15 +00:00
Michael Kamensky
cff420f821 Merge branch 'fix_rainbow_vale' into 'master' 
Fix Rainbow Vale not transfer back control when opponent also used its mana ability

Closes #1703

See merge request core-developers/forge!3661
 2021-01-30 05:24:20 +00:00
Andreas Bendel
e9b92b2e41 Update de-DE.properties 
translated lblDoYouWantPutCounter
 2021-01-29 21:34:58 +00:00
Hans Mackowiak
03fff1120a Merge branch 'Williams-master-patch-60930' into 'master' 
Update TypeLists.txt

See merge request core-developers/forge!3674
 2021-01-29 12:11:31 +00:00
John
aa0b0405a4 Update TypeLists.txt 2021-01-29 12:11:30 +00:00
Lyu Zong-Hong
3f6e2fcd43 Fix Takklemaggot 2021-01-29 19:38:12 +09:00
Michael Kamensky
2124a172be Merge branch 'khm_cosima_omenkeel' into 'master' 
KHM: Cosima/Omenkeel and support

See merge request core-developers/forge!3657
 2021-01-29 04:36:32 +00:00
Michael Kamensky
2cad82de0c Merge branch 'khm28' into 'master' 
KHM - 28 Jan

See merge request core-developers/forge!3666
 2021-01-29 04:36:03 +00:00
Michael Kamensky
0ab73e9860 Merge branch 'undefined' into 'master' 
KHM-Boast and other cards

See merge request core-developers/forge!3660
 2021-01-29 04:35:18 +00:00
Anthony Calosa
f0d5869191 Merge branch 'kevlahnota-master-patch-12731' into 'master' 
fix names

See merge request core-developers/forge!3671
 2021-01-29 04:32:43 +00:00
Anthony Calosa
4161d76d3c fix names 2021-01-29 04:32:16 +00:00
Anthony Calosa
282f06174f Merge branch 'kevlahnota-master-patch-45782' into 'master' 
Update borderlessCardList.txt

See merge request core-developers/forge!3670
 2021-01-29 04:21:43 +00:00
Anthony Calosa
03a374abba Update borderlessCardList.txt 2021-01-29 04:20:56 +00:00
Anthony Calosa
7fbcac3df9 Merge branch 'master' into 'master' 
fix Scythe of the Wretched

See merge request core-developers/forge!3669
 2021-01-29 03:32:48 +00:00
Anthony Calosa
e31c27f51a fix Scythe of the Wretched 2021-01-29 11:31:48 +08:00
Anthony Calosa
ec04b06d40 Merge branch 'master' into 'master' 
prevent NPE

See merge request core-developers/forge!3668
 2021-01-29 02:31:56 +00:00
Anthony Calosa
25c3f3601a prevent NPE 2021-01-29 10:30:01 +08:00
John
07f1f20685 zombie berserker token 2021-01-28 22:22:32 +00:00
John
24550c4b0a weigh down 2021-01-28 20:43:17 +00:00
John
ea20d60b2a grizzled outrider 2021-01-28 20:29:29 +00:00
Northmoc
a3b86efd16 bind_the_monster.txt 2021-01-28 15:15:25 -05:00
Northmoc
b1ebb91576 berg_strider.txt 2021-01-28 15:14:48 -05:00
John
f5d6064d38 vault robber 2021-01-28 19:58:12 +00:00
John
1f878ec0b3 Update frost_augur.txt 2021-01-28 19:41:03 +00:00
John
bd0993353b axgard cavalry 2021-01-28 18:47:31 +00:00
John
a7b1c08ced funeral longboat 2021-01-28 18:20:46 +00:00
John
b35686813e ravenous lindwurm 2021-01-28 18:17:53 +00:00
tool4EvEr
8fef34f8dd Dev Mode improvement for alternate states 2021-01-28 17:40:11 +01:00