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

42170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
bf38dac8c8 Added a test for Necrotic Ooze copying Basking Rootwalla's ability from a graveyard. 2019-06-14 15:28:53 +00:00
Michael Kamensky
e51236086b Merge branch 'patch-1' into 'master' 
Update Kamahl's Druidic Vow SpellDescription

See merge request core-developers/forge!1852
 2019-06-14 12:17:42 +00:00
Hans Mackowiak
34363829f0 Update Kamahl's Druidic Vow SpellDescription 2019-06-14 12:17:42 +00:00
swordshine
5ade9ea6e8 Merge branch 'patch' into 'master' 
Update some scripts

See merge request core-developers/forge!1851
 2019-06-14 07:24:55 +00:00
swordshine
192f205c0d Update some scripts 2019-06-14 15:24:39 +08:00
Michael Kamensky
0bcc5e2532 Merge branch 'master' into 'master' 
Fix token definition in Ravnica Allegiance

See merge request core-developers/forge!1850
 2019-06-14 06:05:13 +00:00
Agetian
296a9c32d4 - Fix token definition in Ravnica Allegiance 2019-06-14 09:04:46 +03:00
Michael Kamensky
668bc3ab2c Merge branch 'master' into 'master' 
Fix the Domain achievement not working correctly with snow-covered basic lands.

See merge request core-developers/forge!1849
 2019-06-14 04:19:06 +00:00
Agetian
a9275b1184 - Fix the Domain achievement not working correctly with snow-covered basic lands. 2019-06-14 07:18:30 +03:00
swordshine
3063b954a2 Merge branch 'deprecation-cleanup' into 'master' 
Deprecation cleanup

See merge request core-developers/forge!1419
 2019-06-14 00:45:29 +00:00
Rob Schnautz
19d2703ff4 Update forge-gui/res/editions/Magic 2020.txt 2019-06-13 22:34:31 +00:00
Rob Schnautz
249649dbaa Merge branch 'master' into 'deprecation-cleanup' 
# Conflicts:
#   forge-ai/src/main/java/forge/ai/ability/DiscardAi.java
#   forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java
 2019-06-13 22:10:10 +00:00
Michael Kamensky
a85a340312 Merge branch 'master' into 'master' 
Migrate "upcoming" for MH1 in preparation for the upcoming M20 development.

See merge request core-developers/forge!1848
 2019-06-13 04:05:34 +00:00
Agetian
7f3da042ea - Migrate "upcoming" for MH1 in preparation for the upcoming M20 development. 2019-06-13 07:04:48 +03:00
Michael Kamensky
a14f5269ef Merge branch 'master' into 'master' 
Preparing Forge for Android publish 1.6.26.001 [incremental].

See merge request core-developers/forge!1847
 2019-06-13 03:26:45 +00:00
Agetian
83ba31a6cd - Preparing Forge for Android publish 1.6.26.001 [incremental]. 2019-06-13 06:21:23 +03:00
Blacksmith
803e82f5f8 Clear out release files in preparation for next release 2019-06-12 20:18:07 +00:00
Blacksmith
560fdf1a46 [maven-release-plugin] prepare for next development iteration 2019-06-12 20:13:01 +00:00
Blacksmith
2974f6a7c3 [maven-release-plugin] prepare release forge-1.6.26 forge-1.6.26 2019-06-12 20:12:56 +00:00
Blacksmith
4e9b3ce256 Update README.txt for release 2019-06-12 20:10:26 +00:00
Michael Kamensky
ef15bb8da0 Merge branch 'master' into 'master' 
Fix London Mulligan AI so that the necessary number of cards is actually returned each time

See merge request core-developers/forge!1846
 2019-06-12 10:32:53 +00:00
Agetian
09e0967c37 - Fix London Mulligan AI 2019-06-12 13:32:19 +03:00
Michael Kamensky
b7b8103bd8 Merge branch 'master' into 'master' 
Fix logic for Domri, Anarch of Bolas

See merge request core-developers/forge!1845
 2019-06-12 08:26:56 +00:00
Agetian
9b3b1b9e8d - Fix logic for Domri, Anarch of Bolas 2019-06-12 11:26:27 +03:00
Michael Kamensky
38b72c8196 Merge branch 'master' into 'master' 
Improved London Mulligan AI

See merge request core-developers/forge!1844
 2019-06-12 08:01:41 +00:00
