Commit Graph

19130 Commits

Author SHA1 Message Date
Michael Kamensky
92bc343370 Merge branch 'CantBeActivated' into 'master'
Refactor CantBeActivated

See merge request core-developers/forge!5879
2021-11-26 04:14:23 +00:00
Michael Kamensky
67072c96cd Merge branch 'bo1' into 'master'
Add "best of 1 (or 5)" option to Constructed

See merge request core-developers/forge!5871
2021-11-25 18:18:48 +00:00
Bug Hunter
a3bbb506d8 Update forge-gui/res/cardsfolder/s/spinal_parasite.txt 2021-11-25 15:43:19 +00:00
TRT
8c755e71c1 Refactor CantBeActivated 2021-11-25 16:23:33 +01:00
TRT
b4348754f0 Refactor Number$ChosenNumber 2021-11-25 12:44:49 +01:00
TRT
540fe10fa5 Moraug: improve AI 2021-11-25 09:52:06 +01:00
TRT
1d45874160 Clean up 2021-11-24 22:12:33 +01:00
TRT
a6e10885a1 Fix missing triggers 2021-11-24 20:35:25 +01:00
Michael Kamensky
aefde2402d Merge branch 'henge' into 'master'
Strixhaven Stadium: allow AI to just put counters

See merge request core-developers/forge!5877
2021-11-24 18:46:21 +00:00
TRT
a48e914be2 Strixhaven Stadium: allow AI to just put counters 2021-11-24 17:19:04 +01:00
Michael Kamensky
db673ca126 Merge branch 'vowarchetype' into 'master'
archetype VOW

See merge request core-developers/forge!5874
2021-11-24 04:07:41 +00:00
Bug Hunter
e893dd52a2 Update forge-gui/res/cardsfolder/c/carth_the_lion.txt 2021-11-23 22:27:44 +00:00
austinio7116
d9954bcff0 archetype VOW 2021-11-23 22:25:45 +00:00
Michael Kamensky
41358140c3 Merge branch 'cards' into 'master'
Fix Divergent Transformations

See merge request core-developers/forge!5873
2021-11-23 16:17:31 +00:00
TRT
709f4bf05d Fix cards 2021-11-23 11:27:54 +01:00
Michael Kamensky
a0348ba8b4 Merge branch 'fix' into 'master'
sudden_disappearance.txt typo

See merge request core-developers/forge!5872
2021-11-23 04:13:17 +00:00
Northmoc
01e21b340a add UI_MATCHES_PER_GAME to HostedMatch 2021-11-22 15:51:35 -05:00
Northmoc
c98f50ad81 ForgePreferences add UI_MATCHES_PER_GAME 2021-11-22 15:51:16 -05:00
Northmoc
9874d478e2 new prompt 2021-11-22 15:50:43 -05:00
Michael Kamensky
bd7445f6ab Merge branch 'vowarchetype' into 'master'
Standard archetype deckgen data up to VOW

See merge request core-developers/forge!5870
2021-11-22 12:54:32 +00:00
austinio7116
de9164eee2 Standard archetype VOW 2021-11-22 10:39:16 +00:00
Michael Kamensky
b49838074c Merge branch 'gui' into 'master'
Fix NPE when images server unreachable

See merge request core-developers/forge!5867
2021-11-22 04:03:42 +00:00
Anthony Calosa
dac5d73955 [Mobile] Fix planar conquest deck edit 2021-11-22 10:31:53 +08:00
tool4EvEr
de4e8e86d9 Fix NPE when server unreachable 2021-11-22 00:13:46 +01:00
Michael Kamensky
72bead4941 Merge branch 'Svaldan-master-patch-19652' into 'master'
AI kept playing Sparring Regimen after combat.

See merge request core-developers/forge!5865
2021-11-20 18:52:11 +00:00
Job Spijker
e8ea2cb469 AI kept playing Sparring Regimen after combat. 2021-11-20 18:30:59 +00:00
tool4EvEr
306039e901 Clean up 2021-11-20 15:42:43 +01:00
tool4EvEr
8c96012083 Allow AI to play Lord of Tresserhorn when ETB trigger won't happen 2021-11-20 14:48:24 +01:00
tool4EvEr
e98fea8879 Clean up 2021-11-19 23:56:24 +01: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
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
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
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
paul_snoops
938e47c781 Various edition updates 2021-11-18 09:18:30 +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
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