Commit Graph

55094 Commits

Author SHA1 Message Date
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
Michael Kamensky
25de28ae3d Merge branch 'TRT-master-patch-65736' into 'master'
Update forge-gui/res/cardsfolder/c/carth_the_lion.txt

See merge request core-developers/forge!5875
2021-11-24 04:07:32 +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
Northmoc
eecb7a120e VLobby - add option for # of matches 2021-11-22 15:50:05 -05:00
Michael Kamensky
d2db7de465 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-22 20:26:49 +03: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
283fcc7e9b Merge branch 'new_blood' into 'master'
changedTypeByText: Fix New Blood not fully working

See merge request core-developers/forge!5868
2021-11-22 09:54:19 +00:00
TRT
195c551563 Improve getType check 2021-11-22 10:20:50 +01:00
Michael Kamensky
43ca3569e7 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-22 07:06:12 +03: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
a3af21d11a Merge branch 'master' into 'master'
[Mobile] Fix planar conquest deck edit

Closes #2022

See merge request core-developers/forge!5869
2021-11-22 02:33:43 +00:00
Anthony Calosa
dac5d73955 [Mobile] Fix planar conquest deck edit 2021-11-22 10:31:53 +08:00
tool4EvEr
c272df37f7 Fix New Blood not fully working 2021-11-22 00:15:12 +01:00
tool4EvEr
de4e8e86d9 Fix NPE when server unreachable 2021-11-22 00:13:46 +01:00
Michael Kamensky
cad35685af Merge branch 'aifix' into 'master'
Fix targeting of some effects (e.g. Axis of Mortality)

See merge request core-developers/forge!5866
2021-11-21 15:21:19 +00:00
tool4EvEr
5d7e06d3ad Fix targeting of some effects (e.g. Axis of Mortality) 2021-11-21 15:31:43 +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
Michael Kamensky
abefc4d9e3 Merge branch 'aifix' into 'master'
Various AI fixes

See merge request core-developers/forge!5864
2021-11-20 16:20:28 +00:00
tool4EvEr
306039e901 Clean up 2021-11-20 15:42:43 +01:00
tool4EvEr
1247903369 Add sanity check 2021-11-20 15:42:29 +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
a538c349cf Fix targeting hexproof player in multiplayer 2021-11-20 13:03:22 +01:00
tool4EvEr
aa34b74fc4 Fix AI not playing Lord of Tresserhorn trigger 2021-11-20 13:02:24 +01:00
tool4EvEr
d8cceefe39 Fix AI not playing Sky Swallower trigger 2021-11-20 13:01:52 +01:00
Michael Kamensky
63b1ac544b Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-20 10:14:31 +03: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
2b193e706e Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-19 21:29:13 +03: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