Commit Graph

52645 Commits

Author SHA1 Message Date
paul_snoops
a21488ee43 MID 06 Sep 2021-09-06 17:24:54 +01:00
Northmoc
813e5ccf1f GameActionUtil.java allow multiple extra params to be added to Flashback costs 2021-09-06 11:46:05 -04:00
Michael Kamensky
553dba687f Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-09-06 07:20:12 +03:00
Michael Kamensky
ac3afbdd8c Merge branch 'typo' into 'master'
primeval_titan.txt typos

See merge request core-developers/forge!5297
2021-09-06 04:19:47 +00:00
Michael Kamensky
9ddaacc8df Merge branch 'mid_5' into 'master'
MID - 5 Sep

See merge request core-developers/forge!5298
2021-09-06 04:19:21 +00:00
Northmoc
fd38b52007 rite_of_harmony.txt (Suthro) 2021-09-05 23:15:24 -04:00
Northmoc
552d082074 primeval_titan.txt typos 2021-09-05 23:00:38 -04:00
Northmoc
85fdda07b7 little more Flashback keyword tweaking - allows exact Oracle wording for complicated costs 2021-09-05 22:59:46 -04:00
Northmoc
c3a083749f light_up_the_night.txt 2021-09-05 22:58:39 -04:00
Northmoc
6123cf7fde sludge_monster.txt 2021-09-05 22:21:33 -04:00
Bug Hunter
cf315e924f Merge branch 'TRT-master-patch-54258' into 'master'
Update forge-gui/res/cardsfolder/b/body_double.txt

See merge request core-developers/forge!5295
2021-09-05 18:30:29 +00:00
Bug Hunter
3449be1e75 Update forge-gui/res/cardsfolder/b/body_double.txt 2021-09-05 18:30:11 +00:00
Michael Kamensky
5188673551 Merge branch 'mic_visions' into 'master'
MIC: Visions cycle and support (Flashback enhancements)

See merge request core-developers/forge!5293
2021-09-05 04:01:27 +00:00
Tim Mocny
8166fd00c1 MIC: Visions cycle and support (Flashback enhancements) 2021-09-05 04:01:27 +00:00
Michael Kamensky
18ca012065 Merge branch 'mic_4' into 'master'
MIC/MID - 4 Sep

See merge request core-developers/forge!5294
2021-09-05 04:00:18 +00:00
Tim Mocny
5499f7f597 MIC/MID - 4 Sep 2021-09-05 04:00:13 +00:00
Michael Kamensky
5446a8b3a0 Merge branch 'klaxnek-master-patch-65069' into 'master'
Update es-ES.properties

See merge request core-developers/forge!5292
2021-09-05 03:59:38 +00:00
klaxnek
9fdab2a40c Update es-ES.properties 2021-09-04 21:20:49 +00:00
Anthony Calosa
73c4de209d Merge branch 'master' into 'master'
[Mobile] fix Adventure Card on "Art" mode

See merge request core-developers/forge!5291
2021-09-04 20:00:26 +00:00
Anthony Calosa
227f06e37f Merge remote-tracking branch 'remotes/core/master' 2021-09-05 03:54:01 +08:00
Anthony Calosa
d8842f8fb3 [Mobile] fix Adventure Card on "Art" mode 2021-09-05 03:53:37 +08:00
Michael Kamensky
d367f8abf9 Merge branch 'master' into 'master'
[Mobile] add Artist & adjust crop for modern/old frames

See merge request core-developers/forge!5290
2021-09-04 18:46:15 +00:00
Michael Kamensky
2d95c34990 Merge branch 'mic_3' into 'master'
MIC/MID - Sep 3

See merge request core-developers/forge!5287
2021-09-04 18:45:28 +00:00
Michael Kamensky
72d802dc19 Merge branch 'decks' into 'master'
Revert Comment out some currently unsupported cards in Commander precons

See merge request core-developers/forge!5289
2021-09-04 18:44:43 +00:00
tool4EvEr
50a1cf3a8f Clean up 2021-09-04 20:39:51 +02:00
Anthony Calosa
6b37213403 Merge remote-tracking branch 'remotes/core/master' 2021-09-04 21:07:32 +08:00
Northmoc
70a28208d6 howl_of_the_hunt.txt 2021-09-04 08:09:17 -04:00
Northmoc
bee62e193f might_of_the_old_ways.txt 2021-09-04 08:09:17 -04:00
Northmoc
e27b64b3df candlelit_cavalry.txt 2021-09-04 08:09:17 -04:00
Northmoc
3424948c47 pestilent_wolf.txt 2021-09-04 08:09:16 -04:00
Northmoc
1b752e8e71 snarling_wolf.txt 2021-09-04 08:09:16 -04:00
Northmoc
8944ab2f81 festival_crasher.txt 2021-09-04 08:09:15 -04:00
Northmoc
fe4cecf407 avacyns_memorial.txt 2021-09-04 08:09:15 -04:00
Anthony Calosa
cd47c591b3 add Artist & adjust crop for modern/old frames 2021-09-04 18:54:49 +08:00
tool4EvEr
3bf978991c Revert Comment out some currently unsupported cards in Commander precons 2021-09-04 11:33:44 +02:00
Michael Kamensky
d36c7677d7 Merge branch 'disturb' into 'master'
MID: add Disturb keyword

See merge request core-developers/forge!5285
2021-09-04 04:14:40 +00:00
Anthony Calosa
e1d8b5f01a Merge branch 'master' into 'master'
fix classic module crop on "art" mode

See merge request core-developers/forge!5288
2021-09-04 03:04:37 +00:00
Anthony Calosa
9c6f21adb4 fix classic module crop on "art" mode 2021-09-04 10:47:22 +08:00
Northmoc
4680f33b56 baithook_angler_hook_haunt_drifter.txt 2021-09-03 22:11:20 -04:00
Northmoc
2283116844 GameActionUtil.java improve Disturb 2021-09-03 22:11:20 -04:00
Northmoc
f28b91c0c2 SpellAbility.java isDisturb boolean 2021-09-03 22:11:20 -04:00
Northmoc
33b7a3a0bd GameActionUtil.java build Disturb SA 2021-09-03 22:11:20 -04:00
Northmoc
1ad30900fe CardProperty.java - various IntelliJ autocorrects 2021-09-03 22:11:20 -04:00
Northmoc
8e037b4f14 add Disturb to AlternativeCost 2021-09-03 22:11:20 -04:00
Northmoc
e4c938035c Card.java Disturb keyword desc builder 2021-09-03 22:11:20 -04:00
Northmoc
b817fbc6d1 beloved_beggar_generous_soul.txt 2021-09-03 22:11:20 -04:00
Northmoc
52a63c5d98 Keyword.java - Disturb 2021-09-03 22:11:20 -04:00
Anthony Calosa
26fb63b1f5 Merge branch 'master' into 'master'
fix theme logo, refactor fakeduals overlay

See merge request core-developers/forge!5286
2021-09-04 01:15:20 +00:00
Anthony Calosa
0457ae605d fix theme logo, refactor fakeduals overlay 2021-09-04 09:10:35 +08:00
Michael Kamensky
63c728f86d Merge branch 'master' into 'master'
[Mobile] added "Art" Border Masking Option & Card BG Textures

See merge request core-developers/forge!5278
2021-09-03 19:37:41 +00:00