jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-19 08:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
5062 commits 48 branches 176 tags 126 MiB
Commit graph

5062 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZeldaZach
24d7d0725c
Address Comments 2025-01-25 17:11:23 -05:00
Zach H
2afc4aa3a3
Merge branch 'master' into edhrec-tab 2025-01-24 22:21:13 -05:00
BruebachL
ce416df3fb
Add a dialog to prompt user to convert to .cod format if trying to apply tags to a .txt deck. (#5514) 
* Add a dialog to prompt user to convert to .cod format if trying to apply tags to a .txt deck.

* Lint mocks.

* Address comments, move dialog to appropriate folder.

* Unlint.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-01-25 03:20:30 +00:00
BruebachL
4e96157091
Flow Layout fixes (#5515) 
* Flow Layout fixes.

* Remove some comments.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-01-25 03:17:39 +00:00
RickyRister
f428148f64
Allow offline Deck Storage tab (#5518) 
* make deck storage tab no longer close on disconnect

* add method for clearing remote decklist model

* handle connect/disconnect in deck storage tab
 2025-01-25 03:16:40 +00:00
RickyRister
e8b1e3ef0c
don't autoclose card view if single card gets dragged into same zone (#5517) 
* rename canResize param to toNewZone

* pass toNewZone down

* don't autoclose card view if card gets dragged into same zone
 2025-01-25 02:08:28 +00:00
RickyRister
085f0dd26c
reduce unnecessary CardItem creation in ViewZone addCard process (#5513) 2025-01-24 05:13:08 +00:00
Lukas Brübach
e679bb2e2f Fix a merge conflict. 2025-01-23 18:01:26 +01:00
Lukas Brübach
dcf9d062e2 Override mousePressEvent 2025-01-23 17:57:50 +01:00
Lukas Brübach
a0222202e5 Include QDebug. 2025-01-23 17:57:50 +01:00
Lukas Brübach
11a3af6036 Include QRegularExpression. 2025-01-23 17:57:50 +01:00
Lukas Brübach
ba193d8cc5 Revert local compatibility fix. 2025-01-23 17:57:50 +01:00
Lukas Brübach
e8844ff896 Lint more. 2025-01-23 17:57:50 +01:00
Lukas Brübach
042bfdac0a Lint. 2025-01-23 17:57:50 +01:00
Lukas Brübach
280d1aca26 Change splitter size, include some colored labels. 2025-01-23 17:57:50 +01:00
Lukas Brübach
cb71b33a2b Add a splitter and a list view to jump to the card list displays. 2025-01-23 17:57:50 +01:00
Lukas Brübach
9089eeecf2 Give the banner widget a buddy and the ability to show/hide the buddy when clicked. 2025-01-23 17:57:49 +01:00
Lukas Brübach
b80acd9864 Make the banner snazzier. 2025-01-23 17:57:49 +01:00
Lukas Brübach
364865487a Distinguish between looking up a card as a commander and a card. 2025-01-23 17:57:49 +01:00
Lukas Brübach
276a8fa335 Add right click menu to add cards to open deck editor tabs from CardInfoPictureWidget. 2025-01-23 17:57:49 +01:00
Lukas Brübach
002f83cbb9 Things and stuff 2025-01-23 17:57:49 +01:00
Lukas Brübach
37c8f4245d Proper solution TM 2025-01-23 17:57:49 +01:00
Lukas Brübach
06099000c5 A somewhat workable solution (that still doesn't downsize correctly) 2025-01-23 17:57:46 +01:00
Lukas Brübach
14229666e3 FlowWidget debugging. 2025-01-23 17:57:39 +01:00
Lukas Brübach
a8b7fb91e4 Commander details display widget. 2025-01-23 17:57:34 +01:00
Lukas Brübach
f2e2d9ec5b EDHREC in client mockup. 2025-01-23 17:57:34 +01:00
Lukas Brübach
0f32dada15 EDHREC in client mockup. 2025-01-23 17:57:34 +01:00
Lukas Brübach
402d2f8776 Flow Layout fixes. 2025-01-23 17:57:14 +01:00
BruebachL
1d2ab8d3d3
Convert lastLoaded timestamp into proper QDateTime for correct comparison. (#5506) 
* Convert lastLoaded timestamp into proper QDateTime for correct comparison.

* Reintroduce null check.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-01-22 12:58:19 +00:00
RickyRister
66e2e7a473
add missing override and explicit specifiers to all classes in src/game (#5511) 2025-01-22 12:57:56 +00:00
RickyRister
af161f00b7
Remove spacing in CardInfoWidget caused by invisible view transformation button (#5510) 2025-01-22 12:55:21 +00:00
RickyRister
420cca2402
fix after merge to use ZoneView::close (#5509) 2025-01-20 22:43:05 -05:00
RickyRister
97fdf11c8f
Add setting to auto close card view when empty (#5502) 2025-01-21 03:08:01 +00:00
RickyRister
aeb1b9fb4f
Fix segfault when game is closed while card view window is open (#5507) 2025-01-21 03:06:55 +00:00
RickyRister
b004e91aa4
fix segfault when bottoming card in deck view (#5508) 2025-01-21 03:06:00 +00:00
Zach H
090cc8c144
Support more indices (#5503) 2025-01-20 01:42:24 -05:00
tooomm
0467fae51b
Add label to swap button (#5501) 2025-01-19 17:26:25 +00:00
BruebachL
aa24502129
Move logging from QDebug to QCDebug and introduce LoggingCategories. (#5491) 
* Move logging from QDebug to QCDebug and introduce LoggingCategories.

* Lint.

* Unlint like one change.

* Remove .debug category since this is autofilled by Qt and used to differentiate between QCDebug and QCWarning and QCError.

* Uncomment defaults, include main category.

* Make PictureLoader logging a bit more useful.

* Lint...?

* Address comments.

* Clean up some unnecessary classes in logging statements.

* Add a new message format to the logging handler.

* Lint.

* Lint.

* Support Windows in Regex

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>
 2025-01-19 13:14:23 +00:00
BruebachL
e752578d15
Add a button to easily view the transformed version of a card. (#5498) 
* Add a button to easily view the transformed version of a card.

* Minor reword

* Minor fix

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>
 2025-01-19 12:59:53 +00:00
BruebachL
724db755af
Hide load from remote button in local games (#5499) 
* Hide load from remote button in local games.

* Minor fix

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: ZeldaZach <zahalpern+github@gmail.com>
 2025-01-19 12:59:33 +00:00
BruebachL
ec0caaf421
Give deckList a signal to emit when the tags change and hook up the display widget to that. (#5497) 
* Give deckList a signal to emit when the tags change and hook up the display widget to that.

* Reload from file when loading a visual deck to ensure latest changes propagate to the decklist.

* Eliminate loadVisualDeck and use loadDeckFromFile instead.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
 2025-01-19 12:32:39 +00:00
Zach H
55b490ade0
Generate PDBs for Windows Builds (#5494) 2025-01-18 07:54:01 +00:00
ZeldaZach
1392bdd258
Fix Windows 7 Crash Dump 2025-01-18 00:33:30 -05:00
Zach H
648c96ac3d
Allow Moderators to Grant Replay & Activate in TabAdmin (#5492) 2025-01-18 02:23:24 +00:00
Zach H
d3a1538af3
Fix Windows Crash Reporter (#5493) 
* Fix Windows Crash Reporter

* Fix NSIS template
 2025-01-18 02:23:05 +00:00
RickyRister
2bc71095dd
get UserListProxy from TabSupervisor instead of passing it in the constructor (#5490) 2025-01-17 15:27:52 +00:00
RickyRister
92a903b035
fix chat messages not showing in the client (#5489) 2025-01-17 03:11:13 -05:00
transifex-integration[bot]
cd373edf3d
Translate cockatrice_en@source.ts in pt_BR (#5487) 
100% translated source file: 'cockatrice_en@source.ts'
on 'pt_BR'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
 2025-01-17 07:41:59 +00:00
RickyRister
ca2d438cda
fix sideboard not being re-locked on load deck (#5486) 2025-01-17 05:25:01 +00:00
RickyRister
c148c8df7f
replace foreach macro with standard for each loop (#5485) 2025-01-17 05:18:15 +00:00