external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,395 Commits 31 Branches 187 Tags
f44c6ac1a529e498be985b1184b7b95f95c1735c
Commit Graph

41395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
97b98aeae7 Merge branch 'master' into 'master' 
Fix DamageDealAi setting damage to 0 if adjustment to minimum required damage fails.

Closes #1023

See merge request core-developers/forge!1738
 2019-05-29 15:54:10 +00:00
Agetian
2dcf1c088a - Fix DamageDealAi setting damage to 0 if adjustment to minimum required damage fails. 2019-05-29 18:53:32 +03:00
Michael Kamensky
c015893ea3 Merge branch 'master' into 'master' 
Fix AI for Hide // Seek

Closes #1022

See merge request core-developers/forge!1737
 2019-05-29 15:30:48 +00:00
Agetian
b9a848f7eb - Fix AI for Hide // Seek 2019-05-29 18:27:01 +03:00
Hans Mackowiak
5efc4a32ab Merge branch 'fix-akoum_stonewaker' into 'master' 
FIX: Exile token of Akoum Stonewalker properly

Closes #953

See merge request core-developers/forge!1736
 2019-05-29 13:23:27 +00:00
pfirpfel
99f34af5df FIX: Exile token of Akoum Stonewalker properly 2019-05-29 15:05:26 +02:00
swordshine
cb996d48c5 Merge branch 'fix-ai-removeanycounter' into 'master' 
Fix Remove Any Counter for the AI

See merge request core-developers/forge!1735
 2019-05-29 12:28:52 +00:00
swordshine
0bf17d5357 Merge branch 'patch-22' into 'master' 
Kaya's Guile

See merge request core-developers/forge!1732
 2019-05-29 12:16:05 +00:00
Agetian
d3b8a2cc0e - Fix Remove Any Counter for the AI 2019-05-29 14:24:01 +03:00
Charles Baker
59456e1aec Pashalik Mons 2019-05-29 02:18:33 +00:00
Charles Baker
bbda835e68 Kaya's Guile 2019-05-29 01:53:39 +00:00
swordshine
ba35cbb578 Merge branch 'handsize' into 'master' 
Fix NPE when AI discards to hand size

See merge request core-developers/forge!1731
 2019-05-29 00:43:06 +00:00
swordshine
3c434aca4c Merge branch 'mh1-cards' into 'master' 
MH1 cards (Hexdrinker, Winds of Abandon)

See merge request core-developers/forge!1719
 2019-05-29 00:37:28 +00:00
apantel
a93d131e02 Fix NPE when AI discards to hand size 2019-05-28 20:02:44 -04:00
Adam Pantel
31d871c3ff MH1 cards 2019-05-28 19:57:03 -04:00
austinio7116
a3f29963d0 corrected SVAR name 2019-05-28 23:18:24 +01:00
Michael Kamensky
d5f8a0a790 Merge branch 'master' into 'master' 
Make Knollspine Invocation AI playable.

See merge request core-developers/forge!1730
 2019-05-28 15:31:55 +00:00
Agetian
6810f6f68e - Make Knollspine Invocation AI playable. 2019-05-28 18:31:20 +03:00
austinio7116
34df24f192 Today's spoilers from forgescribe 2019-05-28 16:07:46 +01:00
austinio7116
bb0ec2107e Today's spoilers from forgescribe 2019-05-28 16:07:00 +01:00
Michael Kamensky
4c111d550d Merge branch 'damagedealai-weirdness' into 'master' 
AI needs to locate the PayX through the Original card state in case the current card state doesn't have it

See merge request core-developers/forge!1728
 2019-05-28 14:30:06 +00:00
Michael Kamensky
43b51c4795 - DamageDealAi: for some weird reason, PayX needs to be on both SA and the host, otherwise some cards break for the AI 2019-05-28 14:30:06 +00:00
Sol
09f00ae4e4 Merge branch 'vancouver-mulligan' into 'master' 
Vancouver mulligan only allows to scry if the mulligan actually happened

See merge request core-developers/forge!1727
 2019-05-28 12:08:19 +00:00
