external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,372 Commits 31 Branches 187 Tags
2c616670f51c913e69ca18e39c0867c569bf446c
Commit Graph

54372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
7d913685d8 Merge branch 'aifix' into 'master' 
Fix NPE when moving commander created by ApiBased SA (e.g. Hogaak)

See merge request core-developers/forge!5597
 2021-10-20 09:32:16 +00:00
Michael Kamensky
a18546065d Merge branch 'deck-importer-decks-file-format' into 'master' 
Improved support for Unknown cards in DeckImport

See merge request core-developers/forge!5599
 2021-10-20 09:31:35 +00:00
Grimm
419a97affa Delete .gitlab-ci.yml 2021-10-20 09:01:25 +00:00
leriomaggio
87439388db Improved support for Unknown cards in DeckImport 
DeckImport now avoids including non-deck and metadata info in decklist as UnknownText, whilst any line that looks like a card request (i.e. includes a card quantity in the beginning) is interpreted as Unknown card.

This seems a good compromise with showing typo and any mispelling in card list whilst avoiding flooding decklist with unnecessary info.
 2021-10-20 10:47:44 +02:00
Michael Kamensky
0d67e7950e Merge branch 'adventure' into 'master' 
Adventure mode

See merge request core-developers/forge!5584
 2021-10-20 04:54:04 +00:00
Grimm
49f7128240 Restore the adventure merge 
This reverts commit e69cf66ec8.
 2021-10-20 04:54:01 +00:00
Michael Kamensky
2213f7c925 Merge branch 'master' into 'master' 
Slight tweak to ChooseTypeAi

See merge request core-developers/forge!5596
 2021-10-20 04:48:54 +00:00
Michael Kamensky
86431ec6f2 - Slight tweak to ChooseTypeAi 2021-10-20 07:48:21 +03:00
Michael Kamensky
60da1c88f3 Merge branch 'aiETB' into 'master' 
checkETBeffects: be a bit less greedy when facing death

See merge request core-developers/forge!5593
 2021-10-20 04:27:28 +00:00
Michael Kamensky
144a0c6e71 Merge branch 'deck-importer-decks-file-format' into 'master' 
Small Improvements to Deck Importer

See merge request core-developers/forge!5594
 2021-10-20 04:26:59 +00:00
Michael Kamensky
48f894b1ae - Fix shared params lines. 2021-10-20 07:09:00 +03:00
Michael Kamensky
ee0ad5789c Merge branch 'master' into 'master' 
Improve ChooseTypeAi trigger logic

See merge request core-developers/forge!5595
 2021-10-20 04:03:57 +00:00
Michael Kamensky
90d18b3096 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-10-20 07:02:35 +03:00
Michael Kamensky
df2ef8ca8c - Improve ChooseTypeAi trigger logic. 2021-10-20 07:02:16 +03:00
leriomaggio
a67da59564 Unknown/Unrecognised text is not muted anymore and displayed as unknown card. 
Added new entry in language files (ITA already translated too)
 2021-10-20 00:48:02 +02:00
tool4EvEr
3b2ca119db Fix NPE when moving commander created by ApiBased SA (e.g. Hogaak) 2021-10-20 00:06:56 +02:00
leriomaggio
ca45deb935 Added patch to handle corner case with Conspiracy section as formatted in dec files. 2021-10-19 23:32:51 +02:00
tool4EvEr
25e35e3468 checkETBeffects: be a bit less greedy when facing death 2021-10-19 21:24:36 +02:00
Michael Kamensky
445d655dd3 - Consolidate shared parameters in a variable. 2021-10-19 19:35:35 +03:00
Michael Kamensky
dc3c117ba8 Merge branch 'custody' into 'master' 
Custody Battle refactor

See merge request core-developers/forge!5591
 2021-10-19 16:01:38 +00:00
Michael Kamensky
7424f765b0 Merge branch 'twosat-master-patch-42991' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5589
 2021-10-19 15:54:17 +00:00
Michael Kamensky
dae1c33a6d Merge branch 'fix' into 'master' 
fix larder_zombie.txt

