jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 22:42:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
5475 commits 48 branches 176 tags 125 MiB
Commit graph

175 commits

Author SHA1 Message Date
Lukas Brübach
7bed1dc908 Background and buttons and styles. 2025-09-11 14:30:21 +02:00
Lukas Brübach
aa5a6222fd Home screen. 
Took 2 hours 18 minutes

Took 9 seconds

Took 23 seconds
 2025-09-11 14:30:21 +02:00
BruebachL
0f11fbe599
Use pinned printing when adding to deck. (#6108) 2025-09-07 00:26:39 -04:00
BruebachL
9c18e99fe2
Correctly reset banner card if none was set but card appears in new deck. (#6107) 2025-09-07 00:26:07 -04:00
BruebachL
6e0a7de9cc
Move quick filters from right to left to be closer to the color filters. (#6106) 2025-09-06 18:11:43 -04:00
BruebachL
b141a65838
Refactor page loading so it's uniform, display every printing from every filtered set instead of just one. (#6105) 2025-09-06 18:11:36 -04:00
BruebachL
7f842bb1e8
Sort VDE groups internally (#6102) 2025-09-06 09:06:59 -04:00
BruebachL
b8dedb568c
Use modelReset from new grouping in deck_list_model in VDE (#6100) 2025-09-05 11:12:30 -04:00
BruebachL
fc5fb956df
Properly allow resizing the printing selector (#6097) 
* Properly allow resizing the printing selector.
* Don't restrict central widget sizing in regular deck editor, don't size hidden widget in visual deck editor.
* Reset layout in VDE properly and introduce new default layout.
* Gives hover signal correct parameters (fix for exact card refactor issue)
 2025-09-04 22:54:07 -04:00
BruebachL
2eba126ed7
Modularize and Doxygen decklist.cpp (#6099) 2025-09-04 22:52:46 -04:00
BruebachL
38f76d449a
Fix providerId cards getting removed from deckList by convenience replacement function (#6074) 
Took 2 hours 25 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-08-15 01:11:02 -04:00
RickyRister
3a42354efd
Refactor: Move files in src/client/game_logic (#6070) 
* move abstract_client to src/server

* move key_signals to src/utility
 2025-08-07 16:47:48 +02:00
RickyRister
ae2c55c33b
Refactor: use ExactCard to represent specific printings (#6049) 
* Create new class

* Update CardInfo and CardDatabase

* Use new class instead of CardInfoPtr

* fix cmake
 2025-07-28 21:04:45 -04:00
RickyRister
ae47ee802b
Refactor: Add PrintingInfo::getUuid (#6046) 2025-07-17 09:06:34 -04:00
RickyRister
70b4843bc4
Refactor: clean up CardDatabase pt2 (#6042) 
* findPrintingWithId

* remove a param

* cleanup up usage of getCardInfo
 2025-07-16 06:33:38 -04:00
RickyRister
a9b3be33e0
Refactor: Represent cardName + providerId with CardRef struct (#6039) 
* card_ref.h

* update CardDatabase signatures

* make everything compile

* rename methods

* add docs

* mark stuff const

* set cardRef in CardItem

* cleanup

* fix build failure

* Fix builds on mac

---------

Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>
 2025-07-15 22:14:02 -04:00
BruebachL
ee4ff6e732
Allow more naming schemes for custom pictures (#6021) 
* Allow more naming schemes for custom pictures.

Order is cardName_providerId, cardName_setName_collectorNumber, setName-collectorNumber-cardName and then just generically cardName, if the user has decided to override every printing. Most-to-least specific.


Took 2 minutes

Took 8 seconds

* Fixups.

Took 2 minutes

* Even more naming schemes.

Took 6 minutes

* Finally yeet the bug warning in PrintingSelector

Took 3 minutes

* Adjust to PrintingInfo change.

Took 5 minutes

* Don't use suffixes.

Took 7 minutes

Took 9 seconds

* Comments.

Took 2 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-07-14 23:07:03 -04:00
BruebachL
836e168a6c
Properly and consistently capitalize EDHRec (#6027) 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-07-09 17:55:04 -04:00
RickyRister
a9684f67cc
Refactor: rename CardInfoPerSet to PrintingInfo (#6024) 
* remove unnecessary consts

* removed unused

* rename class

* rename variables and methods

* rename again

* rename variables again

* rename field

* run formatter
 2025-07-07 23:41:19 -04:00
BruebachL
2dfe9fcf45
Add as set instance on subsequent loads as well. (#6013) 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-07-01 15:29:48 -04:00
BruebachL
53e27ff4d3
Printing Selector Bulk Editor (#5993) 
* Bulk editing dialog.

* Bulk editing dialog functionality.

* Performance fixes, hide sets which can't offer any new cards, better dragging indicators.

* Update count label.

* Add a display for modified cards.

* Include long setName in checkbox label

* Fix drag & drop.

* New layout updating?

* Re-layout, add instruction label.

* Qt version check.

* Add buttons to clear and set all to preferred printing.

* tr UI

* Add the button to the print selector instead.

* Qt5 compatibility stuff.

* Qt5 compatibility stuff again.

* Toggled works, I guess.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-06-21 21:15:48 -04:00
BruebachL
d5dc70ccee
More granular decklist signals (#5981) 
* Performance stuffs.

* Actually make widgets track their indices.

* Functional stuff.

* More display stuff.

* Determine where we will insert the card before actually inserting it in the model.

* Allow overlap layouts to insert widgets at specific positions.

* Modified signals.

* Raise trailing widgets on overlap layout widget insertion.

* Nix the logging config changes.

* Lint.

* Address comments.

* Address comments.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-06-13 13:21:34 -04:00
BruebachL
c388cee1fe
Add a new dialog that allows editing the default suggested tags. (#5979) 
* Add a new dialog that allows editing the default suggested tags.

* Lint.

* Actually hand linting, lol.

* Fix Build

* Add dialog.

* Use show() instead of exec(), properly size hint list item widgets.

* Fix... something to do with the build?

* Cast to abstract tab deck editor instead of regular.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>
 2025-06-13 09:16:57 -04:00
BruebachL
f059643187
[Picture Loader] Consider local images, remove some unused variables. (#5985) 
* Consider local images, remove some unused variables.

* Move checking for local card images outside of card download loop, add NOT found debug line.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-06-13 08:54:43 -04:00
RickyRister
7e08f7df67
[VDS] Remove searchFolderName setting (#5970) 
* [VDS] Remove searchFolderName setting

* rename property in ExtraDeckSearchInfo
 2025-06-12 20:45:01 -04:00
BruebachL
a688a5fe72
[VDD] Filter performance (#5974) 
* Sort saved filters by name.

* Optimize performance, allow loading name filters from clipboard.

* Fix include.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-06-12 19:47:03 -04:00
BruebachL
fe57efb1a8
Parallel picture loader (#5977) 
* Parallelize picture loader.

* Queue requests instead.

* Include a status bar for the picture loader.

* Save redirect cache on destruction.

* Address comments.

* Let's not overwrite an ambigious variable name.

* Lint.

* Oracle needs the status bar too.

* We actually get a free request if we hit a cached image.

* Fix cmake list.

* toString() the url.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-06-12 19:44:38 -04:00
BruebachL
9af3fbc35f
Propagate display type from visual deck editor to card group display widget correctly on initialization. (#5978) 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-06-12 19:37:57 -04:00
RickyRister
7495d2dc65
[VDS] Use display name for generic search expression (#5976) 2025-06-12 19:32:24 -04:00
RickyRister
46643065ef
Refactor banner card ComboBox (#5947) 2025-05-18 22:06:18 -04:00
BruebachL
cfbe59868b
[VDS] Add prompt before overwriting existing files when converting to .cod (#5926) 
* Add prompt before overwriting existing files.

* Lint.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-17 22:25:13 -04:00
RickyRister
1eee314d17
[VDS] Add ability to search by deck contents (#5943) 
* [VDS] Add ability to search by deck contents

* add deck search syntax help

* fix build failure
 2025-05-17 22:23:54 -04:00
RickyRister
5dd027ad63
[VDS] Deselect tag if clicked while already selected (#5944) 2025-05-16 14:39:33 -04:00
RickyRister
d51620640b
[VDS] Add setting to show deck filepath in tooltip (#5899) 
* [VDS] Show deck filepath in tooltip

* Make tooltip type into a setting

* Fix build failure
 2025-05-12 17:39:58 -04:00
BruebachL
17c767fa42
[GDE] Add a group criteria to the deck list model (#5931) 
* Add a group criteria to the deck list model and a combo box to the deck dock widget to change it.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-12 17:36:55 -04:00
BruebachL
9cf979d154
[GDE/VDE] More granular modification signals. (#5927) 
* More granular modification signals.

* Bruh.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-08 21:32:00 -04:00
RickyRister
033c8b269d
[VDS] Refactor: move quick settings to separate class (#5905) 2025-05-06 23:00:11 -04:00
RickyRister
c4e42b94f9
Refactor CardSizeWidget: don't update setting directly (#5903) 2025-05-06 21:31:01 -04:00
BruebachL
99d9ce10c3
[GDE, VDS & VDE] Tooltips and labels (#5916) 
* Add correct inversion for isHidden() on bannerCardLabel.

* Add tooltips to VDS buttons.

* Add tooltip to GDE button.

* Add tooltips to visual deck editor buttons.

* Add tooltips to visual database display buttons.

* Lint.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-06 21:28:50 -04:00
BruebachL
34400c7f60
[VDE] Sample Hand Improvements (#5917) 
* Actually call retranslateUi, add spinBox to change sample hand size, add card size slider.

* Lint.

* Fix include.

* Fix include again.

* Fix overloads.

* Update visual_deck_editor_sample_hand_widget.cpp

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: Zach H <zahalpern+github@gmail.com>
 2025-05-06 21:28:03 -04:00
BruebachL
bddb54ef4c
[VDE] Deck analytics visibility (#5919) 
* Add scrollArea, I guess.

* Set mana curve bar color to grey for visibility.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-06 21:24:24 -04:00
BruebachL
46e146b34a
[VDS] Allow tags to toggle to a NOT state to hide non-matching decks (#5920) 
* Allow excluding tags.

* Lint.

* My linter is broken, don't ask.

* Zzz.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-06 21:23:49 -04:00
BruebachL
f16ba6861b
Forward scroll event to scrollable parents if possible in NoScrollFilter. (#5921) 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-06 21:22:37 -04:00
BruebachL
fb6af544e2
Set Banner Card again when restoring index on deckList data changes. (#5922) 
* Set Banner Card again when restoring index on deckList data changes.

* Lint.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-06 21:20:38 -04:00
BruebachL
9ae6357c34
Properly manage hover-zoom child widget in CardInfoPictureWidget destructor. (#5900) 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-03 20:03:53 -04:00
BruebachL
700feb68af
Don't require .svg for mana symbols. (#5897) 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-05-02 14:34:41 -04:00
BruebachL
873e0d346e
Make a setting for filtering to the most recent sets. (#5865) 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-04-20 14:39:20 +00:00
RickyRister
44ac782978
Move card_item and related to src/game/board (#5867) 
* move files

* update includes

* update cmake
 2025-04-20 14:37:52 +00:00
BruebachL
dcbb8bab75
[VDD] Defer filter tree assignment (#5864) 
* RetranslateUi instead of updating filter mode.

* Defer setting the filter tree on the database display model until AFTER all the filter widgets are initialized.

* Update visual_database_display_set_filter_widget.cpp

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: Zach H <zahalpern+github@gmail.com>
 2025-04-20 04:17:25 +00:00
BruebachL
acd9a163f0
[VDD] Saner and more performant color filtering, allow deleting specific filter from filterTree (#5863) 
* Saner and more performant color filtering.

* Update visual_database_display_color_filter_widget.cpp

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: Zach H <zahalpern+github@gmail.com>
 2025-04-20 04:15:28 +00:00