external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,850 Commits 31 Branches 187 Tags
08e84cb15ddf6f3e9024adaca832c39800c8f7f6
Commit Graph

46850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Northmoc
1e41aba11e fix esika_god_of_the_tree_the_prismatic_bridge.txt static 2021-01-12 16:06:18 -05:00
tool4EvEr
bdad27588e Add more resets for crazy corner cases 2021-01-12 22:04:32 +01:00
tool4EvEr
3d53311663 Fix Karn Liberated leaving emblems + phased out 2021-01-12 20:35:03 +01:00
Hans Mackowiak
96a3042967 Merge branch 'fix_draft_land_set' into 'master' 
Fix AI draft decks land set for sets without basic lands

See merge request core-developers/forge!3580
 2021-01-12 10:08:31 +00:00
Lyu Zong-Hong
5044b67469 Fix AI draft decks land set for sets without basic lands 2021-01-12 12:20:17 +09:00
Northmoc
081471fd25 the_world_tree.txt (Marvel) 2021-01-11 19:49:42 -05:00
Northmoc
9da79078ae firja_judge_of_valor.txt (Marvel) 2021-01-11 19:46:16 -05:00
Northmoc
6d2d0a53fc esika_god_of_the_tree_the_prismatic_bridge.txt (Marvel) 2021-01-11 19:43:25 -05:00
Northmoc
aa1868856e hailstorm_valkyrie.txt (Marvel) 2021-01-11 19:36:06 -05:00
Northmoc
cbf59ee46f eradicator_valkyrie.txt (Marvel) 2021-01-11 19:32:30 -05:00
Hans Mackowiak
bce2c3da24 Merge branch 'fixCastOnLostPlayers' into 'master' 
Fix multiplayer spells on lost players

Closes #10

See merge request core-developers/forge!3578
 2021-01-11 17:26:31 +00:00
Bug Hunter
58a18686da Fix multiplayer spells on lost players 2021-01-11 17:26:31 +00:00
Hans Mackowiak
7892d0f369 fix facedown removed from stack 2021-01-10 18:56:33 +01:00
Michael Kamensky
d8ac3bc314 Merge branch 'getCardsAddedLKI' into 'master' 
CardUtil getThisTurnEntered return LKI list

Closes #1542

See merge request core-developers/forge!3575
 2021-01-10 05:28:20 +00:00
Hans Mackowiak
48aa474357 Merge branch 'fixKess' into 'master' 
Fix CastSa not using LKI

Closes #1692

See merge request core-developers/forge!3577
 2021-01-09 21:47:50 +00:00
tool4EvEr
ca83ceb131 Fix CastSa not using LKI 2021-01-09 21:45:09 +01:00
tool4EvEr
fcc0cb9d0c Fix multiplayer conceding 2021-01-09 21:24:28 +01:00
Hans Mackowiak
3243133831 CardUtil getThisTurnEntered return LKI list 2021-01-09 15:53:00 +01:00
Hans Mackowiak
a099c019b2 Merge branch 'fixTriggersWhenSpent' into 'master' 
Fix AbilityMana triggering too early on spent mana

See merge request core-developers/forge!3560
 2021-01-09 10:16:08 +00:00
Bug Hunter
3096a0af1b Fix AbilityMana triggering too early on spent mana 2021-01-09 10:16:08 +00:00
Hans Mackowiak
5a7a71a95d Merge branch 'fixTriggersWhenSpent' into 'master' 
Fix AbilityMana triggering too early on spent mana

See merge request core-developers/forge!3560
 2021-01-09 10:16:07 +00:00
Bug Hunter
3fdac76ed0 Fix AbilityMana triggering too early on spent mana 2021-01-09 10:14:49 +00:00
Anthony Calosa
46c39b454c Merge branch 'master' into 'master' 
Remove Unused Import

See merge request core-developers/forge!3574
 2021-01-09 08:23:23 +00:00
Anthony Calosa
46d4bfd7c8 Remove Unused Import 2021-01-09 16:22:46 +08:00
Michael Kamensky
9567777826 Merge branch 'patch-12' into 'master' 
Update The List.txt Kaldheim

See merge request core-developers/forge!3569
 2021-01-09 07:02:03 +00:00
Michael Kamensky
b243b9ce38 Merge branch 'master' into 'master' 
Revert a debug commit to mobile-dev

