Matt Lowe
7cdd2a26f6
Icon changes
...
+ added updated mac icon that was missing
~ resized cockatrice.png
2014-10-03 19:02:27 +02:00
Matt Lowe
294edb3295
Logo and card back refresh
...
~ Updated the back of the card, cleaner lines, slightly more modern.
~ Updated game icon/logo
2014-10-03 19:02:12 +02:00
Gavin Bisesi
277aba79dc
Merge pull request #336 from poixen/master
...
Tokens use PT levels from cards.xml if available
2014-10-02 15:00:17 -04:00
Antony Woods
1f58f7d848
Changed 'value' to 'setValue' on line 275
2014-10-02 08:48:04 +01:00
Gavin Bisesi
b32aeb2211
Merge pull request #280 from pliu037/remove-.full-req
...
Support images without .full suffix
2014-10-01 13:50:02 -04:00
Matt Lowe
e3a94ecca3
Token PT is now set to DB values if not defined in event.
2014-10-01 19:20:42 +02:00
Gavin Bisesi
7eed007f14
Merge pull request #281 from ctrlaltca/fix_202
...
Fix crash #202
2014-09-30 20:35:11 -04:00
Matt Lowe
a80ccd882c
Tokens use PT levels from cards.xml if available
...
I added a check to see if the event PT is empty, if it is, we try and
use the PT from the cards.xml. In resp to issue #330 .
2014-10-01 00:57:07 +02:00
Fabio Bas
eaad8de8d0
Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers
2014-09-29 18:25:10 +02:00
Gavin Bisesi
b5de708756
Merge pull request #289 from acron0/auto-connect
...
Added 'auto connect' checkbox to connect dialog.
2014-09-29 10:24:06 -04:00
Jan Martin
6f97e59c03
Change default scry to 1.
2014-09-19 21:41:57 +10:00
Yuki Izumi
fefb6fc612
Add sideboard helpers.
2014-09-11 12:56:27 +10:00
Antony Woods
f1b012c83d
Adding modified translation files
2014-09-09 17:30:37 +01:00
Antony Woods
dbe46084ac
Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect
2014-09-09 17:22:55 +01:00
Fabio Bas
d6b97976f9
Refreshed all translation files
2014-09-06 10:40:23 +02:00
Fabio Bas
a0b35ee60b
Cockatrice - CMake: Include all existing translation files using a glob
2014-09-06 10:38:59 +02:00
Fabio Bas
e5eda9f172
Add a UPDATE_TRANSLATIONS options that actually updates translations!
2014-09-04 16:15:01 +02:00
Antony Woods
ab83d6185a
Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog
2014-08-29 16:53:30 +01:00
Antony Woods
b381298981
Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point.
2014-08-27 21:25:11 +01:00
James Turner
f06d2123fc
Remove invalid character
2014-08-19 17:39:05 -04:00
Peng Liu
a83e6cdf48
Removed unused variable, bool stripped, from classes and functions.
2014-08-11 13:47:47 -04:00
Gavin Bisesi
134810b979
Merge pull request #279 from ctrlaltca/valgrind_unified
...
Fixed Valgrind warnings
2014-08-11 09:11:12 -04:00
Fabio Bas
23a3b8364c
Merge remote-tracking branch 'upstream/master' into fix_202
2014-08-11 15:07:43 +02:00
Gavin Bisesi
5c46cfc169
Merge pull request #179 from woogerboy21/registered-user-only-server
...
Registered Only Server
2014-08-11 09:03:57 -04:00
Fabio Bas
484a6e8bdc
Fix crash #202
2014-08-11 10:50:55 +02:00
Peng Liu
781460d6ac
Cockatrice can now load images both with and without .full. Will need to clean-up bool stripped (used to determine .full suffix inclusion).
2014-08-11 04:37:00 -04:00
Fabio Bas
1da2e7154c
Fixed Valgrind warnings
...
Running cockatrice in valgrind i didn't found any bad memory leak
(good!), but only a few jumps depending on uninitialized variables.
Even if the possibility of crashes are remote, it's nice to sort them
out.
2014-08-11 10:08:33 +02:00
Gavin Bisesi
8b32a1010a
Merge pull request #265 from pliu037/clear-downloaded-pics
...
Clear downloaded images from settings
2014-08-10 13:34:14 -04:00
Daenyth and Fabio Bas
765e865aa2
Continue downloading card images after failing url on one.
...
I should probably bust this out to a method.
2014-08-08 09:33:38 +02:00
Daenyth and Fabio Bas
42f1c6938f
Merged: First draft of better pic url error handling
...
Cherry-picked b9cb61abd0
2014-08-08 09:33:35 +02:00
Fabio Bas
bba8184d37
Fix off by one
2014-08-07 23:14:57 +02:00
Fabio Bas
88dfea8ece
Don't save card pictures if we don't have a proper set name for it
2014-08-07 23:14:50 +02:00
Fabio Bas
3bce98e3a9
Fix crashes trying to load the picture of a card with no <set>
2014-08-07 23:14:41 +02:00
Peng Liu
d3459aabf9
Moved the button from the paths section to be below the "Download high-quality card pictures" checkbox. Button now reads "Reset/Clear Downloaded Pictures". Removed "Path to"s from card/token database, hand/stack/table/player info background, and card back labels.
2014-08-07 14:35:18 -04:00
Peng Liu
ae80752497
Added notification messages informing users of the success or failure of clearing downloaded images.
2014-08-07 14:00:59 -04:00
Waleed Khan
ffc5b59fec
Fix #258 : Dashes to spaces.
2014-08-07 12:29:20 -04:00
Peng Liu
674005383b
Added a button and the functionality to clear all downloaded images (all images within subfolders at picsPath/downloadedPics) under Settings.
2014-08-07 12:09:42 -04:00
Gavin Bisesi
ef1fbc0db9
Merge pull request #256 from pliu037/handle-PNGs-2
...
Handle PNGs (and other image formats)
2014-08-06 10:42:15 -04:00
Fabio Bas
6502a182e8
Support loading of files with wrong extension
...
Like M15’s .png that cockatrice wrongly saved as .jpg
Additionally, move the QImageReader declaration outside of the inner
loop
2014-08-06 09:31:22 +02:00
Peng Liu
4bb1d28ae7
Removed the QLists for determining image format. Instead, using QImageReader, both when downloading/saving and when loading, to determine the correct format (Cockatrice now supports all QImageReader-supported formats).
...
Image loading still uses one for loop to iterate through the QList of paths to folders in which to search for images.
2014-08-05 14:54:40 -04:00
Peng Liu
8587b8c349
Refactored the magic bytes into two QLists: one containing a list of QStrings representing the supported extensions, the other containing a list of QByteArrays representing the magic bytes in hex.
...
Refactored the image loading loop to be two nested for loops: the outer loop iterating through the QList of paths to folders in which to search for images and the inner loop iterating through the QList of supported extensions.
2014-08-05 03:48:30 -04:00
Peng Liu
75122c3c9d
Switched back to using QFile instead of QImage for saving as QImage's save function adds overhead to the file size, leaving me unsure whether the original image is affected.
2014-08-04 17:01:58 -04:00
Peng Liu
387086cb4c
Added support for PNG images (both for downloading/saving and loading).
2014-08-04 16:43:57 -04:00
Fabio Bas
3667ab504c
Fix compilation warning introduced in #246
...
/cockatrice/src/main.cpp:162:16: warning: format string is not a string
literal (potentially insecure) [-Wformat-security]
qDebug("Could not create " +
settingsCache->getPicsPath().toUtf8() + "/CUSTOM. Will fall back on
default card images.");
2014-08-04 20:09:53 +02:00
Gavin Bisesi
8d482245ff
Merge pull request #251 from arxanas/case-insensitive-tokens
...
Fix #248 : the token dialog generates cards irrespective of their case and punctuation
2014-08-04 10:50:25 -04:00
Peng Liu
a9eaf65a82
Changed .toLatin1() to .toUtf8().
2014-08-02 23:44:31 -04:00
Waleed Khan
309494111c
Fix #248 : the token dialog generates cards irrespective of their case and punctation.
2014-08-02 19:32:24 -04:00
Peng Liu
b3fa99ef36
I was too hasty and forgot a + and to toLatin1() a QString in the qDebug arg.
2014-07-31 23:24:25 -04:00
Peng Liu
077d9f2745
Checks if CUSTOM folder was successfully created. If not, prints qDebug message and proceeds as normal except uses default card images instead of custom ones.
2014-07-31 22:42:13 -04:00
Gavin Bisesi
ffed0e00fe
Merge pull request #214 from pliu037/master
...
Added better support for custom card images
2014-07-31 13:42:57 -04:00
Matt Lowe