external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,683 Commits 32 Branches 187 Tags
2d86d240a795f6829c3e299d2f22d1a6b51f995f
Commit Graph

42683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
680e2d63e3 - War of the Spark: it looks like there are only 3 booster covers (except for color-themed boosters and other stuff) 2019-06-18 07:27:25 +03:00
schnautzr
7fc32ae4ca Merge branch 'm20' of https://git.cardforge.org/core-developers/forge into m20 2019-06-17 16:04:09 -05:00
schnautzr
21fe950df0 Merge branch 'master' of https://git.cardforge.org/core-developers/forge into m20 2019-06-17 16:02:34 -05:00
Rob Schnautz
62ae636dd5 Merge branch 'master' into 'm20' 
update from master

See merge request core-developers/forge!1878
 2019-06-17 20:56:11 +00:00
Rob Schnautz
6cdbcf3a0b - Somewhat better logic for Might of Old Krosa and Arrester's Zeal, allowing the AI to use them in Main 1 in overwhelming situations. 2019-06-17 20:56:11 +00:00
schnautzr
f0345438da dragon mage and stuff 2019-06-17 15:52:10 -05:00
schnautzr
7492891db7 moar cardz 2019-06-17 13:58:21 -05:00
schnautzr
c30505ad8d cavalier of flame, ajani strength of pride. note that ajani's third ability needs work yet to prevent graying out when the condition is false, but this would rarely if ever be a problem 2019-06-17 13:32:40 -05:00
Michael Kamensky
697b4d66ca Merge branch 'master' into 'master' 
Added AI cast preference to Mass Hysteria and Concordant Crossroads

Closes #1059

See merge request core-developers/forge!1876
 2019-06-17 16:10:57 +00:00
Agetian
077bfc4fdf - Added AI cast preference to Mass Hysteria and Concordant Crossroads 2019-06-17 19:08:14 +03:00
Rob Schnautz
e927b6f6de empyrean eagle 2019-06-17 15:49:43 +00:00
Rob Schnautz
68f8b9800c add ajani 2019-06-17 15:46:41 +00:00
Rob Schnautz
7a7cf01caf Rienne is a secret card, add Ironroot Warlord and Unsummon. 2019-06-17 15:38:48 +00:00
Rob Schnautz
db7077adcd Add the first several preview cards 2019-06-17 15:21:23 +00:00
Michael Kamensky
ad3873d986 Merge branch 'master' into 'master' 
Fix Shirei, Shizo's Caretaker

See merge request core-developers/forge!1875
 2019-06-17 14:59:28 +00:00
Agetian
489f583e67 - Fix Shirei, Shizo's Caretaker 2019-06-17 17:57:19 +03:00
Michael Kamensky
e8429f2cea Merge branch 'iss1057v3' into 'master' 
Shuffle list of potential cards before passing them to the commander deck generator.

See merge request core-developers/forge!1874
 2019-06-17 14:15:05 +00:00
kms70847
97ae1bc451 Shuffle list of potential cards before passing them to the commander deck generator. 
Proposed fix for https://git.cardforge.org/core-developers/forge/issues/1057
 2019-06-17 00:42:13 -04:00
Adam Pantel
6c15a05c8e Fix defender selection on "enters attacking" effects 2019-06-16 17:14:22 -04:00
Michael Kamensky
f0a7d2e911 Merge branch 'master' into 'master' 
Fix Aquatic Incursion

See merge request core-developers/forge!1871
 2019-06-16 14:33:06 +00:00
Agetian
46c91b9eb5 - Fix Aquatic Incursion 2019-06-16 17:32:46 +03:00
Michael Kamensky
4817475efb Merge branch 'master' into 'master' 
Somewhat better logic for Might of Old Krosa and Arrester's Zeal, allowing the AI to cast in Main Phase when planning to attack anyway

Closes #1056

See merge request core-developers/forge!1870
 2019-06-16 14:25:22 +00:00
Agetian
7b8e59810c - Somewhat better logic for Might of Old Krosa and Arrester's Zeal, allowing the AI to use them in Main 1 in overwhelming situations. 2019-06-16 17:20:40 +03:00
Michael Kamensky
c3ec264edd Merge branch 'master' into 'master' 
Added an AI logic parameter to Bond of Discipline similar to Cryptic Command

See merge request core-developers/forge!1869
 2019-06-16 12:53:00 +00:00
Agetian
f7cd068532 - Added an AI logic parameter to Bond of Discipline similar to Cryptic Command 2019-06-16 15:52:31 +03:00
Michael Kamensky
00e9a2dffb Merge branch 'master' into 'master' 
Fix tests to comply with the newest Oracle.

See merge request core-developers/forge!1868
 2019-06-16 10:13:39 +00:00
Agetian
e75929c16d - Fix tests to comply with the newest Oracle. 2019-06-16 13:13:19 +03:00
Michael Kamensky
0e2bd3da48 Merge branch 'master' into 'master' 
Fix a logic error in TapAllAi

See merge request core-developers/forge!1867
 2019-06-16 09:59:58 +00:00