See merge request core-developers/forge!3573
 2021-01-09 06:34:44 +00:00
Michael Kamensky
d6f48ebb30 - Revert a debug commit to mobile-dev 2021-01-09 09:34:16 +03:00
Michael Kamensky
a6f10974c9 Merge branch 'master' into 'master' 
Fix the SpellApiToAi assignment for ImmediateTrigger

See merge request core-developers/forge!3572
 2021-01-09 06:33:26 +00:00
Michael Kamensky
c72f099e7b - Fix the SpellApiToAi assignment for ImmediateTrigger 2021-01-09 09:32:11 +03:00
Michael Kamensky
04e38e0609 Merge branch 'heartPiercer' into 'master' 
WrappedAbility: fix TriggeredRemembered being sacrificed

See merge request core-developers/forge!3525
 2021-01-09 06:15:05 +00:00
Hans Mackowiak
584b6bd81e WrappedAbility: fix TriggeredRemembered being sacrificed 2021-01-09 06:15:05 +00:00
Michael Kamensky
35ca083650 Merge branch 'patch-8' into 'master' 
Update worlds.txt

See merge request core-developers/forge!3570
 2021-01-09 05:09:51 +00:00
Sol
a6257c6faf Merge branch 'fullborderfixes' into 'master' 
Fullborderfixes

See merge request core-developers/forge!3533
 2021-01-09 02:38:27 +00:00
Sol
9b35f86818 Merge branch 'newMatchfix' into 'master' 
Fix match restarting after first time

See merge request core-developers/forge!3538
 2021-01-09 02:29:07 +00:00
Sol
bf19fcfc83 Merge branch 'fixStackDesc' into 'master' 
Fix remaining placeholders in stackDescription

Closes #1349

See merge request core-developers/forge!3537
 2021-01-09 02:27:52 +00:00
Gabriel Franco
52d7c4b786 Update worlds.txt 2021-01-08 10:02:58 +00:00
John
a7cbe6995a Update The List.txt 2021-01-08 09:45:01 +00:00
Michael Kamensky
cdd4a0c904 Merge branch 'edition-updates' into 'master' 
Update Throne of Eldraine edition sections

See merge request core-developers/forge!3567
 2021-01-07 14:08:57 +00:00
Michael Kamensky
ae7a040bdc Merge branch 'patch-6' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!3566
 2021-01-07 14:08:49 +00:00
friarsol
944b9a3b29 Update Throne of Eldraine edition sections 2021-01-06 21:41:33 -05:00
Andreas Bendel
b24ed6b31a Update de-DE.properties 
corrected translation lblWouldYouLikeFight
 2021-01-06 19:52:13 +00:00
Hans Mackowiak
a5ca6cd0df Merge branch 'master' into 'master' 
Kraul Harpooner fix

Closes #737

See merge request core-developers/forge!3562
 2021-01-06 15:07:33 +00:00
Hythonia
c75fa0f057 Kraul Harpooner fix 2021-01-06 15:07:33 +00:00
Sol
d3ce61a0a4 Merge branch '1689-x-references-on-permanents-do-not-work' into 'master' 
Resolve "X references on permanents do not work."

Closes #1690 and #1689

See merge request core-developers/forge!3563
 2021-01-06 13:28:25 +00:00
Hans Mackowiak
8a2db82e1f HumanPlaySpellAbility: fixes setXManaCostPaid when cost doesn't has X 2021-01-06 14:20:45 +01:00
Michael Kamensky
4ca0765df5 Merge branch 'master' into 'master' 
Basic AI logic for Sigrid, God Favored.

See merge request core-developers/forge!3561
 2021-01-06 10:24:58 +00:00
Michael Kamensky
5e6d9cef13 - Remove an unnecessary variable. 2021-01-06 09:14:02 +03:00
Michael Kamensky
260b19d807 - Add targeting validity checks. 2021-01-06 09:13:29 +03:00
Michael Kamensky
a9346a16be - Basic logic for Sigrid, God Favored. 2021-01-06 08:56:19 +03:00
Michael Kamensky
90e3c39b73 Merge branch 'khm4' into 'master' 
KHM - 4 Jan

See merge request core-developers/forge!3556
 2021-01-06 05:26:33 +00:00