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
41,274 Commits 32 Branches 187 Tags
43b51c4795c823828e7b9e6988ec277b22e74266
Commit Graph

41274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
swordshine
de0149dace Merge branch 'patch-18' into 'master' 
Update Modern Horizons edition file

See merge request core-developers/forge!1718
 2019-05-26 06:07:07 +00:00
swordshine
3f632d74d7 Merge branch 'patch-14' into 'master' 
Condemn update

See merge request core-developers/forge!1714
 2019-05-26 06:05:49 +00:00
Charles Baker
8b561bacfd Update Modern Horizons edition file 2019-05-26 03:06:52 +00:00
Charles Baker
427d23dfa4 Sword of Sinew and Steel 2019-05-26 03:02:21 +00:00
Charles Baker
17bb054bc4 Sword of Truth and Justice 2019-05-26 02:45:44 +00:00
Charles Baker
af935f96ce Archmage's Charm 2019-05-26 02:28:34 +00:00
Charles Baker
94c21f7fff Condemn update 2019-05-26 02:08:23 +00:00
swordshine
b590e9613c Merge branch 'patch' into 'master' 
Update more scripts

See merge request core-developers/forge!1713
 2019-05-25 16:42:36 +00:00
swordshine
d6f32071e3 Update more scripts 2019-05-26 00:41:07 +08:00
swordshine
03e6c71b10 Merge branch 'patch' into 'master' 
Patch

See merge request core-developers/forge!1712
 2019-05-25 16:19:22 +00:00
swordshine
c3ff31f078 Update more scripts 2019-05-26 00:13:00 +08:00
Agetian
d8c39bd5da Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2019-05-25 19:04:34 +03:00
swordshine
8ba80940da Merge branch 'patch' into 'master' 
Update some scripts

See merge request core-developers/forge!1710
 2019-05-25 16:02:48 +00:00
Agetian
8101af1fa2 - Fixed Mox Tantalite. 2019-05-25 19:02:33 +03:00
swordshine
3659bd6777 Update some scripts 2019-05-26 00:02:29 +08:00
swordshine
4fc93a3f71 Merge branch 'mh1spoilers' into 'master' 
Mh1spoilers

See merge request core-developers/forge!1695
 2019-05-25 15:57:59 +00:00
Michael Kamensky
5563cbe3b5 Merge branch 'master' into 'master' 
Added puzzle PS_WAR3: Possibility Storm - War of the Spark 03

See merge request core-developers/forge!1709
 2019-05-25 14:53:11 +00:00
Agetian
da0e89fde9 - Added puzzle PS_WAR3. 2019-05-25 17:52:20 +03:00
maustin
5dbc01b81b Merge remote-tracking branch 'Austin/mh1spoilers' into mh1spoilers 
# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/bazaar_trademage.txt
#	forge-gui/res/cardsfolder/upcoming/mother_bear.txt
 2019-05-25 15:07:41 +01:00
austinio7116
46bfb76a84 Updated modern horizons edition file tokens 2019-05-25 15:05:19 +01:00
austinio7116
8a59d00423 Updated modern horizons edition file 2019-05-25 15:05:19 +01:00