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

Merge branch 'master' into cccolors

Browse source
This commit is contained in:
Basile Clement 2025-05-11 15:37:50 +02:00 • committed by GitHub
commit f29896d807
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
71 changed files with 865 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/dialogs/dlg_settings.h
View file

@ -149,6 +149,7 @@ private:
QCheckBox clickPlaysAllSelectedCheckBox;
QCheckBox playToStackCheckBox;
QCheckBox closeEmptyCardViewCheckBox;
QCheckBox focusCardViewSearchBarCheckBox;
QCheckBox annotateTokensCheckBox;
QCheckBox useTearOffMenusCheckBox;
QCheckBox tapAnimationCheckBox;
@ -157,6 +158,8 @@ private:
QComboBox visualDeckStoragePromptForConversionSelector;
QCheckBox visualDeckStorageInGameCheckBox;
QCheckBox visualDeckStorageSelectionAnimationCheckBox;
QLabel defaultDeckEditorTypeLabel;
QComboBox defaultDeckEditorTypeSelector;
QLabel rewindBufferingMsLabel;
QSpinBox rewindBufferingMsBox;
QGroupBox *generalGroupBox;