Commit Graph
3916 Commits
Author SHA1 Message Date
tooommandGitHub a766aa7d8a appveyor: reduce version string to basic info (#3324)
## Short roundup of the initial problem
It was mostly out of date because we have to manually update it with our current version number.
The use of that is suspect anyway, since it only displays in the appveyor build overview.
It also had a redundant info about the branch.

## What will change with this Pull Request?
- remove hard coded version number
- remove branch
- cleanup build trigger from [#3300](https://github.com/Cockatrice/Cockatrice/pull/3300/files#diff-11c909939117928998b102a1fff7d363)
- more readable style

## Screenshots
I did some tests, so don't be confused about the different styles displayed in the history:
<!-- simply drag & drop image files directly into this description! -->
![version](https://user-images.githubusercontent.com/9874850/42664150-876175ac-8639-11e8-9df5-3fdd775440ed.png)
2018-07-13 17:29:16 +02:00
ctrlaltcaandGitHub b61c07a205 Check for both 32 and 64bit cockatrice when uninstalling (#3323) 2018-07-12 23:58:56 +02:00
ctrlaltcaandGitHub c01aad6767 Travis: minor changes (#3321)
Use the xenial version of llvm's toolchain for clang-format
Add qt5.5's websocket library for servatrice
2018-07-11 17:43:33 +02:00
tooommandctrlaltca d0d662f73a switch to xenial (#3320) 2018-07-11 14:52:19 +02:00
Zach HandGitHub 3ae363cf4b force 2.6.1 (#3316) 2018-07-02 21:49:24 -04:00
tooommandZach H 4796110afb updates (#3311) 2018-06-29 16:06:55 -04:00
ctrlaltcaandGitHub dc727cb620 NSIS: misc fixes [wip] (#3300)
NSIS: misc fixes
2018-06-25 18:34:58 +02:00
David SzaboandZach H 87eb132af1 Tips close with the main window (#3305)
* tips close with main window

* null verification added
2018-06-24 19:37:30 -04:00
ctrlaltcaandZach H 2354a6f89d Fix cards loading bug (#3307) 2018-06-24 17:49:26 -04:00
tooommandZach H 1618e89c41 travis: remove unneeded debug builds on tags for faster release deployment (#3266)
* add hint

* enable condition for debug

* enable new conditions
2018-06-21 19:40:12 -04:00
ctrlaltcaandZach H e223f07462 fix #3235 (#3302) 2018-06-21 18:56:53 -04:00
ctrlaltcaandGitHub f70e87c5a0 Fix #3285 (#3299) 2018-06-19 22:55:01 +02:00
ctrlaltcaandtooomm 0b3e86e307 Fix "reinstall" button in updater, fix #3293 (#3297) 2018-06-19 19:57:44 +02:00
ctrlaltcaandtooomm a5ea4f7da2 Add ability to edit chat macros, Fix #3296 (#3298) 2018-06-19 19:15:13 +02:00
tooommandGavin Bisesi 4e75a74bfd readme: fix linebreaks (#3292)
## Short roundup of the initial problem
Everything was mixed in one single line.

## What will change with this Pull Request?
- introduce line brakes to keep the wanted look

## Screenshots
<!-- simply drag & drop image files directly into this description! -->
before: https://github.com/Cockatrice/Cockatrice/tree/2018-06-17-Release-2.6.0#run
after: https://github.com/Cockatrice/Cockatrice/tree/tooomm-patch-2#run

---

Should the `webatrice` webclient be listed there as well?
2018-06-18 07:58:04 -04:00
Zach HandGitHub c7072cd543 translations push (#3291) 2018-06-17-Release-2.6.0 2018-06-17 18:23:05 -04:00
Zach HandGitHub 5e0bfc3193 translations (#3290) 2018-06-17 18:13:02 -04:00
tooommandZach H b316a5d541 new icons (#3289) 2018-06-17 18:09:58 -04:00
Zach HandGitHub e147bd6cea add feature list requirement (#3287)
* add feature list requirement

* version update

* version bump
2018-06-17 18:06:12 -04:00
David SzaboandZach H d36f86c523 Duplicate cards & empty setlist (#3283)
* Card duplicates handled

* clangify

* kinda works, some cards are still duplicated

* separate card entries grouped together

* clangify
2018-06-16 22:42:22 -04:00
David SzaboandZach H 81803e2612 Search in "Manage sets" window (#3229)
* search field added; sortfilterproxy displayed in treeview

* searching works properly

* moving with filter on works; view isnt't updated yet

* clangify & view updating figured out

* moving disabled when sorting is active

* drag&drop disabled when view sorted

* clangified

* foreach replaced

* button rename & SORT_RESET defined

* changed variable names

* 'x' button added & searchlabel text modified

* 'enabled' column won't grow anymore

* column resize improvement

* button hint & restore original order added

* moving with filter on works; view isnt't updated yet

* sort disable build in column headers (3 clicks)

* codacy fix

* typo + wording

* background color for warning

* buttons moved down a bit

* clicking "default order" button will hide the warning text
2018-06-10 11:00:42 -04:00
Bersandctrlaltca 91b3c7343d fixed 2 warning-errors on archlinux(gcc 8.1): implicit fallthrough, ignored qualifiers (#3270) 2018-06-09 10:28:17 +02:00
ctrlaltcaandGitHub 1276c8dd46 Add -DWARNING_AS_ERROR=1 option to cmake script (#3275) 2018-06-06 08:43:04 +02:00
ctrlaltcaandZach H 89ab7f1f67 Fix #3252 (#3269) 2018-06-02 02:41:10 -04:00
tooommandZach H 664d717e17 skip branches with open pull requests (#3265)
See https://www.appveyor.com/docs/appveyor-yml/
2018-05-28 19:29:19 -04:00
tooommandZach H 494dfc2f4b actCancel remove (#3261) 2018-05-25 21:59:52 -04:00
tooommandZach H 3a05d063af connect dialog: button reworks (#3243) 2018-05-25 21:59:42 -04:00
ctrlaltcaandGitHub f97959febc fix #3257 (#3258) 2018-05-24 15:46:02 +02:00
David Szaboandtooomm b3df71ae41 0 values in power/toughness filters won't match non-zero values anymore (#3250)
## Related Ticket(s)
- Fixes #3212 

## What will change with this Pull Request?
- `0` input on power/toughness filters will only return `0` values
- `relationCheck` method will only get called after simple string comparison failed
- due to their similar structure `acceptPower` and `acceptToughness` methods has been merged
2018-05-24 00:18:53 +02:00
tooommandGitHub ec4a99e47b remove empty languages (#3253)
## What will change with this Pull Request?
- cleanup of empty and unused languages files (catalan, lithuanian, hebrew, ukrainian)
- reflect language removing on transifex
2018-05-23 10:32:41 +02:00
skwerlmanandZach H ad66a48b8e ensure column ordering is consistent (#3249) 2018-05-18 18:07:39 -04:00
David SzaboandZach H 7a2558d834 vs version number increased for appveyor build (#3251) 2018-05-18 18:06:33 -04:00
BersandZach H 3b3f5a639c Hide non-existent card values in infowidget and cardframe (#3239) 2018-05-15 01:53:53 -04:00
tooommandZach H 9acf606e93 settings dialog: fewer space (#3245) 2018-05-15 01:53:01 -04:00
ctrlaltcaandGitHub 4cdd17945d Servatrice: make listening host configurable; fix #3241 (#3242)
* fix #3241

* clangify
2018-05-12 23:54:03 +02:00
ctrlaltcaandGitHub c06fc562a1 Cmake scripts refactoring; fix #3225 (#3230)
* fix #3225

* Servatrice: use websockets as an optional component (for qt < 5.3)

* Attempt++
2018-05-12 23:28:22 +02:00
tooommandctrlaltca 73fb9ee03e update file rules (#3232) 2018-05-10 22:07:22 +02:00
tooommandZach H 4e10ce7473 smaller clear pic button (#3220) 2018-05-04 03:48:53 -04:00
ctrlaltcaandZach H a7f4aace9c Extract the xml parser from carddatabase (#3223) 2018-05-04 03:46:08 -04:00
David SzaboandZach H 9727699e26 braces are only left for split cards (#3217)
* braces are only left for split cards

* condition for braces modified
2018-05-02 21:20:58 -04:00
Zach HandGitHub 2520d07ef2 log moderation stats in the uptime table (#3215) 2018-05-02 17:31:54 -04:00
tooommandZach H 661e00f563 log cleanup (#3207) 2018-05-02 16:07:43 -04:00
ctrlaltcaandZach H 2780270911 macOS: fix qt plugin installation (#3216)
* Osx: fix qt plugin installation

* Add make install step to travis debug build

* only install under osx

* Add "styles" plugins (for native look'n'feel)

* Osx: upgrade qt from 5.5 to current (5.10.1)

* Fix osx on travis

The qt homebrew formula now installs three qt* symlinks (qt, qt5, qt5@5.x) so we can't use/don't need bash globbing anymore
2018-05-02 15:57:35 -04:00
tooommandZach H 8a5baa4637 connect dialog tweaks (#3211) 2018-04-23 14:30:46 -04:00
tooommandZach H f5eb05b682 bump version number (#3205)
* bump version number

* bump
2018-04-18 19:50:26 -04:00
tooommandZach H f309ddf28a README updates (#3203) 2018-04-16 20:08:26 -04:00
David SzaboandZach H 67a2a8cf08 datetime display fixed for OSs with non-English localization (#3204) 2018-04-16 20:07:30 -04:00
Zach HandGitHub 1fbdea0f35 translation updates (#3200) 2018-04-16-Release-2.5.1 2018-04-16 02:42:58 -04:00
David SzaboandZach H cc2a0fa0d0 server site added to connect window (#3190) 2018-04-10 19:05:13 -04:00
tooommandZach H 034e79dd36 typo (#3187) 2018-04-10 12:51:57 -04:00