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

41693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Churrufli
83df3e507f Update de-DE.properties 2019-06-07 20:25:38 +02:00
churrufli
bd4eace538 Moving hard-coded text to en-US.properties file 2019-06-07 20:25:38 +02:00
churrufli
1afc657ce6 updating res files 2019-06-07 20:25:15 +02:00
Churrufli
0f46f8c5e5 Update es-es.properties 2019-06-07 20:24:51 +02:00
Churrufli
1c1bbcebcb Update en-US.properties 2019-06-07 20:24:51 +02:00
Churrufli
f92edc3c3d Update de-DE.properties 2019-06-07 20:24:51 +02:00
churrufli
cefffc5d90 Moving hard-coded text to en-US.properties file 2019-06-07 20:24:51 +02:00
churrufli
821e345861 updating res files 2019-06-07 20:24:51 +02:00
Michael Kamensky
e67258a40f Merge branch 'master' into 'master' 
Fix a missing reference.

See merge request core-developers/forge!1804
 2019-06-07 16:08:24 +00:00
Agetian
f145569292 - Fix a missing reference. 2019-06-07 19:07:17 +03:00
Michael Kamensky
70e5d978c3 Merge branch 'master' into 'master' 
Some additional logic for Return from Extinction.

See merge request core-developers/forge!1803
 2019-06-07 16:00:38 +00:00
Agetian
261454d803 - Fix imports. 2019-06-07 19:00:12 +03:00
Agetian
90276e1217 - Some additional logic for Return from Extinction. 2019-06-07 18:58:20 +03:00
Michael Kamensky
643f4025e3 Merge branch 'master' into 'master' 
Fix Reap the Past card name.

See merge request core-developers/forge!1802
 2019-06-07 15:24:26 +00:00
Agetian
fd59807413 - Fix Reap the Past card name. 2019-06-07 18:23:56 +03:00
Michael Kamensky
a0638e5273 Merge branch '1040-feudkiller-s-verdict-creates-the-wrong-kind-of-token-though-with-the-right-image' into 'master' 
Resolve "Feudkiller's Verdict creates the wrong kind of token though with the right image."

Closes #1040

See merge request core-developers/forge!1801
 2019-06-07 14:40:07 +00:00
Hans Mackowiak
6d09f2a278 Update w_5_5_giant_warrior.txt 2019-06-07 12:39:27 +00:00
Michael Kamensky
19d1232ec8 Merge branch 'master' into 'master' 
Tweak AnimateAi so that the AI is less likely to waste resources.

See merge request core-developers/forge!1800
 2019-06-07 10:39:01 +00:00
Agetian
e5d3808407 - Tweak AnimateAi a little. 2019-06-07 13:38:17 +03:00
Michael Kamensky
1dffdc16b3 Merge branch 'master' into 'master' 
NPE precaution

See merge request core-developers/forge!1799
 2019-06-07 05:19:52 +00:00
Agetian
35f01cebf1 - NPE precaution 2019-06-07 08:19:22 +03:00
Michael Kamensky
7fff3c5b5c Merge branch 'master' into 'master' 
Fix AI for Karn, the Great Creator.

See merge request core-developers/forge!1798
 2019-06-07 05:18:23 +00:00
Agetian
47cfa67c09 - Fix AI for Karn, the Great Creator. 2019-06-07 08:17:09 +03:00
Michael Kamensky
41abad1131 Merge branch 'war-cards' into 'master' 
Fix Winds of Abandon

See merge request core-developers/forge!1795
 2019-06-07 03:13:47 +00:00
Michael Kamensky
cf1e0b1885 Merge branch 'ai-exalted' into 'master' 
Improve AI considerations for attacking in presence of Exalted

Closes #1039

See merge request core-developers/forge!1796
 2019-06-06 19:20:03 +00:00
Michael Kamensky
1709d0825c Improve AI considerations for attacking in presence of Exalted 2019-06-06 19:20:03 +00:00
apantel
b7217e1f20 Fix Winds of Abandon 2019-06-06 14:58:24 -04:00
Michael Kamensky
7d2300aa11 Merge branch 'fix-combo-anydifferent' into 'master' 
Fix Combo mana with AnyDifferent allowing to produce two mana of the same color.

