external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,286 Commits 31 Branches 187 Tags
2619f87520ae885e447a1bea9323bfd49fe7e80c
Commit Graph

42286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
d985e37bc7 - Fix Deliver unto Evil. 2019-06-09 14:46:01 +03:00
Michael Kamensky
7122b666a2 Merge branch 'master' into 'master' 
Assorted AI improvements (RearrangeTopOfLibraryAi, attack AI logic, WithSameCreatureType targeting)

See merge request core-developers/forge!1816
 2019-06-09 11:38:44 +00:00
Agetian
86d7880df7 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-06-09 14:37:38 +03:00
Agetian
597bcd17c8 - Fix the AI incorrectly considering valid targets in RearrangeTopOfLibraryAi. 2019-06-09 14:37:10 +03:00
Agetian
3dc6cc9795 - Various AI attack logic improvements (consider only valid blockers when evaluating shouldAttack, don't judge by canKillAllDangerous if dangerous creatures aren't among the potential defenders) 2019-06-09 14:36:44 +03:00
Agetian
d622e6c8fc - ChangeZoneAi: use the new targeting restriction 2019-06-09 14:35:06 +03:00
Michael Kamensky
0a8a0f67d8 Merge branch 'targetSameCreatureType2' into 'master' 
SpellAbility: add isWithoutSameCreatureType and isWithSameCreatureType to canTarget

See merge request core-developers/forge!1815
 2019-06-09 11:34:58 +00:00
Hans Mackowiak
ae19b12844 SpellAbility: add isWithoutSameCreatureType and isWithSameCreatureType to canTarget 2019-06-09 11:34:58 +00:00
Michael Kamensky
6ef6189177 Merge branch 'master' into 'master' 
Fix copying SVars for SAs with Original Host

Closes #1043

See merge request core-developers/forge!1813
 2019-06-09 11:30:57 +00:00
Agetian
a9328d2961 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-06-09 12:23:23 +03:00
Michael Kamensky
48d61922f6 Merge branch 'sliceMH1' into 'master' 
MH1 Slice onto instance or sorcery

See merge request core-developers/forge!1814
 2019-06-09 09:22:57 +00:00
Hans Mackowiak
3644b8f74f MH1 Slice onto instance or sorcery 2019-06-09 09:22:57 +00:00
Agetian
5db867009d - Some more checks for OriginalHost. 2019-06-09 12:09:42 +03:00
Agetian
fb12dd30b2 - Fix copying SVars for SAs with Original Host. 
- Add a missing reference to Cobra Trap.
 2019-06-09 10:32:15 +03:00
Michael Kamensky
6ea96baf0a Merge branch 'master' into 'master' 
Fix Soulherder EOT trigger targeting.

Closes #1042

See merge request core-developers/forge!1812
 2019-06-09 07:02:54 +00:00
Agetian
6c19f39279 - Fix Soulherder EOT trigger targeting. 2019-06-09 10:02:23 +03:00
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