Commit Graph
5951 Commits
Author SHA1 Message Date
tooommandGitHub 14618bc2ce Merge branch 'master' into tooomm-qt5 2026-04-15 20:37:45 +02:00
832f70496a [EDHRec] Fix unintentional navigation on card right click (#6814)
Don't double emit cardClicked and also pass along the mouseEvent so we can check if it's a left or right click.

Took 26 minutes

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2026-04-15 14:14:30 +02:00
tooommandGitHub 91e3907ba0 Try qt6-l10n-tools 2026-04-15 07:17:21 +02:00
ebbit1qandGitHub f97864b72b set the minimum qt6 version to 6.4 (#6811)
* set the minimum qt6 version to 6.4

this will be separate from the qt5 removal after release

* add include for optional
2026-04-14 00:59:46 +02:00
ebbit1qandGitHub 338c56678a add workaround for windows11 theme (#6810) 2026-04-13-Development-2.11.0-beta.59 2026-04-13 14:49:31 +02:00
Jeremy LettoandGitHub 8cc65b8967 Initial implementation completion and refactor (#6806) 2026-04-11 23:51:10 -04:00
ebbit1qandGitHub 2e10b2f5d5 make general settings scrollable (#6800) 2026-04-12 02:38:04 +02:00
ebbit1qandGitHub 92fe406c22 remove break statement when closing views (#6801)
it's possible that multiple views need to be closed
this is an oversight of #4570
2026-04-12 02:37:43 +02:00
tooommandGitHub d677e2bb70 Print success msg if cache deletion did succeed (#6802) 2026-04-12 02:37:30 +02:00
ebbit1qandGitHub e977f123ce add ccache eviction for files older than 7 days (#6795)
* add ccache eviction for files older than 7 days

also clean up some of the scripts to be more internally consistent

* move name build into the docker container again

* remove one extra empty line [skip ci]

* allow canceling concurrent builds on master for both desktop and docker

* add ccache eviction age to macos as well
2026-04-11 19:18:12 +02:00
tooommandGitHub f56b672307 CI: Allow failing of ccache deletion step (#6799)
* Don't fail cache delete step

* Use `continue-on-error`

* remove leftover
2026-04-11 18:20:35 +02:00
tooommandGitHub 29c1d7f3e4 add timeout to job matrixes (#6797) 2026-04-11 18:19:11 +02:00
tooommandGitHub e65271c434 Update translations-push.yml 2026-04-11 16:52:17 +02:00
tooommandGitHub 1cc3d8c588 Update translations-push.yml 2026-04-11 16:51:17 +02:00
tooommandGitHub fec725513f try linguist-qt6 2026-04-11 16:41:07 +02:00
tooommandGitHub b1e1bbc9c7 Update translations-push.yml 2026-04-11 16:28:18 +02:00
tooommandGitHub 3d57e6e7c5 Update translations-push.yml 2026-04-11 16:27:04 +02:00
tooommandGitHub d6ef1dd111 Update translations-push.yml 2026-04-11 16:13:46 +02:00
tooommandGitHub 45f2579e21 Update translations-push.yml 2026-04-11 16:06:09 +02:00
tooommandGitHub 6a0384c175 qt5 2026-04-11 14:52:00 +02:00
ebbit1qandGitHub 36aba81b1b adds eternal to prioritisation list (#6793) 2026-04-10 18:18:08 +02:00
ebbit1qandGitHub f9fb03b26b update all runners to use qt6.11 (#6794)
* update all runners to use qt6.11

* use aqt version directly from repo
2026-04-10 18:17:43 +02:00
ebbit1qandGitHub d2732ac742 fix prepare cards (#6792) 2026-04-10 13:42:05 +02:00
transifex-integration[bot]GitHubtransifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
9aa5702e14 Translate cockatrice_en@source.ts in en_US (#6783)
100% translated source file: 'cockatrice_en@source.ts'
on 'en_US'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2026-04-09 21:27:14 +02:00
ebbit1qandGitHub 2d412bfe52 fix cardloading on qt5 (#6790) 2026-04-09 21:16:38 +02:00
RickyRisterandGitHub ac06fb9d1c [Game] Fix crash by properly parenting QObjects (#6788) 2026-04-09 15:02:00 +02:00
d7b31f2f9d Set OracleWizard style to "Modern" instead of "Aero" (#6778)
* Use fusions own palette.

Took 6 minutes

* Start from default palette always.

Took 4 minutes

* Add modern style.

Took 24 seconds

* Scope this fix to Windows.

Took 4 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2026-04-07-Development-2.11.0-beta.58
2026-04-07 15:58:42 +02:00
635fae101d Use palette colors for resizable panel stylesheets. (#6782)
Took 7 minutes

Took 5 seconds

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2026-04-07 15:57:03 +02:00
335022c4aa Include themes (#6781)
* Properly reset default theme.

Took 9 minutes

* Descend in preference on windows.

Took 9 minutes

* Also reset style for custom themes.

Took 3 minutes

* Try things

Took 9 minutes

* Add modern windows style.

Took 8 minutes

* Update theme_manager.cpp

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
2026-04-07 15:02:00 +02:00
Bruno Alexandre RosaandGitHub dbed6890da feat: support expressions when setting card counters (#6753)
* feat: enable expressions in card counters

* fix includes

* fix multiple selection

* cleanup useless conversions

* const ref where possible

* do not use const, be consistent with local patterns in the file
2026-04-06 22:36:45 -07:00
ebbit1qandGitHub 3ec9ae9772 fix compiling on arch (#6768)
* fix compiling on arch

* redo all the logging in affected files
2026-04-05 21:52:46 +02:00
tooomm fcfd188ae8 update min versions 2026-04-05 13:48:00 +02:00
tooomm 39f663aaaa min Qt 6.4 2026-04-04 18:55:23 +02:00
tooomm 288a408bb0 qt5 2026-04-04 18:30:46 +02:00
tooomm 3654b25333 Qt5 2026-04-04 15:33:01 +02:00
RickyRisterandGitHub a46ab5cd68 [Game] Allow uppercase X in expressions (#6767) 2026-04-04 11:40:38 +02:00
SlightlyCircuitousandGitHub 690a00aa6c Add Ubuntu 26.04 "Resolute Racoon" build (#6766)
* Create 26.04 Dockerfile

* Update desktop-build.yml

* Update release_template.md

* Add ca-certificates package to build
2026-04-03 20:40:42 +02:00
tooommandGitHub ba786a0289 Update dependabot.yml (#6756) 2026-04-01 14:54:27 +02:00
github-actions[bot]andGitHub 9dfac77ba2 Update translation source strings (#6762) 2026-04-01 05:49:17 +02:00
tooomm e2c89c2a1a QT_VERSION <6.0 2026-03-31 00:47:30 +02:00
tooomm fa77b696d0 Qt5_FOUND 2026-03-30 23:36:36 +02:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
f3370a4f52 Bump doc/doxygen/theme from 1f36200 to d52eafe (#6751)
Bumps [doc/doxygen/theme](https://github.com/jothepro/doxygen-awesome-css) from `1f36200` to `d52eafe`.
- [Release notes](https://github.com/jothepro/doxygen-awesome-css/releases)
- [Commits](https://github.com/jothepro/doxygen-awesome-css/compare/1f3620084ff75734ed192101acf40e9dff01d848...d52eafe3e9303399fda15661f3d7bb8fe3d7eabc)

---
updated-dependencies:
- dependency-name: doc/doxygen/theme
  dependency-version: d52eafe3e9303399fda15661f3d7bb8fe3d7eabc
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-03-28 07:05:24 +01:00
Bruno Alexandre RosaandGitHub 7caa88bc58 fix: solve deprecated literal operator error by updating peglib (#6745)
* fix: solve deprecated literal operator error

* update peglib

https://github.com/yhirose/cpp-peglib/commit/dcabc63cf4b966eb6f33abd571ae4cda6bf707f0
2026-03-27-Development-2.11.0-beta.57
2026-03-27 18:37:30 +01:00
RickyRisterandGitHub 34a5b8b9ce [SettingsManager] Make setting getters const (#6748)
* [SettingsManager] Make setting getters const

* remove hashGameType from header
2026-03-27 18:13:25 +01:00
tooommandGitHub d8e3807ec5 Dependabot: Enable git submodules tracking (#6727)
* Enable gitsubmodules

* update comment
2026-03-27 18:11:56 +01:00
ebbit1qandGitHub 42bd8164a0 remove hardcoded white in vde banner widget (#6684)
* remove hardcoded white in vde banner widget

* set text color to white on higher opacities
2026-03-27 18:10:29 +01:00
ebbit1qandGitHub abf6e72ad1 add a nulcheck in the card item animation timer (#6740) 2026-03-27 18:08:51 +01:00
RickyRisterandGitHub 74cce5ccb2 [SettingsManager] Properly handle multithreaded access (#6747) 2026-03-27 17:12:49 +01:00
DawnFire42andGitHub dd053c76df [Game] Improve context menus and fix face-down play from stack (#6739)
Reorganize card context menus across table, stack, and graveyard/exile zones for better consistency: promote Draw Arrow and Clone actions, move related card entries to the bottom, add Play/Play Face Down to the stack menu, and flatten if/else blocks with early returns. Also fix playCard() ignoring the faceDown flag when routing instants/sorceries from the stack, which sent them to the graveyard instead of the table.
2026-03-25-Development-2.11.0-beta.56
2026-03-25 15:03:59 -07:00
scotland0208andGitHub 5ef428b9d0 Add visual indicator to toggle untap button (#6737)
* Add visual indicator to toggle untap button

* Rename button to match tooltip

* Change name of string in shortcut settings
2026-03-25 14:15:08 -07:00