Michael Kamensky
|
8488992e23
|
Merge remote-tracking branch 'origin/master' into agetian-master
|
2021-11-26 07:41:49 +03:00 |
|
Michael Kamensky
|
e8ad048377
|
Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master
|
2021-11-26 07:41:37 +03:00 |
|
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
|
98ee832672
|
Merge branch 'aifix' into 'master'
AI: Fix Goblin Artisans
See merge request core-developers/forge!5882
|
2021-11-26 04:14:14 +00:00 |
|
tool4EvEr
|
4de65435c7
|
AI: Fix Goblin Artisans
|
2021-11-25 23:05:17 +01: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 |
|
Michael Kamensky
|
9c2cf62312
|
Merge branch 'TRT-master-patch-92757' into 'master'
Update forge-gui/res/cardsfolder/s/spinal_parasite.txt
See merge request core-developers/forge!5880
|
2021-11-25 18:18:25 +00:00 |
|
Bug Hunter
|
8a54ffca2e
|
Merge branch 'imports' into 'master'
Fix imports
See merge request core-developers/forge!5881
|
2021-11-25 16:01:31 +00:00 |
|
TRT
|
e6e97f5c44
|
Fix imports
|
2021-11-25 16:59:59 +01: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 |
|
Michael Kamensky
|
814ea061ee
|
Merge branch 'moraug' into 'master'
Moraug: improve AI
See merge request core-developers/forge!5878
|
2021-11-25 12:14:25 +00:00 |
|
TRT
|
4411d0775d
|
Clean up
|
2021-11-25 12:49:15 +01:00 |
|
TRT
|
b4348754f0
|
Refactor Number$ChosenNumber
|
2021-11-25 12:44:49 +01:00 |
|
TRT
|
894350e8bb
|
Fix a TODO
|
2021-11-25 12:15:04 +01:00 |
|
TRT
|
8ebbaa395a
|
Clean up
|
2021-11-25 10:32:50 +01:00 |
|
TRT
|
540fe10fa5
|
Moraug: improve AI
|
2021-11-25 09:52:06 +01:00 |
|
Michael Kamensky
|
2af01caaba
|
Merge branch 'aifix' into 'master'
Fix missing triggers
See merge request core-developers/forge!5876
|
2021-11-25 04:18:03 +00:00 |
|
tool4EvEr
|
b8214eb314
|
Improve check
|
2021-11-24 23:19:18 +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
|
b89fa78c19
|
Merge remote-tracking branch 'origin/master' into agetian-master
|
2021-11-24 07:09:39 +03: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 |
|
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 |
|