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

5598 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Brübach
0579985432 Give me the strength to lint that, which is necessary, and to unlint that, which the IDE has linted by itself. 
Took 5 minutes
 2025-10-08 22:05:12 +02:00
Lukas Brübach
9d868f9c2d Adjust format.sh to include libcockatrice_network 
Took 1 minute
 2025-10-08 22:00:06 +02:00
Lukas Brübach
ed3e627b66 Fix some relative imports. 
Took 32 minutes
 2025-10-08 21:58:55 +02:00
Lukas Brübach
4f1f59e15c Lint. 
Took 2 minutes
 2025-10-08 21:13:08 +02:00
Lukas Brübach
31e57246e6 Update translations? 
Took 19 seconds
 2025-10-08 21:10:58 +02:00
Lukas Brübach
d6db8ba1e3 Remove traces of old /common in oracle and servatrice CMakeLists.txt 
Took 1 hour 8 minutes
 2025-10-08 21:10:39 +02:00
Lukas Brübach
e6497e3254 Fix more includes. 
Took 5 minutes
 2025-10-08 16:20:06 +02:00
Lukas Brübach
c9f3b5c05a Fix an include. 
Took 7 minutes
 2025-10-08 16:14:45 +02:00
Lukas Brübach
a094af27a3 Lint again. 
Took 4 minutes
 2025-10-08 16:07:24 +02:00
Lukas Brübach
7b07326775 Lint. 
Took 3 minutes
 2025-10-08 16:03:40 +02:00
Lukas Brübach
83e8cb2039 Fix an include and only link remote server to servatrice. 
Took 16 minutes
 2025-10-08 16:00:25 +02:00
Lukas Brübach
efa66c5b27 Lint. 
Took 30 seconds
 2025-10-08 15:42:07 +02:00
Lukas Brübach
59c83ff0e2 Adjust servatrice. 
Took 5 minutes


Took 2 minutes
 2025-10-08 15:41:40 +02:00
Lukas Brübach
133c02f973 Move libcockatrice_server to libcockatrice_network/server/remote 
Took 1 hour 41 minutes

Took 39 seconds

Took 4 minutes
 2025-10-08 15:41:37 +02:00
Lukas Brübach
eb7c4cae6c Move pending command, adjust CmakeLists. 
Took 24 minutes
 2025-10-08 15:39:50 +02:00
Lukas Brübach
c5bf87dfed Adjust cmakelists. 
Took 6 minutes
 2025-10-08 15:39:50 +02:00
Lukas Brübach
5414e3e3b5 Move abstract client. 
Took 2 minutes
 2025-10-08 15:39:50 +02:00
Lukas Brübach
4e7c98829a Move local/remote client and local server files. 
Took 32 minutes


Took 8 seconds
 2025-10-08 15:39:50 +02:00
ebbit1q
484e177589 make format excludes be able to be files 2025-10-08 15:22:41 +02:00
ebbit1q
64bbde08b6 format 2025-10-08 15:21:05 +02:00
ebbit1q
fe0e061bfe update format.sh 
heard you like our linter so I updated our linter so you can lint while
you lint your lint
 2025-10-08 14:00:13 +02:00
Lukas Brübach
ca68980521 Revert vcpkg submodule pointer to match upstream/master 
Took 6 minutes
 2025-10-08 10:41:55 +02:00
Lukas Brübach
f6ca68bd84 Fix automatic IDE rename consequence again. 
Took 13 minutes

# Commit time for manual adjustment:
# Took 3 minutes
 2025-10-08 10:38:06 +02:00
Lukas Brübach
1295f528b9 Fix automatic IDE rename consequence. 
Took 2 minutes
 2025-10-08 10:13:11 +02:00
Lukas Brübach
c5072a013b Resolve merge conflicts. 
Took 10 minutes

Took 50 seconds

Took 51 seconds

Took 2 minutes

Took 1 minute
 2025-10-08 10:06:39 +02:00