Agetian
80946ca88f - Fix a logic error in TapAllAi 2019-06-16 12:59:06 +03:00
swordshine
cff0793d80 Merge branch 'undefined' into 'master' 
Battlebond - Stolen Strategy

See merge request core-developers/forge!1859
 2019-06-16 04:03:25 +00:00
swordshine
1997842f97 Merge branch 'formats-update' into 'master' 
Formats update

See merge request core-developers/forge!1862
 2019-06-16 04:02:42 +00:00
swordshine
bba281f43c Merge branch 'oracle-updates-functional' into 'master' 
Oracle updates functional

See merge request core-developers/forge!1865
 2019-06-16 04:02:19 +00:00
Rob Schnautz
0bcec97f46 Merge branch 'oracle-updates-nonfunctional-rna' into 'master' 
Oracle updates nonfunctional rna

See merge request core-developers/forge!1866
 2019-06-16 03:59:18 +00:00
Rob Schnautz
7a5930ed07 Merge branch 'oracle-updates-nonfunctional' into 'master' 
Oracle updates nonfunctional

See merge request core-developers/forge!1864
 2019-06-16 03:58:55 +00:00
Rob Schnautz
88ac34bad9 Crazed Firecat and the tense verbs (nonfunctional) 2019-06-16 03:45:39 +00:00
Rob Schnautz
7273c36d71 Time Spiral zones (nonfunctional) 2019-06-16 03:42:59 +00:00
Rob Schnautz
109339f058 Creating Marit Lage (nonfunctional) 2019-06-16 03:40:39 +00:00
Rob Schnautz
3b4be89e55 Planeswalker reminder text (nonfunctional) 2019-06-16 03:38:28 +00:00
Rob Schnautz
1eb609d30c Lord of Atlantis gets into commerce (functional... kinda) 2019-06-16 03:31:39 +00:00
Rob Schnautz
27521623a6 Missing a (nonfunctional) period. 2019-06-16 03:28:43 +00:00
Rob Schnautz
147ad884da Ajani's Pride-may-te (functional) 2019-06-16 03:14:10 +00:00
Rob Schnautz
685c452ea5 Merge branch 'master' into 'oracle-updates-nonfunctional' 
# Conflicts:
#   forge-gui/res/cardsfolder/a/artisan_of_forms.txt
#   forge-gui/res/cardsfolder/c/cemetery_puca.txt
#   forge-gui/res/cardsfolder/d/dimir_doppelganger.txt
#   forge-gui/res/cardsfolder/e/evil_twin.txt
#   forge-gui/res/cardsfolder/h/heat_shimmer.txt
#   forge-gui/res/cardsfolder/i/increasing_devotion.txt
#   forge-gui/res/cardsfolder/i/increasing_vengeance.txt
#   forge-gui/res/cardsfolder/k/kiki_jiki_mirror_breaker.txt
#   forge-gui/res/cardsfolder/l/lazav_dimir_mastermind.txt
#   forge-gui/res/cardsfolder/m/minion_reflector.txt
#   forge-gui/res/cardsfolder/m/mizzium_transreliquat.txt
#   forge-gui/res/cardsfolder/s/sakashima_the_impostor.txt
#   forge-gui/res/cardsfolder/s/splinter_twin.txt
#   forge-gui/res/cardsfolder/t/tempt_with_vengeance.txt
#   forge-gui/res/cardsfolder/t/thespians_stage.txt
#   forge-gui/res/cardsfolder/t/twinflame.txt
#   forge-gui/res/cardsfolder/u/unstable_shapeshifter.txt
#   forge-gui/res/cardsfolder/v/vesuvan_doppelganger.txt
#   forge-gui/res/cardsfolder/v/vesuvan_shapeshifter.txt
 2019-06-16 03:09:06 +00:00
schnautzr
2951cb5660 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2019-06-15 15:45:37 -05:00
schnautzr
7436bf5385 format updates 2019-06-15 15:44:48 -05:00
Michael Kamensky
3dd54e06e9 Merge branch 'master' into 'master' 
Fix the order of elements for Charm effect being random in the UI

Closes #940

See merge request core-developers/forge!1861
 2019-06-15 19:13:42 +00:00
Agetian
ed818f1bd1 - Fix the order of elements for Charm effect being random in the UI 2019-06-15 22:12:06 +03:00
Michael Kamensky
c08e20f2a7 Merge branch 'master' into 'master' 
Fix AI logic for Teferi, Time Raveler

See merge request core-developers/forge!1860
 2019-06-15 18:03:09 +00:00
Agetian
df01fe5085 - Fix AI logic for Teferi, Time Raveler 2019-06-15 21:02:42 +03:00
Michael Kamensky
9f1763e9a1 Merge branch '1053-etb-replacement-dependent-on-kicker-is-broken' into 'master' 
Resolve "ETB Replacement dependent on Kicker is broken"

Closes #1053

See merge request core-developers/forge!1858
 2019-06-15 15:41:01 +00:00
Agetian
be9e53d517 - Fix imports. 2019-06-15 18:36:49 +03:00