Commit Graph

54556 Commits

Author SHA1 Message Date
tool4EvEr
d8cceefe39 Fix AI not playing Sky Swallower trigger 2021-11-20 13:01:52 +01:00
Michael Kamensky
87dc410bd5 Merge branch 'copyper' into 'master'
CopyPermanentAi: fix missing trigger

See merge request core-developers/forge!5863
2021-11-20 04:45:40 +00:00
tool4EvEr
e98fea8879 Clean up 2021-11-19 23:56:24 +01:00
tool4EvEr
eafdafafec CopyPermanentAi: fix missing trigger 2021-11-19 20:53:30 +01:00
Hans Mackowiak
56e57deddb Merge branch 'fix-oracle-test-maxartcount-islands' into 'master'
Updated Oracle for MaxArtCount test for Island

See merge request core-developers/forge!5862
2021-11-19 19:38:24 +00:00
leriomaggio
6c8427bfe6 Updated Oracle for MaxArtCount test for Island
This time the test consider a lower-bound to avoid similar cases in the future :)
2021-11-19 19:18:20 +00:00
Michael Kamensky
610361f474 Merge branch 'weld' into 'master'
goblin_welder.txt revis

See merge request core-developers/forge!5844
2021-11-19 17:29:31 +00:00
Michael Kamensky
5ae0b6770d Merge branch 'token_changes_for_editions' into 'master'
Editions update for token name changes

See merge request core-developers/forge!5860
2021-11-19 17:29:18 +00:00
Michael Kamensky
c3ff40a1c6 Merge branch 'desecrator' into 'master'
Fix Cemetry Desecrator

See merge request core-developers/forge!5861
2021-11-19 17:28:08 +00:00
TRT
31b4e9f9fd Fix Cemetry Desecrator 2021-11-19 15:38:18 +01:00
paul_snoops
b85efdbec8 Editions update for token name changes 2021-11-19 14:13:22 +00:00
Michael Kamensky
3284f05e39 Merge branch 'SLD_update' into 'master'
SLD update

See merge request core-developers/forge!5859
2021-11-19 13:23:02 +00:00
Michael Kamensky
83915cce73 Merge branch 'tokenNameRule' into 'master'
Token Scripts: add Token to Name

See merge request core-developers/forge!5858
2021-11-19 13:22:49 +00:00
paul_snoops
4b30380128 SLD update 2021-11-19 12:33:07 +00:00
Hans Mackowiak
53b000515b Token Scripts: add Token to Name 2021-11-19 10:26:46 +01:00
Michael Kamensky
0035616964 Merge branch 'questmode-select-rares' into 'master'
Fix Quest mode not allowing to select all the cards from a set containing multiple card blocks

See merge request core-developers/forge!5855
2021-11-19 04:34:01 +00:00
Michael Kamensky
5d15108ead Merge branch 'adventure' into 'master'
Added Shop to the Inn screen

See merge request core-developers/forge!5857
2021-11-19 04:32:44 +00:00
Grimm
87337def2e Added Shop to the Inn screen 2021-11-19 02:40:50 +01:00
Michael Kamensky
4a2b1789a1 Merge branch 'master' into 'master'
Add puzzle PS_MID4 - Possibility Storm - Innistrad: Midnight Hunt 04

See merge request core-developers/forge!5856
2021-11-18 17:30:22 +00:00
Michael Kamensky
2dc8854152 Add puzzle PS_MID4 - Possibility Storm - Innistrad: Midnight Hunt 04 2021-11-18 17:30:22 +00:00
Michael Kamensky
991468efd9 - Fix Quest mode not allowing to select all the cards from a set containing several subsets of cards (e.g. Modern Horizons 2). 2021-11-18 20:21:32 +03:00
Michael Kamensky
a4fb17f2f4 Merge branch 'edition_updates' into 'master'
Various edition updates

See merge request core-developers/forge!5854
2021-11-18 12:09:42 +00:00
paul_snoops
938e47c781 Various edition updates 2021-11-18 09:18:30 +00:00
Sol
69877221c6 Merge branch 'migrate-upcoming' into 'master'
Migrate upcoming VOW

