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
42,170 Commits 32 Branches 187 Tags
c1eb0d84a13c01e03c35ebe65eecff76dace425c
Commit Graph

42170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
d099be187f Merge branch 'gideonstriumphfix' into 'master' 
Adding missing references

See merge request core-developers/forge!1810
 2019-06-09 06:45:31 +00:00
Michael Kamensky
25f52185bf Merge branch 'currentmetagamenetdeck' into 'master' 
Split Churrufli's net decks by format

See merge request core-developers/forge!1811
 2019-06-09 06:45:24 +00:00
austinio7116
30e38538e2 Split Churrufli's mtggoldfish metagame netdecks by format to allow for format specific quick gauntlets 2019-06-09 07:30:54 +01:00
austinio7116
6bd9cced6e Split Churrufli's mtggoldfish metagame netdecks by format to allow for format specific quick gauntlets 2019-06-09 07:26:56 +01:00
austinio7116
93d0820216 Adding missing references 2019-06-09 07:24:11 +01:00
Michael Kamensky
1d00cc3fff Merge branch 'currentmetagamenetdeck' into 'master' 
Adding netdeck for Churrufli's top deck lists

See merge request core-developers/forge!1809
 2019-06-09 03:41:33 +00:00
austinio7116
9d1ea5a6c7 Adding netdeck for Churrufli's top deck lists 2019-06-08 17:09:34 +01:00
swordshine
1772696181 Merge branch 'master' into 'master' 
Moving hard-coded text to en-US.properties file

See merge request core-developers/forge!1805
 2019-06-08 07:46:12 +00:00
Michael Kamensky
9d64e1a4f7 Merge branch 'master' into 'master' 
Added MH1 achievements by Marek14.

See merge request core-developers/forge!1808
 2019-06-08 06:45:23 +00:00
Agetian
cdb091ad8b - Added MH1 achievements. 2019-06-08 09:44:39 +03:00
Michael Kamensky
a35058a0c3 Merge branch 'ai-mh1-hints' into 'master' 
Modern Horizons AI hints + various minor tweaks

See merge request core-developers/forge!1807
 2019-06-08 06:39:17 +00:00
Agetian
e21ec52fdd - Improve ChangeZoneAi for Wrenn and Six like abilities. 2019-06-08 09:38:47 +03:00
Agetian
260acd5403 - MH1 AI hints 
- Tweaked some AI hints for various older cards (similar to how they are on newer cards)
- Added MH1 to Time Vault in Planar Conquest
 2019-06-08 09:35:27 +03:00
churrufli
1059666444 Moving hard-coded text to en-US.properties file 2019-06-08 07:55:27 +02:00
Michael Kamensky
f08e8d58b1 Merge branch 'master' into 'master' 
Fix and improve AI for Band Together and Courage in Crisis

Closes #1041

See merge request core-developers/forge!1806
 2019-06-08 04:11:27 +00:00
Agetian
1383549ea6 - Fix imports 2019-06-08 07:10:32 +03:00
Agetian
9b1ed633f5 - Fix and improve AI for Band Together and Courage in Crisis 2019-06-08 07:08:59 +03:00
churrufli
f44c6ac1a5 Moving hard-coded text to en-US.properties file 2019-06-07 20:56:15 +02:00
churrufli
6783f4e700 Moving hard-coded text to en-US.properties file 2019-06-07 20:50:04 +02:00
churrufli
6ddbadd339 Moving hard-coded text to en-US.properties file 2019-06-07 20:36:59 +02:00
churrufli
a63d02ff00 Moving hard-coded text to en-US.properties file 2019-06-07 20:34:14 +02:00
churrufli
4589f783b6 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	forge-gui/res/languages/es-es.properties
 2019-06-07 20:26:40 +02:00
churrufli
55721fb5d3 Moving hard-coded text to en-US.properties file 2019-06-07 20:26:02 +02:00
Churrufli
aafad639a6 Update es-es.properties 2019-06-07 20:25:45 +02:00
Churrufli
233e6d7794 Update en-US.properties 2019-06-07 20:25:38 +02:00
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