gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
4,093 Commits 53 Branches 176 Tags
7c3cc527f681757763edafd3a6aa60ac48fa499c
Commit Graph
4093 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ctrlaltcaandGitHub 7c3cc527f6 fix windows style (#3739) 2019-06-01 16:08:44 +02:00
ctrlaltcaandZach H 218aec07f8 Split buttons in the deck editor (#3709) 2019-05-31 11:54:32 -04:00
ctrlaltcaandZach H ada13f6578 Card Database converter (#3694) 
* Database converter

* Fix win compilation and NSIS installer

* Maybe fix windows again

* Re-fix windows
 2019-05-31 11:48:30 -04:00
Rob Blanckaertandctrlaltca 8682367b52 View hand window (#3731) 
* Roar

* Add View Hand menu to player

* Add shortcut

* reorder right click menu
 2019-05-31 16:53:24 +02:00
tooommandctrlaltca a80f3b77da use Qt 5.12 LTS (#3732) 2019-05-30 12:02:10 +02:00
tooommandctrlaltca fd8bf66acd style (#3728) 2019-05-27 21:17:57 +02:00
ctrlaltcaandtooomm 115ed78059 Update Translations (#3717) 
* Extract new strings from translations

* fetch new translations
 2019-05-10 23:13:34 +02:00
ctrlaltcaandGitHub 00ca69fced Add v4 xsd (#3710) 2019-05-09 09:38:52 +02:00
ctrlaltcaandGitHub 6c21855f98 Token dialog fixes (#3711) 
* Token dialog fixes

* clangify

* edit custom tokens

* Fix in-game token dialog
 2019-05-09 09:37:27 +02:00
ebbit1qandctrlaltca 3830c85ce6 skip more cards (#3715) 
closes #3713
 2019-05-09 09:37:04 +02:00
ctrlaltcaandGitHub 0dc4cc7e03 propose to save deck before loading a new one; fix #3699 (#3707) 2019-05-05 22:38:53 +02:00
ctrlaltcaandGitHub 8f5bfd1f87 Oracle: skip cards with a star in the collectors' number (#3706) 
* Oracle: skip cards with a star in the collectors' number

* clangify
 2019-05-05 22:38:31 +02:00
ctrlaltcaandGitHub 95d6efcdbf Dont create dummy card infos for unkown cards (#3708) 2019-05-05 22:37:48 +02:00
skwerlmanandZach H 63cf0ae764 Fail cmake if protoc doesn't exist (#3705) 
fix #3704
 2019-05-04 23:33:38 -04:00
tooommandZach H f1e79707e8 work around confusing new default badge label (#3701) 2019-05-01 17:29:15 -04:00
ebbit1qandZach H 9073cb53a8 add !sflang! property for card image urls (#3670) 
update translations
add translation for the sflang property to supported languages
 2019-04-18 13:01:50 -04:00
skwerlmanandZach H d018070891 Fix cipt check for shock lands (#3678) 
* Fix #3410

The oracle text for shock lands has changed such that they no longer get `cipt`. This fixes that.

* fix whitespace

* use shorter check
 2019-04-09 13:12:15 -04:00
tooommandZach H 837924b819 reword (#3682) 2019-04-06 23:12:21 -04:00
tooommandZach H 00cfb1347a Update ISSUE_TEMPLATE.md (#3679) 2019-04-04 14:52:48 -04:00
ctrlaltcaandZach H 0ce2e61db9 Fix filters (#3676) 2019-04-02 23:02:34 -04:00
ebbit1qandZach H 1854e3440b add ci: filter for color identity to help page (#3673) 2019-03-27 22:57:12 -04:00
ebbit1qandZach H a0260eb0b2 add italian renaissance to nonenglish sets (#3672) 2019-03-27 22:56:52 -04:00
ebbit1qandZach H c874f201c3 add a bunch of parents to dialogs (#3658) 
* add a bunch of parents to dialogs

works on #3651

* use game as parent instead

* add more parents

* fix create token dialog modality

* add parent to game information window

* replace a bunch of nullptrs with the magic of sed

* add parent to tip of the day and counters

* reorder game ptr

* set parent for life counter

* clangify
 2019-03-26 14:54:47 -04:00
tooommandZach H 7072f24103 update link (#3665) 
repo got moved
 2019-03-22 16:11:36 -04:00
ebbit1qandZach H eb4914d36f include a list of priorities for maincardtypes in oracle (#3663) 
fix #3662
 2019-03-16 15:00:34 -04:00
James Le CuirotandZach H 6d27631764 Add USE_CCACHE option to CMake so that ccache can be forcibly disabled (#3661) 2019-03-14 16:19:55 -04:00
Rob BlanckaertandGitHub a522255baf - Chnage some hard-coded colors to take into account their background. (#3654) 
- Change some SVGs from black to white if their background is too dark.
 2019-03-13 16:11:30 -07:00
ebbit1qandctrlaltca 7eb2e36740 workaround for foreign card arts getting priority by default (#3652) 
fixes #3623
 2019-03-12 10:12:31 +01:00
ctrlaltcaandebbit1q 2d8f01b2e9 Show current counter value on "set counter" dialog (#3650) 
* fix point 10 of issue #655

* clanfigyism
 2019-03-11 00:33:19 +01:00
ctrlaltcaandGitHub 6f95556632 Fix related cards menu in deck editor (#3649) 2019-03-10 23:15:24 +01:00
ctrlaltcaandGitHub 0326f0d4c9 Permit use of up/down keys to increment/decrement counter value; Fix #3618 (#3646) 
* Fix #3618

* clanfigy me softly

* fix unused var and params

* Frce the dialog being modal; ensure self deletion

* More qt-like behavior

* Restore dialogSemaphore logic
 2019-03-10 22:22:19 +01:00
ctrlaltcaandGitHub 389f7fdc25 Shortcuts preference pane (#3641) 
* Shortcuts preference pane

* Honor and glory to the hypnoclangifier

* clanfigy: exclude deleted files from being checked

* keep the olf translation context to be able to reuse old translations

* Fix gcc; extract translations

* Moved generic buttons after the groupbox

* Update current item on "clear/reset all"

* Sequenceedit: make buttons larger and translatable, add text

* Event filter

* Don't filter arrow keys; added placeholder text

* group counters
 2019-03-10 21:49:33 +01:00
ebbit1qandctrlaltca 11b2942d09 try to use fabs instead of abs to see if flatpack cares (#3638) 2019-03-10 18:49:18 +01:00
ctrlaltcaandGitHub 52cc725de4 Fix crash on card relation to inexistent card; fix #3637 (#3640) 
* Fix crash on card relation to inexistent card; fix #3637

But that whole loop is a logic mess

* Check if related cards exists before creating the menu entry

* honor and glory to the hypnoclanfigier
 2019-03-10 18:47:24 +01:00
Rob BlanckaertandZach H a304d4235d Fix #3614 (#3633) 2019-03-07 22:48:03 -05:00
tooommandZach H 4d7024e066 version bump to 2.7.1 (#3635) 2019-03-07 22:47:41 -05:00
Rob Blanckaertandctrlaltca 4ce928eb41 Allow more characters in bare searches (#3632) 2019-03-07 12:21:30 +01:00
Rob Blanckaertandctrlaltca b172172be1 Fix #3587 (#3634) 2019-03-07 12:21:08 +01:00
ctrlaltcaandZach H 5fd86954d6 fix #3621 (#3628) 2019-03-06 19:18:19 -05:00
Rob BlanckaertandZach H 55c4207182 Fix related cards popup (#3613) 2019-03-04-Release-2.7.0 2019-03-04 02:19:37 -05:00
ebbit1qandZach H 440311c939 set word wrapping (#3612) 
fix #3605
 2019-03-04 02:17:33 -05:00
Zach Halpern 81059fa3d8 translations 2019-03-04 01:49:43 -05:00
Zach Halpern 9f856acba0 revert 
Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-03-04 01:34:13 -05:00
Zach Halpern 69474bad22 revision version 2019-03-04 01:33:49 -05:00
ebbit1qandZach H fafdb65453 prioritize creature on maincardtype (#3611) 2019-03-04 01:32:19 -05:00
Rob BlanckaertandZach H 477faafb84 Adjust fontsize up on highdpi displays (#3610) 2019-03-04 01:32:09 -05:00
ebbit1qandZach H abe4f5ca60 don't remove pt! 🔥🔥🔥🔥 (#3606) 
* don't remove pt! 🔥🔥🔥🔥

* apply water to burns

* clangify

* fix clientside

* clangify

* missed qdebug

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-03-04 00:55:54 -05:00
Rob BlanckaertandZach H a86aeb00c5 Fix 3598 (#3607) 
* Fix 3598

* spelling
 2019-03-03 22:03:35 -05:00
Zach HandGitHub 754b9bdc5a Won't change if autoconnect enabled (#3602) 
* Only will auto-select RR if autoconnect is not checked off.

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* Only will auto-select RR if autoconnect is not checked off.

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* On disconnect, un-check autoconnect. Better naming.

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-03-03 21:57:48 -05:00
Rob BlanckaertandZach H 5a3f2fcff7 Allow /\ in simple searches. (#3604) 2019-03-03 21:48:20 -05:00