Closes #1034

See merge request core-developers/forge!1791
 2019-06-06 17:49:54 +00:00
Michael Kamensky
854fb12729 Fix Combo mana with AnyDifferent allowing to produce two mana of the same color. 2019-06-06 17:49:54 +00:00
Michael Kamensky
4f49e0acde Merge branch 'master' into 'master' 
Fix AI for Epiphany at the Drownyard.

Closes #1038

See merge request core-developers/forge!1794
 2019-06-06 14:17:38 +00:00
Agetian
5ee562333a - Fix AI for Epiphany at the Drownyard. 2019-06-06 17:16:27 +03:00
Michael Kamensky
314ddefff1 Merge branch 'targetSameCreatureType' into 'master' 
Target: TargetsWithSameCreatureType

See merge request core-developers/forge!1793
 2019-06-06 12:27:49 +00:00
Hans Mackowiak
9848775d70 Target: TargetsWithSameCreatureType 2019-06-06 12:27:49 +00:00
Michael Kamensky
9233f778c5 Merge branch 'mhspoilers2' into 'master' 
Switched MH1 to use WAR basic lands for limited formats as there are no (non...

See merge request core-developers/forge!1792
 2019-06-06 05:57:13 +00:00
austinio7116
f9ffb0e1df Switched MH1 to use WAR basic lands for limited formats as there are no (non snow) basic lands in MH1 2019-06-06 06:29:56 +01:00
Michael Kamensky
795472d82b Merge branch 'patch-31' into 'master' 
Giver of Runes

See merge request core-developers/forge!1773
 2019-06-06 03:49:23 +00:00
Charles Baker
f1e5d0ac5c Merge branch 'protectionColorless' into 'patch-31' 
Protection colorless

See merge request Flair/forge!1
 2019-06-05 20:10:46 +00:00
Hans Mackowiak
519d57065d Updated deckgen data 
(cherry picked from commit 29f1065)
 2019-06-05 20:10:46 +00:00
Michael Kamensky
bb18d8f60b Merge branch 'master' into 'master' 
Add a basic AristocratCounters hook for Dreadmalkin (currently doesn't sac planeswalkers).

See merge request core-developers/forge!1790
 2019-06-05 18:30:47 +00:00
Agetian
8161bd5f2c - Add a basic AristocratCounters hook for Dreadmalkin (currently doesn't sac planeswalkers). 
- Fix division by zero in AristocratCounters logic.
 2019-06-05 21:29:29 +03:00
Michael Kamensky
7d2513c0f6 Merge branch 'master' into 'master' 
Fix RearrangeTopOfLibraryAi missed triggers.

See merge request core-developers/forge!1789
 2019-06-05 10:16:20 +00:00
Agetian
e61441c250 - Fix RearrangeTopOfLibraryAi missed triggers. 2019-06-05 13:15:42 +03:00
Michael Kamensky
b675f1c387 Merge branch 'master' into 'master' 
Fix imports.

See merge request core-developers/forge!1788
 2019-06-05 09:11:28 +00:00
Agetian
532accd709 - Fix imports. 2019-06-05 12:11:08 +03:00
Michael Kamensky
5e83a2e79d Merge branch 'master' into 'master' 
Basic AI for Gideon Blackblade

See merge request core-developers/forge!1787
 2019-06-05 09:10:34 +00:00
Agetian
fadd08bd21 - Basic AI for Gideon Blackblade. 2019-06-05 12:09:23 +03:00
austinio7116
4fd360a840 Merge branch 'wardeckgen' into 'master' 
Updated deckgen data

See merge request core-developers/forge!1786
 2019-06-05 05:30:36 +00:00
austinio7116
01f35cea63 Updated deckgen data 
(cherry picked from commit 29f1065)
 2019-06-05 06:28:59 +01:00
Michael Kamensky
9d28bf2546 Merge branch 'master' into 'master' 
Fix Ahn-Crop Invader AI

Closes #1012

See merge request core-developers/forge!1785
 2019-06-05 04:37:31 +00:00
Agetian
de01a88d52 - Fix Ahn-Crop Invader AI 2019-06-05 07:34:44 +03:00