See merge request core-developers/forge!5590
 2021-10-19 15:54:13 +00:00
Michael Kamensky
080ed15c28 Merge branch 'aifix' into 'master' 
Fix for Dewdrop Spy

See merge request core-developers/forge!5592
 2021-10-19 15:34:16 +00:00
TRT
0762d0877a Fix for Dewdrop Spy 2021-10-19 17:29:09 +02:00
Northmoc
3fe18188ac custody_battle.txt add AI hint 2021-10-19 10:31:18 -04:00
Northmoc
98af39a140 custody_battle.txt refactor 2021-10-19 10:30:45 -04:00
Andreas Bendel
e37d42efa4 Update de-DE.properties 
translated lblWouldYouLikeInvestigate
 2021-10-19 13:56:59 +00:00
Northmoc
04792a2086 fix larder_zombie.txt 2021-10-19 09:56:22 -04:00
Michael Kamensky
016001fba2 Merge branch 'stranger' into 'master' 
Stranger Things

See merge request core-developers/forge!5556
 2021-10-19 13:49:32 +00:00
Michael Kamensky
d752e6dea3 Merge branch 'aifix' into 'master' 
AttachAi: Add chkAIDrawback for Halvar

See merge request core-developers/forge!5588
 2021-10-19 13:48:55 +00:00
TRT
75b3363a51 Add chkAIDrawback for Halvar 2021-10-19 15:11:09 +02:00
Michael Kamensky
b0e07cd284 Merge branch 'aifix' into 'master' 
Fix Muse Vessel + Hexproof

See merge request core-developers/forge!5587
 2021-10-19 11:31:47 +00:00
TRT
386c30a8ae Fix NPE 2021-10-19 12:56:46 +02:00
TRT
c2d44efbc5 Fix Muse Vessel + Hexproof 2021-10-19 12:05:33 +02:00
Michael Kamensky
cc0d4eedfd Merge branch 'pwcombat' into 'master' 
Smarter check for AI if specific attacker should go for PW

See merge request core-developers/forge!5585
 2021-10-19 04:05:05 +00:00
Michael Kamensky
30416e87ab Merge branch 'fix' into 'master' 
Dragon's Fire tweaks

See merge request core-developers/forge!5586
 2021-10-19 04:04:57 +00:00
Grimm
287b7b7e7c sprites to lowercase and added *.sh + *.command 2021-10-19 02:33:34 +02:00
Grimm
0df58969ad sprites to lowercase and added *.sh + *.command 2021-10-19 02:32:58 +02:00
Grimm
dc0f78205e rename folder so that windows see the rename to lowercase 2021-10-19 02:32:12 +02:00
Northmoc
61673b05f4 support "OptionalGenericCostPaid" 2021-10-18 18:53:56 -04:00
Northmoc
15a3d1ee9d dragons_fire.txt streamline 2021-10-18 18:53:08 -04:00
Northmoc
e6823049c5 will_the_wise.txt 2021-10-18 18:42:57 -04:00
Northmoc
c1df6ddf87 max_the_daredevil.txt 2021-10-18 18:20:10 -04:00
Northmoc
cbaf707822 lucas add AI hint 2021-10-18 18:15:24 -04:00
tool4EvEr
f21c6867c6 Clean up 2021-10-18 23:01:36 +02:00
tool4EvEr
baf89b344c Update script 2021-10-18 22:39:11 +02:00
tool4EvEr
3653b800a4 Multiplayer improvements 2021-10-18 22:15:53 +02:00
tool4EvEr
ae68e6b9b2 Clean up 2021-10-18 22:00:23 +02:00
TRT
ea65f77d16 Simple check for AI if specific attacker should go for PW 2021-10-18 20:49:31 +02:00
Grimm
035976d165 - Removed copy of libgdx gui 
- added shaders to adventure module
- changed build order to build adventure module before desktop to pack it in the same zip but not add it as dependency
- adjusted mobile gui module to support adventure module.
 2021-10-18 20:11:06 +02:00