jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-15 15:02:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into game-time-part2-checkbox

Browse source
This commit is contained in:
lilyhuang-github 2025-03-25 20:36:38 -04:00 • committed by GitHub
commit dee3d6998f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
87 changed files with 3472 additions and 2613 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dbconverter/CMakeLists.txt
View file

@ -9,6 +9,7 @@ set(dbconverter_SOURCES
../cockatrice/src/game/cards/card_database_parser/card_database_parser.cpp
../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
../cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp
../cockatrice/src/game/cards/card_info.cpp
../cockatrice/src/settings/settings_manager.cpp
${VERSION_STRING_CPP}
)

6
dbconverter/src/mocks.cpp
View file

@ -202,6 +202,9 @@ void SettingsCache::setPrintingSelectorSortOrder(int /* _printingSelectorSortOrd
void SettingsCache::setPrintingSelectorCardSize(int /* _printingSelectorCardSize */)
{
}
void SettingsCache::setIncludeOnlineOnlyCards(bool /* _includeOnlineOnlyCards */)
{
}
void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T /* _navigationButtonsVisible */)
{
}
@ -387,6 +390,9 @@ void SettingsCache::setUpdateReleaseChannelIndex(int /* value */)
void SettingsCache::setMaxFontSize(int /* _max */)
{
}
void SettingsCache::setRoundCardCorners(bool /* _roundCardCorners */)
{
}
void PictureLoader::clearPixmapCache(CardInfoPtr /* card */)
{