Michael Kamensky
108abbe16c Vancouver mulligan only allows to scry if the mulligan actually happened 2019-05-28 12:08:19 +00:00
Michael Kamensky
c371ad921d Merge branch 'master' into 'master' 
Added puzzle PS_WAR4 (Possibility Storm - War of the Spark 04)

Closes #1017

See merge request core-developers/forge!1725
 2019-05-28 05:07:41 +00:00
Agetian
2da373b119 - Fix DamageDealAi PayX setup 2019-05-28 07:53:30 +03:00
Agetian
a7ee1fa5b1 - Added puzzle PS_WAR4. 2019-05-28 07:38:26 +03:00
Agetian
29ed49ba11 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-28 06:56:41 +03:00
swordshine
477f2d4ea6 Merge branch 'mulligans' into 'master' 
Extract mulligans from GameAction

See merge request core-developers/forge!1724
 2019-05-28 03:55:20 +00:00
Chris H
2f2acea1dd Even more warnings 2019-05-27 21:14:27 -04:00
Chris H
8a93262662 Merge branch 'mulligans' of https://git.cardforge.org/friarsol/forge into mulligans 2019-05-27 21:04:12 -04:00
Chris H
c0600d364f Fixing import warnings 2019-05-27 21:01:49 -04:00
swordshine
d7cad9fa83 Merge branch 'patch-19' into 'master' 
Orim's Thunder Update

Closes #1013

See merge request core-developers/forge!1720
 2019-05-28 00:48:18 +00:00
swordshine
fc1768d3b5 Merge branch 'patch-21' into 'master' 
Talisman of Conviction

See merge request core-developers/forge!1723
 2019-05-28 00:47:14 +00:00
swordshine
a507f33e46 Merge branch 'mh1spoilers' into 'master' 
Mh1spoilers from forgescribe

See merge request core-developers/forge!1722
 2019-05-28 00:46:31 +00:00
Sol
6371e708b0 Merge branch 'master' into 'mulligans' 
# Conflicts:
#   forge-game/src/main/java/forge/game/GameAction.java
 2019-05-28 00:39:05 +00:00
Charles Baker
4e48b42b17 Update talisman_of_conviction.txt 2019-05-27 19:58:30 +00:00
Chris H
220e75a81b Extract mulligans from GameAction 
- Add a few different types of Mulliganing that should be expandable
- To finish the work, we need the AI to better handle London mulligans
- And have the UI make this option selectable
 2019-05-27 15:58:20 -04:00
Charles Baker
cf29a85af3 Talisman of Conviction 2019-05-27 19:13:30 +00:00
maustin
9d9826402f Merge remote-tracking branch 'Austin/mh1spoilers' into mh1spoilers 
# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/yawgmoth_thran_physician.txt
 2019-05-27 18:24:06 +01:00
austinio7116
de21a14a77 Added new cards to MH1 editions file 2019-05-27 18:22:55 +01:00
austinio7116
f71b4cc739 Some MH1 spoilers from forgescribe 2019-05-27 18:19:40 +01:00
austinio7116
b5920a5ac2 Merge branch 'patch-20' into 'master' 
Yawgmoth, Thran Physician

See merge request core-developers/forge!1721
 2019-05-27 17:15:42 +00:00
austinio7116
c1265ce8c3 Some MH1 spoilers from forgescribe 2019-05-27 18:13:57 +01:00
Charles Baker
f4d5e337a2 Yawgmoth, Thran Physician 2019-05-27 15:55:18 +00:00
Charles Baker
cba21451c1 Orim's Thunder Update 2019-05-27 04:54:23 +00:00
Agetian
1a0988336e Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-26 13:01:31 +03:00
swordshine
25620ec33c Merge branch 'patch-17' into 'master' 
Sword of Sinew and Steel

See merge request core-developers/forge!1717
 2019-05-26 06:14:16 +00:00
swordshine
37325b8a9e Merge branch 'patch-16' into 'master' 
Sword of Truth and Justice

See merge request core-developers/forge!1716
 2019-05-26 06:13:42 +00:00
swordshine
d8593cff8f Merge branch 'patch-15' into 'master' 
Archmage's Charm

See merge request core-developers/forge!1715
 2019-05-26 06:11:29 +00:00