transifex-integration[bot]
03e32f0a7c
Translate cockatrice/cockatrice_en@source.ts in it (#6228) 
100% translated source file: 'cockatrice/cockatrice_en@source.ts'
on 'it'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
 2025-10-08 02:18:33 +02:00
tooomm
f4361d1b43
CI: More workflow paths updates (#6227) 
* update trigger paths

* change to include paths trigger pattern

* refine selection

* more paths

* fix

* revert push trigger and add hint
 2025-10-08 02:17:02 +02:00
ebbit1q
e1259e67d3
update vcpkg (#6230) 
* update vcpkg

* trigger build workflow on vcpkg changes
 2025-10-08 01:40:52 +02:00
BruebachL
ca1b9bf75f
[PrintingSelector] Sync PrintingSelector availability to OverrideAllCardArtWithPersonalPreference setting. (#6218) 
* [PrintingSelector] Clearly warn users about disabling the providerId change, hide and disable the printingSelector, clear the networkCache.

Took 56 minutes

Took 4 seconds

Took 9 minutes

* Defer rollback so the rollback isn't swallowed logically.

Took 7 minutes

* Immediately enable select printing action.

Took 7 minutes

* Remove restart label.

Took 8 seconds

* Clear PixmapCache as well as NetworkCache.

Took 4 minutes

* Lint.

Took 3 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-10-07 20:59:16 +02:00
ebbit1q
3cff55b0bb
add abstract player in expectance of draft players (#6210) 
* add abstract player in expectance of draft players
 2025-10-07 15:09:30 +02:00
Lukas Brübach
5efaf23de0 Unlint. 
Took 14 minutes
 2025-10-06 00:29:40 +02:00
Lukas Brübach
d6cda96ed5 Include the card attributes pb in player_actions.h 
Took 11 minutes
 2025-10-06 00:15:41 +02:00
Lukas Brübach
e7eb3d2166 Delint something that format.sh doesn't get right for some reason. 
Took 3 minutes
 2025-10-06 00:01:57 +02:00
Lukas Brübach
3fb9689bbb Convert structure to open-std Document P1204R0: Canonical Project Structure 
Took 2 hours 50 minutes
 2025-10-05 23:58:53 +02:00
tooomm
c25b153185
CI: Update trigger paths for desktop workflows (#6223) 
* update trigger paths

* change to include paths trigger pattern

* refine selection
 2025-10-05 16:51:06 +02:00
RickyRister
9c58e6f90f
Don't use vcpkg on local macOS (#6225) 
* Don't use vcpkg on local macOS

* fix typo
 2025-10-05 13:31:46 +02:00
Lukas Brübach
3e0cf97dff Regular linting. 
Took 31 seconds
 2025-10-05 00:34:32 +02:00
Lukas Brübach
33cd0098f8 Finally, CMake linting. 
Took 11 minutes

Took 4 minutes
 2025-10-05 00:33:46 +02:00
Lukas Brübach
ecfcc078c4 Lint. 
Took 37 seconds
 2025-10-05 00:09:19 +02:00
Lukas Brübach
18ac296dac Link tests against libs (yay!) and fix up includes that slipped through the crack. 
Took 9 minutes
 2025-10-05 00:08:42 +02:00
Lukas Brübach
60c6eb1110 Fix wrapper include path. 
Took 5 minutes
 2025-10-04 23:59:13 +02:00
Lukas Brübach
4881e084a8 Add the subdirectory to the wrapper so it gets processed. 
Took 5 minutes
 2025-10-04 23:54:25 +02:00
Lukas Brübach
1d1de904e0 Add a wrapper. 
Took 35 minutes
 2025-10-04 23:49:11 +02:00
Lukas Brübach
e5f23f1906 Legacy protobuf is annoying. 
Took 4 minutes
 2025-10-04 21:31:54 +02:00
Lukas Brübach
fdf08780b3 Try like this. 
Took 8 minutes
 2025-10-04 21:26:31 +02:00
Lukas Brübach
e8bba94be2 Legacy. 
Took 3 minutes
 2025-10-04 21:18:28 +02:00
Lukas Brübach
27c7e42f69 cockatrice_protocol can forward generated pb headers as a target. 
Took 13 minutes
 2025-10-04 21:15:15 +02:00
Lukas Brübach
d946d6a3ec Things don't need to manually include utility headers if they already link against it. Settings should link against utility. Deck_List needs pb generated files. 
Took 10 minutes
 2025-10-04 21:02:19 +02:00
Lukas Brübach
fc4dbfeec4 Don't qt_add_library anywhere :( 
Took 3 minutes
 2025-10-04 20:49:42 +02:00
Lukas Brübach
65b7bfb622 Don't qt_add_library, I guess. 
Took 2 minutes
 2025-10-04 20:46:37 +02:00