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
1,652 Commits 53 Branches 176 Tags
42f1c6938fcdb24579e881ff4efea9d4da2414c8
Commit Graph
1652 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DaenythandFabio 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
Gavin Bisesi 0de0658acd Merge pull request #269 from arxanas/style-guide-memory-management 
Added section on memory management to CONTRIBUTING.md.
 2014-08-07 15:51:51 -04:00
Waleed Khan bee1ff39f5 Added section on memory management to CONTRIBUTING.md. 2014-08-07 15:37:40 -04:00
Gavin Bisesi fe3dc02513 Merge pull request #266 from arxanas/token-dashes 
Fix #258: Dashes to spaces.
 2014-08-07 15:34:47 -04:00
Waleed Khan ffc5b59fec Fix #258: Dashes to spaces. 2014-08-07 12:29:20 -04:00
Gavin Bisesi ab7d70a9c8 Merge pull request #263 from ctrlaltca/oracle_icon 
Add icon to oracle
 2014-08-07 12:00:46 -04:00
Gavin Bisesi 1a4abc3d63 Merge pull request #264 from arxanas/style-guide 
Added style guide.
 2014-08-07 11:58:37 -04:00
Waleed Khan da9592f0d8 Added style guide. 2014-08-07 11:52:40 -04:00
Fabio Bas 40e9735678 Add icon to oracle 2014-08-07 17:27:15 +02:00
Gavin Bisesi af4d662c54 Merge pull request #262 from ctrlaltca/fix_134 
add success notification to oracle; fixes #134
 2014-08-07 10:39:13 -04:00
Fabio Bas 2e051c3fd7 add success notification to oracle 2014-08-07 16:10:57 +02: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
Peng Liu 8b588c6fd3 Merge branch 'ctrlaltca-pr256' into handle-PNGs-2 2014-08-06 04:55:27 -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
Gavin Bisesi 9837f8bb18 Merge pull request #254 from ctrlaltca/compilation_warning_246 
Fix compilation warning introduced in #246
 2014-08-04 14:37:06 -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 9ba2ae71a8 Merge pull request #244 from ctrlaltca/cards_xsd 
Added schema for cards.xml and tokens.xml in xsd format
 2014-08-04 10:51:11 -04: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
Gavin Bisesi 6f45bbc82c Merge pull request #246 from pliu037/create-CUSTOM-folder 
Picture path/CUSTOM folder creation
 2014-08-04 10:49:39 -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
Fabio Bas b2e1855af7 Fix: <color> can appear more than once 2014-07-31 18:40:10 +02:00
Fabio Bas c1b7d71dca Added schema for cards.xml 2014-07-31 17:53:39 +02:00
Gavin Bisesi ca6bd669ce Merge pull request #233 from ctrlaltca/regression_card_picurl 
Add back support for custom picture urls in cards.xml
 2014-07-31 11:30:26 -04:00
Gavin Bisesi 7d5ce6f0ef Merge pull request #235 from ctrlaltca/offline_users_menu 
Disable some usercontextmenu actions if the user is offline; fix #234
 2014-07-30 15:49:43 -04:00
Gavin Bisesi 951e43b166 Update cmake build flags in README 2014-07-30 15:47:57 -04:00
Gavin Bisesi 1e5a00d100 Merge pull request #228 from ctrlaltca/error_suppression 
Fix building with debug
 2014-07-30 15:44:08 -04:00
Gavin Bisesi 14d6b011d7 Merge pull request #236 from arxanas/remove-price-column 
Fix #110: Price column is removed when the setting is disabled.
 2014-07-30 09:55:25 -04:00
Fabio Bas 9e12c5b2d4 Use custom picUrl if picUrlHq is not defined 2014-07-27 22:06:35 +02:00
Fabio Bas 6b9daf3d15 Enable Show this user's games" for offline users 2014-07-27 21:29:27 +02:00
pliu037 c3a68fcbd3 Cleaned up some lines of code 2014-07-27 12:47:05 -04:00
Waleed Khan 689acc1e32 Fix #110: Price column is removed when the setting is disabled. 2014-07-26 21:13:30 -04:00
Fabio Bas fe12f71b93 Disable some usercontextmenu actions if the user is offline; fix #234 2014-07-27 00:29:23 +02:00
Fabio Bas aa225f8df7 Add back support for custom picture urls in cards.xml 2014-07-26 23:36:51 +02:00
Fabio Bas 1f0ba0ea08 Debug compilation: check flags actually supported by the compiler 2014-07-25 17:32:12 +02:00
Gavin Bisesi ea897ee2ef Merge pull request #229 from arxanas/deckbrew-prices 
Fix issue mentioned in #152: price updater loads all cards now.
 2014-07-25 08:42:20 -04:00
Waleed Khan fe9f7a22b1 Fix issue mentioned in #152: price updater loads all cards now. 2014-07-24 19:53:05 -04:00
Fabio Bas 3fda31073f Declare useless virtual dtor for polymorphic classes 2014-07-24 18:54:45 +02:00
Fabio Bas 0f501762e0 Reorder items initialization to match the order in class declaration 2014-07-24 18:44:19 +02:00
Fabio Bas b10331fe66 Hide unused parameters in oracle/ to avoid warnings 2014-07-24 18:40:56 +02:00