Agetian
06abfc1f14 - Improved London Mulligan AI 
- Also tweaked Goatnap to use AddKWs
 2019-06-12 11:00:48 +03:00
Michael Kamensky
8fa029ac4a Merge branch 'master' into 'master' 
Fix Goatnap.

See merge request core-developers/forge!1843
 2019-06-12 06:54:23 +00:00
Agetian
7fb089d120 - Fix Goatnap. 2019-06-12 09:53:58 +03:00
Michael Kamensky
c97782a437 Merge branch 'master' into 'master' 
Fix kill spell prediction for wrapped abilities (fixes AI for Munitions Expert)

See merge request core-developers/forge!1842
 2019-06-12 06:50:06 +00:00
Agetian
23b8b91a20 - Fix kill spell prediction for wrapped abilities (fixes AI for Munitions Expert) 2019-06-12 09:49:14 +03:00
Michael Kamensky
1463bda564 Merge branch 'master' into 'master' 
Fix AI for a couple cards with AF Draw

See merge request core-developers/forge!1841
 2019-06-12 05:45:59 +00:00
Agetian
293b5a1a5f - Fix AI for a couple cards with AF Draw 2019-06-12 08:45:31 +03:00
Michael Kamensky
5c7910e639 Merge branch 'triggerExiled' into 'master' 
TriggerExiled: make new Trigger for exile keyword action for Soulherder

Closes #1033

See merge request core-developers/forge!1840
 2019-06-12 05:23:31 +00:00
Hans Mackowiak
244fa13961 TriggerExiled: make new Trigger for exile keyword action for Soulherder 2019-06-12 05:23:31 +00:00
Michael Kamensky
f3ba20452d Merge branch 'master' into 'master' 
Use a standardized AILogic$ Always name for Hunt the Weak/Savage Stomp instead of inventing a new one

See merge request core-developers/forge!1839
 2019-06-12 05:02:16 +00:00
Agetian
b772b08d03 - A more traditional name for the AI logic 2019-06-12 08:01:35 +03:00
Michael Kamensky
982c138ca6 Merge branch 'master' into 'master' 
Fix AI logic for Hunt the Weak and Savage Stomp

See merge request core-developers/forge!1838
 2019-06-12 05:00:34 +00:00
Agetian
b23fc791a2 - Same tweak for Savage Stomp 2019-06-12 07:59:50 +03:00
Agetian
25995db862 - Fix the AI logic for Hunt the Weak 2019-06-12 07:59:09 +03:00
Michael Kamensky
e09cb43ef8 Merge branch 'master' into 'master' 
Fix AI logic for Domri's Ambush

See merge request core-developers/forge!1837
 2019-06-12 04:50:51 +00:00
Agetian
2acbddbecf - Fix AI logic for Domri's Ambush 2019-06-12 07:44:57 +03:00
Michael Kamensky
54ccf6e7a8 Merge branch 'master' into 'master' 
Tweak ANNOUNCEMENTS.txt.

See merge request core-developers/forge!1836
 2019-06-12 03:50:02 +00:00
Agetian
de0807f6f8 - Tweak ANNOUNCEMENTS.txt. 2019-06-12 06:49:16 +03:00
Michael Kamensky
9dda5bbbcf Merge branch 'patch-2' into 'master' 
Update ANNOUNCEMENTS.txt

See merge request core-developers/forge!1835
 2019-06-12 03:48:01 +00:00
Sol
84b26638dd Update ANNOUNCEMENTS.txt 2019-06-12 01:52:32 +00:00
Michael Kamensky
54f397cca9 Merge branch 'master' into 'master' 
Tweak the new cubes for better AI rankings.

See merge request core-developers/forge!1834
 2019-06-11 19:49:38 +00:00
Agetian
2c7d38fa39 - Tweak the new cubes for better AI rankings. 2019-06-11 22:49:13 +03:00
Michael Kamensky
854a5575e1 Merge branch 'master' into 'master' 
Added 2 draft cubes (cubetutor.com)

See merge request core-developers/forge!1833
 2019-06-11 19:40:46 +00:00
Agetian
a1e8d15818 - Added 2 draft cubes. 2019-06-11 22:40:02 +03:00
Michael Kamensky
4dde3610fa Merge branch 'master' into 'master' 
de-DE internationalization work

See merge request core-developers/forge!1832
 2019-06-11 18:10:21 +00:00