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,160 Commits 32 Branches 187 Tags
cffda2c1a72b309282d71beeb4f74495bf5de24c
Commit Graph

42160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Agetian
946a96a9b0 - Added a test for Epochrasite 2019-06-15 18:35:04 +03:00
Agetian
55a2cc92a4 - Revert a change in Epochrasite (no longer necessary) 2019-06-15 18:02:16 +03:00
Computica
75a195f952 Battlebond - Stolen Strategy 2019-06-15 14:42:48 +00:00
Hanmac
85ef08f4bb CardUtil: copy Kicker and OptionalCost into LKI 2019-06-15 16:14:53 +02:00
Michael Kamensky
e7dadc5a4c Merge branch 'ai-kicker' into 'master' 
Improve AI playability checks for Kicker costs

Closes #1049

See merge request core-developers/forge!1856
 2019-06-15 11:13:52 +00:00
Agetian
379e866424 - Improve AI playability checks for Kicker costs 2019-06-15 09:52:02 +03:00
Michael Kamensky
13d2064459 Merge branch 'master' into 'master' 
Fix AI for Sadistic Obsession.

Closes #1052

See merge request core-developers/forge!1855
 2019-06-15 05:04:44 +00:00
Agetian
60c967dcf7 - Fix AI for Sadistic Obsession. 2019-06-15 07:38:19 +03:00
swordshine
d724950ab3 Merge branch 'patch-1' into 'master' 
Update Phantasmal Form

See merge request core-developers/forge!1854
 2019-06-15 01:02:02 +00:00
Hans Mackowiak
ce90d3b845 Update Phantasmal Form 2019-06-15 01:02:02 +00:00
Michael Kamensky
26c8f78620 Merge branch 'patch-1' into 'master' 
Update throatseeker

See merge request core-developers/forge!1853
 2019-06-14 17:40:28 +00:00
Hans Mackowiak
e1ed2da86c Update throatseeker 2019-06-14 17:40:28 +00:00
Sol
af8126ca83 Merge branch 'test-necrotic-ooze-copy' into 'master' 
Added a test for Necrotic Ooze copying Basking Rootwalla's ability from a graveyard.

See merge request core-developers/forge!1645
 2019-06-14 15:28:53 +00:00
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