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
39,600 Commits 33 Branches 187 Tags
b6f6ee1098fbfafd147a41d7787c57c70d59274c
Commit Graph

39600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
b6f6ee1098 - Fixed Liliana, Untouched by Death. 2018-12-08 19:41:09 +03:00
Michael Kamensky
fb6673dc12 Fix Myr Welder + Ornate Kanzashi. 
Closes #776
 2018-12-08 08:07:39 +00:00
Agetian
65021e7f9b - ForgetImprinted on DB Pump. 2018-12-08 10:57:45 +03:00
Agetian
54ced3332c - Revert an accidental merge update. 2018-12-08 10:53:58 +03:00
Agetian
8f41c55543 Merge remote-tracking branch 'origin/welder-myr' into welder-myr 2018-12-08 10:52:32 +03:00
Agetian
1bd38f91aa - Fix the trigger. 2018-12-08 10:52:04 +03:00
Agetian
e10f90cf49 - Fix Myr Welder + Ornate Kanzashi, make Myr Welder use the Imprint mechanism. 2018-12-08 10:51:35 +03:00
Agetian
5143505bd4 - Set the original host on subabilities and additional abilities, fixes a crash with Myr Welder + Ornate Kanzashi. 2018-12-08 10:51:35 +03:00
Agetian
357f84882c - Fix the trigger. 2018-12-08 10:50:49 +03:00
Agetian
30ca71dbd2 Merge remote-tracking branch 'origin/welder-myr' into welder-myr 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/MillAi.java
 2018-12-08 10:47:40 +03:00
Agetian
e96f581984 - Fix Myr Welder + Ornate Kanzashi, make Myr Welder use the Imprint mechanism. 2018-12-08 10:46:55 +03:00
Agetian
087b884412 - Set the original host on subabilities and additional abilities, fixes a crash with Myr Welder + Ornate Kanzashi. 2018-12-08 10:46:55 +03:00
Michael Kamensky
606591ec03 Merge branch 'master' into 'master' 
- Fix Liliana, Untouched by Death Mill ability for the AI.

See merge request core-developers/forge!1191
 2018-12-08 07:46:16 +00:00
Agetian
7c584d5df7 - Fix Liliana, Untouched by Death Mill ability for the AI. 2018-12-08 10:45:13 +03:00
Agetian
4cf5159d2c - Fix Liliana, Untouched by Death Mill ability for the AI. 2018-12-08 10:41:46 +03:00
Agetian
3f4c3d2945 - Fix Myr Welder + Ornate Kanzashi, make Myr Welder use the Imprint mechanism. 2018-12-08 10:36:18 +03:00
Agetian
129f6ddc75 - Set the original host on subabilities and additional abilities, fixes a crash with Myr Welder + Ornate Kanzashi. 2018-12-08 10:31:27 +03:00
Michael Kamensky
620017e0b5 Merge branch 'master' into 'master' 
Tweaked a Planar Conquest deck.

See merge request core-developers/forge!1189
 2018-12-08 07:30:24 +00:00
Agetian
d3c81779ab - Tweaked a Planar Conquest deck. 2018-12-08 10:29:53 +03:00
Michael Kamensky
aaf771e991 Merge branch 'ai-tapcost' into 'master' 
Experimental: Fixed the AI cheating by tapping a mana source artifact both for mana and for the tap cost when paying for Zahid

See merge request core-developers/forge!1187
 2018-12-08 05:32:47 +00:00
Michael Kamensky
66f9ab1a27 Merge branch 'venerated-loxodon-fix' into 'master' 
Attempting to fix Venerated Loxodon not giving counters to creatures that helped convoke it.

Closes #774

See merge request core-developers/forge!1174
 2018-12-08 05:25:49 +00:00
Agetian
2f35377b8a - Better name for the payment preference spec. 2018-12-08 08:25:07 +03:00
Agetian
171c8e8d7f - Fixed the AI cheating by tapping a mana source artifact both for mana and for the tap cost when paying the alternate cost for Zahid, Djinn of the Lamp. 
- Will likely need a more generic solution which would work for other potential similar costs, including the ones which may come from other cards.
 2018-12-07 10:04:06 +03:00
Michael Kamensky
bccaf14220 Merge branch 'master' into 'master' 
Added MTGO Core Cube 2018 submitted by dolphi5.

See merge request core-developers/forge!1186
 2018-12-06 19:19:53 +00:00