See merge request core-developers/forge!5853
2021-11-18 04:25:55 +00:00
friarsol
9b948362d7 Migrate upcoming VOW 2021-11-17 23:23:04 -05:00
Michael Kamensky
616bfd47a6 Merge branch 'shortcut' into 'master'
Fix Gutter Shortcut

See merge request core-developers/forge!5850
2021-11-18 03:56:56 +00:00
Michael Kamensky
f84e389b27 Merge branch 'TRT-master-patch-35244' into 'master'
Update forge-gui/res/cardsfolder/b/burning_rune_demon.txt

See merge request core-developers/forge!5851
2021-11-18 03:56:37 +00:00
Michael Kamensky
3c3d42fe7d Merge branch 'adventure' into 'master'
Added multiple decks in adventure.

See merge request core-developers/forge!5852
2021-11-18 03:56:24 +00:00
Grimm
7e8d3b0bd7 Adjusted Deck selector 2021-11-18 03:28:27 +01:00
Grimm
ef8c7a81e7 Fixed save in dungeons/towns 2021-11-18 03:19:41 +01:00
Grimm
ca56e1bb4e Merge branch 'master' of https://git.cardforge.org/core-developers/forge into adventure 2021-11-18 02:27:16 +01:00
Grimm
c47af43006 Added multiple decks in adventure.
Adjusted deck editor to enable usage in adventure mode.
Fixed a crash after a match.
2021-11-18 02:27:01 +01:00
Bug Hunter
48ffaf4479 Update forge-gui/res/cardsfolder/b/burning_rune_demon.txt 2021-11-17 21:23:54 +00:00
tool4EvEr
22fb4fd665 Fix Gutter Shortcut 2021-11-17 21:22:25 +01:00
Anthony Calosa
98073b49f4 Merge branch 'master' into 'master'
Fix land colors for combo mana

See merge request core-developers/forge!5849
2021-11-17 15:36:19 +00:00
Anthony Calosa
0cb63c7821 Merge remote-tracking branch 'core/master' 2021-11-17 23:32:04 +08:00
Michael Kamensky
5e1766b71e Merge branch 'karn' into 'master'
RestartGameAi: Improve filtering

See merge request core-developers/forge!5848
2021-11-17 15:27:02 +00:00
Michael Kamensky
d83dee9e1a Merge branch 'Svaldan-master-patch-89029' into 'master'
Fixed activation cost for Wedding Invitation

See merge request core-developers/forge!5845
2021-11-17 15:26:18 +00:00
Anthony Calosa
ea0ae4d8bc Fix combo color for CardView land colors 2021-11-17 23:25:43 +08:00
Job Spijker
a010ab7044 Fixed activation cost for real this time 2021-11-17 13:55:54 +00:00
TRT
2d11b1a99a Improve filtering 2021-11-17 14:09:11 +01:00
Michael Kamensky
eb2afcc191 Merge branch 'TRT-master-patch-25217' into 'master'
Update forge-gui/res/cardsfolder/e/enduring_angel_angelic_enforcer.txt

See merge request core-developers/forge!5847
2021-11-17 11:51:51 +00:00
Bug Hunter
9efcdc25ba Update forge-gui/res/cardsfolder/e/enduring_angel_angelic_enforcer.txt 2021-11-17 10:17:08 +00:00
Bug Hunter
c78f09f9a3 Merge branch 'NPE' into 'master'
Add NPE Guards when checking for adding to combat

See merge request core-developers/forge!5846
2021-11-17 10:08:10 +00:00
TRT
5bce17ab3c Add NPE Guards 2021-11-17 11:05:39 +01:00
Job Spijker
d9bcca43cc Fixed activation cost for Wedding Invitation 2021-11-17 07:07:15 +00:00
Anthony Calosa
4e18ddd0df Merge remote-tracking branch 'core/master' 2021-11-17 07:33:49 +08:00
Northmoc
68f0f5e440 goblin_welder.txt revis 2021-11-16 15:16:51 -05:00
Michael Kamensky
2aeff0a8fb Merge branch 'arsonist' into 'master'
VOC: Midnight Arsonist + Support

See merge request core-developers/forge!5840
2021-11-16 18:19:00 +00:00
Michael Kamensky
7726b9a0e3 Merge branch 'austeregrim-master-patch-35402' into 'master'
Update readme, with discord invite link

See merge request core-developers/forge!5843
2021-11-16 18:18:37 +00:00