external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,641 Commits 31 Branches 187 Tags
c1a56f95d21a0cf014d6d8facce8b45e45a729ca
Commit Graph

53641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
50a7437fbd Merge branch 'master' into 'master' 
unused imports

See merge request core-developers/forge!5613
 2021-10-21 07:46:21 +00:00
Anthony Calosa
165a564caf unused imports 2021-10-21 15:45:30 +08:00
paul_snoops
83441c6e75 SLD Edition for missing Stranger Things Card 2021-10-21 08:37:30 +01:00
Michael Kamensky
6cfc5041c7 Merge branch 'master' into 'master' 
[Mobile] Prevent Card Animations when FScrollPane is moving

See merge request core-developers/forge!5611
 2021-10-21 05:25:21 +00:00
Anthony Calosa
a6570491ea Merge remote-tracking branch 'core/master' 2021-10-21 12:40:54 +08:00
Michael Kamensky
7306f69c4a Merge branch 'twosat-master-patch-36825' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!5606
 2021-10-21 04:34:54 +00:00
Michael Kamensky
da838bdb4c Merge branch 'layout' into 'master' 
Add some more modern resolution choices

See merge request core-developers/forge!5608
 2021-10-21 04:34:44 +00:00
Michael Kamensky
b19f01ef8b Merge branch 'gildedrake' into 'master' 
Fix AI refusing Gilded Drake trigger when no targets

See merge request core-developers/forge!5607
 2021-10-21 04:30:40 +00:00
Michael Kamensky
ba3e0c01ea Merge branch 'run-quest-tourney-on-edt' into 'master' 
Fix Quest Tournament not running on EDT

See merge request core-developers/forge!5609
 2021-10-21 04:29:50 +00:00
Michael Kamensky
dc765ed2b2 Merge branch 'hawkins' into 'master' 
hawkins_national_laboratory_the_upside_down.txt

See merge request core-developers/forge!5610
 2021-10-21 04:29:40 +00:00
Anthony Calosa
6179c991a0 fix NPE 2021-10-21 12:18:24 +08:00
Anthony Calosa
8c438261dc [Mobile] Prevent Card Animations when FScrollPane is moving 
- cleaner looks when the user is scrolling through the cards
 2021-10-21 10:10:38 +08:00
Northmoc
627461546a hawkins_national_laboratory_the_upside_down.txt 2021-10-20 21:07:15 -04:00
friarsol
92d5a00750 Fix Quest Tournament not running on EDT 2021-10-20 20:40:32 -04:00
tool4EvEr
cb5cf75e9e Clean up 2021-10-20 23:13:38 +02:00
tool4EvEr
43019b3881 Add some more modern resolution choices 2021-10-20 22:27:36 +02:00
tool4EvEr
e7c9cdb111 Fix AI refusing Gilded Drake trigger when no targets 2021-10-20 22:14:55 +02:00
Andreas Bendel
f75c457e66 Update de-DE.properties 
translated a lot of deck importer related lines
 2021-10-20 18:39:44 +00:00
Michael Kamensky
253cf35841 Merge branch 'SLD' into 'master' 
SLD Extra Life 2021

See merge request core-developers/forge!5605
 2021-10-20 16:33:43 +00:00
Michael Kamensky
15cc56add2 Merge branch 'TRT-master-patch-93812' into 'master' 
Update forge-gui/res/cardsfolder/b/brain_in_a_jar.txt

See merge request core-developers/forge!5604
 2021-10-20 16:33:04 +00:00
Michael Kamensky
50ad8c5204 Merge branch 'flashback' into 'master' 
Flashback reminder remove "extrawurst"

See merge request core-developers/forge!5603
 2021-10-20 16:32:54 +00:00
paul_snoops
96a604d6e9 SLD Extra Life 2021 2021-10-20 16:25:20 +01:00
Bug Hunter
bda03f44cf Update forge-gui/res/cardsfolder/b/brain_in_a_jar.txt 2021-10-20 14:56:36 +00:00
Northmoc
58925880b4 Flashback reminder remove "extrawurst" 2021-10-20 10:20:40 -04:00
Michael Kamensky
898f3e91e0 Merge branch 'evoke' into 'master' 
tidy up non-mana Evoke costs

See merge request core-developers/forge!5602
 2021-10-20 14:07:55 +00:00
Michael Kamensky
a49ab3828e Merge branch 'imp' into 'master' 
maddening_imp.txt streamline with IsTriggerRemembered

See merge request core-developers/forge!5601
 2021-10-20 14:06:54 +00:00
Northmoc
d51de2a1a1 tidy up non-mana Evoke costs 2021-10-20 10:01:50 -04:00
Northmoc
53670a4dd7 maddening_imp.txt streamline with IsTriggerRemembered 2021-10-20 09:09:20 -04:00
Michael Kamensky
e8d229e3a2 Merge branch 'fix' into 'master' 
surtland_elementalist.txt restrict play ability

See merge request core-developers/forge!5600
 2021-10-20 12:38:52 +00:00
Northmoc
8c25623ffc surtland_elementalist.txt restrict play ability 2021-10-20 08:25:17 -04:00
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
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
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
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