Agetian
ea34b4dd7b - Added MTGO Core Cube 2018 submitted by dolphi5. 2018-12-06 22:19:14 +03:00
Michael Kamensky
e99b5cbde4 Merge branch 'tempest-world' into 'master' 
Tempest world (original world by Seravy, fully tested and with improved AI support for the cards in duel decks)

See merge request core-developers/forge!1185
 2018-12-06 18:01:55 +00:00
Agetian
718732c7f0 - Updating CHANGES.TXT: Ultimate Masters. 2018-12-06 21:00:08 +03:00
Agetian
463cc7675a - Updating CHANGES.txt. 2018-12-06 20:53:54 +03:00
Agetian
788dfbcb38 - Fix deck descriptions. 2018-12-06 20:48:26 +03:00
Agetian
83c345231b Merge branch 'TempestWorld' of git.cardforge.org:Seravy/forge into tempest-world 2018-12-06 20:46:23 +03:00
Michael Kamensky
c34f6366e0 Merge branch 'master' into 'master' 
Ultimate Masters booster definition

See merge request core-developers/forge!1184
 2018-12-06 17:14:29 +00:00
Agetian
6b7088e04c - Added AI spec to Skilled Animator. 2018-12-06 20:11:40 +03:00
Agetian
c8fc73e471 - Adding booster definition to Ultimate Masters, enabling it for drafting. 2018-12-06 20:11:18 +03:00
Agetian
cfb63b7483 Merge remote-tracking branch 'origin/venerated-loxodon-fix' into venerated-loxodon-fix 
# Conflicts:
#	forge-game/src/main/java/forge/game/cost/CostAdjustment.java
 2018-12-06 17:29:31 +03:00
Agetian
74c7dd0305 - Tweaked the comment. 2018-12-06 17:28:13 +03:00
Agetian
9cbada32aa - 2018-12-06 10:23:12 +03:00
Agetian
e23790fd90 - Attempting to fix Venerated Loxodon not giving counters to creatures that helped convoke it. 2018-12-06 10:23:12 +03:00
Michael Kamensky
b5fc7880ac Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_GRN9 (Possibility Storm - Guilds of Ravnica 09).

See merge request core-developers/forge!1183
 2018-12-06 07:21:31 +00:00
Agetian
fb5a20a5be - Added puzzle PS_GRN9. 2018-12-06 10:20:51 +03:00
Michael Kamensky
ae10de4f1e Merge branch 'master' into 'master' 
Added an Aether filter to Planar Conquest which allows to search for cards playable in colorless decks.

See merge request core-developers/forge!1182
 2018-12-06 06:58:03 +00:00
Agetian
d867af4b45 - Added an Aether filter to Planar Conquest which allows to search for cards playable in colorless decks (useful for colorless commanders). 2018-12-06 09:57:13 +03:00
Michael Kamensky
e2c968182b Merge branch 'master' into 'master' 
AI shouldn't move counters if the creature currently trades, otherwise it'll lose material unfavorably

See merge request core-developers/forge!1181
 2018-12-06 05:40:59 +00:00
Agetian
879084bec2 - Replace sa.getHostCard() with source 2018-12-06 08:39:45 +03:00
Agetian
281b56fba3 - AI shouldn't move the counters if it can trade with the opposing creature, otherwise it'll lose material. 2018-12-06 08:37:10 +03:00
Michael Kamensky
d9da6cdcb5 Merge branch 'master' into 'master' 
Support detecting blocking threatened creatures in AILogic$ MoveCounter.

See merge request core-developers/forge!1180
 2018-12-06 05:03:38 +00:00
Agetian
7f7a033f12 - Support detecting blocking threatened creatures in AILogic$ MoveCounter. 2018-12-06 08:03:00 +03:00
Michael Kamensky
a93819ae31 Merge branch 'master' into 'master' 
Unbreak the MoveCounter logic.

See merge request core-developers/forge!1179
 2018-12-06 04:45:17 +00:00
Agetian
e8ebfebaca - Unbreak the MoveCounter logic. 2018-12-06 07:44:01 +03:00
Michael Kamensky
8d367542ff Merge branch 'ai-spike-logicname' into 'master' 
Better name for the MoveCounter logic for Spikes.

See merge request core-developers/forge!1178
 2018-12-06 04:36:02 +00:00
Agetian
05672bb174 - Better name for the MoveCounter logic for Spikes. 2018-12-06 07:17:31 +03:00