Commit graph

  • 674005383b Added a button and the functionality to clear all downloaded images (all images within subfolders at picsPath/downloadedPics) under Settings. Peng Liu 2014-08-07 11:54:26 -0400
  • ab7d70a9c8 Merge pull request #263 from ctrlaltca/oracle_icon Gavin Bisesi 2014-08-07 12:00:46 -0400
  • 1a4abc3d63 Merge pull request #264 from arxanas/style-guide Gavin Bisesi 2014-08-07 11:58:37 -0400
  • da9592f0d8 Added style guide. Waleed Khan 2014-08-07 11:52:40 -0400
  • 10ab53c4ac fix: find by prefix if card not found only Mawu3n4 2014-08-07 17:43:14 +0200
  • 40e9735678 Add icon to oracle Fabio Bas 2014-08-07 17:27:15 +0200
  • c0d4669088 Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml Waleed Khan 2014-08-07 11:06:41 -0400
  • af4d662c54 Merge pull request #262 from ctrlaltca/fix_134 Gavin Bisesi 2014-08-07 10:39:13 -0400
  • 2e051c3fd7 add success notification to oracle Fabio Bas 2014-08-07 16:10:57 +0200
  • 9092f2298b fix: remove auto Dibe Zackaria 2014-08-06 20:27:04 +0200
  • e8abd6eb63 fix: typo Dibe Zackaria 2014-08-06 20:13:59 +0200
  • 7d190ddaf7 fix: pushed old version Mawu3n4 2014-08-06 18:01:47 +0200
  • 621a47de9c add: find token cards by prefix Mawu3n4 2014-08-06 17:54:47 +0200
  • ef1fbc0db9 Merge pull request #256 from pliu037/handle-PNGs-2 Gavin Bisesi 2014-08-06 10:42:15 -0400
  • 8b588c6fd3 Merge branch 'ctrlaltca-pr256' into handle-PNGs-2 Peng Liu 2014-08-06 04:55:27 -0400
  • 6502a182e8 Support loading of files with wrong extension Fabio Bas 2014-08-06 09:31:22 +0200
  • 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. Peng Liu 2014-08-05 05:40:51 -0400
  • 605479694d Removed some redundant code. Factored out translations. Peng Liu 2014-08-05 08:50:42 -0400
  • 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. Peng Liu 2014-08-05 03:48:30 -0400
  • 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. Peng Liu 2014-08-04 17:01:58 -0400
  • 387086cb4c Added support for PNG images (both for downloading/saving and loading). Peng Liu 2014-08-04 15:45:49 -0400
  • 9837f8bb18 Merge pull request #254 from ctrlaltca/compilation_warning_246 Gavin Bisesi 2014-08-04 14:37:06 -0400
  • 3667ab504c Fix compilation warning introduced in #246 Fabio Bas 2014-08-04 20:09:53 +0200
  • 9ba2ae71a8 Merge pull request #244 from ctrlaltca/cards_xsd Gavin Bisesi 2014-08-04 10:51:11 -0400
  • 8d482245ff Merge pull request #251 from arxanas/case-insensitive-tokens Gavin Bisesi 2014-08-04 10:50:25 -0400
  • 6f45bbc82c Merge pull request #246 from pliu037/create-CUSTOM-folder Gavin Bisesi 2014-08-04 10:49:39 -0400
  • a9eaf65a82 Changed .toLatin1() to .toUtf8(). Peng Liu 2014-08-02 23:44:31 -0400
  • 309494111c Fix #248: the token dialog generates cards irrespective of their case and punctation. Waleed Khan 2014-08-02 19:32:24 -0400
  • b3fa99ef36 I was too hasty and forgot a + and to toLatin1() a QString in the qDebug arg. Peng Liu 2014-07-31 23:04:30 -0400
  • 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. Peng Liu 2014-07-31 17:30:15 -0400
  • 8be4a14fcc Before: If default is checked, Oracle will always save to the AppData path. If a path to cards.xml is set, Oracle will update that cards.xml. If Oracle is run before a path to cards.xml is set, if default is checked, cards.xml will be saved on the AppData path. Furthermore, this path will be set as the cards.xml path for both Oracle and Cockatrice. If Oracle is run before a path to cards.xml is set, if default is NOT checked, cards.xml will be saved at the selected path and this path will be set as the cards.xml path for both Oracle and Cockatrice. If a path to cards.xml is set, if default is NOT checked, cards.xml will be saved at the selected path but this path will NOT be set as the cards.xml path for either Oracle or Cockatrice. This allows people who already have a cards.xml (which may be customized), to still obtain clean copies of cards.xml through Oracle without overwriting their own Peng Liu 2014-07-31 15:33:11 -0400
  • ffed0e00fe Merge pull request #214 from pliu037/master Gavin Bisesi 2014-07-31 13:42:57 -0400
  • b2e1855af7 Fix: <color> can appear more than once Fabio Bas 2014-07-31 18:40:10 +0200
  • c1b7d71dca Added schema for cards.xml Fabio Bas 2014-07-31 17:53:39 +0200
  • ca6bd669ce Merge pull request #233 from ctrlaltca/regression_card_picurl Gavin Bisesi 2014-07-31 11:30:26 -0400
  • 7d5ce6f0ef Merge pull request #235 from ctrlaltca/offline_users_menu Gavin Bisesi 2014-07-30 15:49:43 -0400
  • 951e43b166 Update cmake build flags in README Gavin Bisesi 2014-07-30 15:47:57 -0400
  • 1e5a00d100 Merge pull request #228 from ctrlaltca/error_suppression Gavin Bisesi 2014-07-30 15:44:08 -0400
  • 14d6b011d7 Merge pull request #236 from arxanas/remove-price-column Gavin Bisesi 2014-07-30 09:55:25 -0400
  • 9ba5d7968e Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml. Waleed Khan 2014-07-29 23:46:04 -0400
  • 8df7e9f164 Fix #231: tokens.xml no longer overwritten by cards.xml. Waleed Khan 2014-07-27 20:55:47 -0400
  • 9e12c5b2d4 Use custom picUrl if picUrlHq is not defined Fabio Bas 2014-07-27 22:06:35 +0200
  • 6b9daf3d15 Enable Show this user's games" for offline users Fabio Bas 2014-07-27 21:29:27 +0200
  • c3a68fcbd3 Cleaned up some lines of code pliu037 2014-07-27 12:47:05 -0400
  • 689acc1e32 Fix #110: Price column is removed when the setting is disabled. Waleed Khan 2014-07-26 21:13:30 -0400
  • fe12f71b93 Disable some usercontextmenu actions if the user is offline; fix #234 Fabio Bas 2014-07-27 00:26:12 +0200
  • aa225f8df7 Add back support for custom picture urls in cards.xml Fabio Bas 2014-07-26 23:36:51 +0200
  • 1f0ba0ea08 Debug compilation: check flags actually supported by the compiler Fabio Bas 2014-07-25 17:32:12 +0200
  • ea897ee2ef Merge pull request #229 from arxanas/deckbrew-prices Gavin Bisesi 2014-07-25 08:42:20 -0400
  • fe9f7a22b1 Fix issue mentioned in #152: price updater loads all cards now. Waleed Khan 2014-07-24 19:53:05 -0400
  • 3fda31073f Declare useless virtual dtor for polymorphic classes Fabio Bas 2014-07-24 18:54:45 +0200
  • 0f501762e0 Reorder items initialization to match the order in class declaration Fabio Bas 2014-07-24 18:44:19 +0200
  • b10331fe66 Hide unused parameters in oracle/ to avoid warnings Fabio Bas 2014-07-24 18:40:56 +0200
  • bd97d7b933 Fix signed/unsigned comparision Fabio Bas 2014-07-24 18:40:25 +0200
  • d9577f0d6c Hide unused parameters in cockatrice/ to avoid warnings Fabio Bas 2014-07-24 18:27:02 +0200
  • 13bd35e020 Servatrice: add prototypes for local functions Fabio Bas 2014-07-24 18:16:08 +0200
  • 3102dd60f9 Hide unused parameters in common/ to avoid warnings Fabio Bas 2014-07-24 18:09:28 +0200
  • 6c7ba0950a Fix warning for DeskList copy constructors Fabio Bas 2014-07-24 18:00:20 +0200
  • 036980eb44 ISO C++ forbids variable length array Fabio Bas 2014-07-24 17:37:54 +0200
  • f32a999b4e Remove unused variable Fabio Bas 2014-07-24 15:38:36 +0200
  • abdaa610ee Merge pull request #152 from ctrlaltca/master_feature_prices Gavin Bisesi 2014-07-24 07:45:37 -0400
  • 49b3568b53 small fix: moving the url length check in the inner loop Fabio Bas 2014-07-23 23:10:48 +0200
  • b40abfa1ad Split price retrieval on multiple request Fabio Bas 2014-07-23 23:00:58 +0200
  • bf92e67002 Ensure the whole table gets refreshed when updating prices Fabio Bas 2014-07-23 22:11:26 +0200
  • a8031321c6 Merge pull request #226 from arxanas/deckstats-multiple-cards Gavin Bisesi 2014-07-23 15:38:09 -0400
  • b0ee2e6d4b Merge branch 'master' into master_feature_prices Fabio Bas 2014-07-23 21:37:37 +0200
  • 68ac8d1a33 Fix #225: Multiples of cards are now sent to deckstats. Waleed Khan 2014-07-23 15:21:46 -0400
  • 395658988a Merge pull request #220 from arxanas/deck-parser-ampersand Gavin Bisesi 2014-07-23 08:53:04 -0400
  • a50e7ba936 Merge pull request #156 from arxanas/master Gavin Bisesi 2014-07-23 08:41:15 -0400
  • 0f627958c7 Merge pull request #224 from arxanas/case-insensitive-card-tag Gavin Bisesi 2014-07-23 08:12:54 -0400
  • feaa3f5052 Merge remote-tracking branch 'origin/master' Waleed Khan 2014-07-23 00:50:16 -0400
  • 40e97140d6 Merge remote-tracking branch 'upstream/master' Waleed Khan 2014-07-23 00:49:13 -0400
  • d663c12689 Merge remote-tracking branch 'upstream/master' Waleed Khan 2014-07-23 00:21:16 -0400
  • 2a5aa06881 Æ now actually works with the case-insensitive tags. Waleed Khan 2014-07-22 20:58:38 -0400
  • 27eca25057 Merge pull request #197 from arxanas/case-insensitive-card-tag Gavin Bisesi 2014-07-21 13:02:09 -0400
  • aff32e0f56 Ignore diacritics as well. Waleed Khan 2014-07-20 21:09:58 -0400
  • 4729171ef7 Merge remote-tracking branch 'upstream/master' into deck-parser-ampersand Waleed Khan 2014-07-20 15:08:22 -0400
  • e5be082714 Merge remote-tracking branch 'upstream/master' into case-insensitive-card-tag Waleed Khan 2014-07-20 15:06:51 -0400
  • 359882917a Merge remote-tracking branch 'upstream/master' Waleed Khan 2014-07-20 14:40:18 -0400
  • 92ae596d11 Merge remote-tracking branch 'upstream/master' into registered-user-only-server woogerboy21 2014-07-19 23:38:50 -0400
  • 1973df10e8 Merge pull request #221 from arxanas/travis-osx-no-cmake Gavin Bisesi 2014-07-19 22:02:42 -0400
  • fd5c497e8e Merge branch 'travis-osx-no-cmake' into deck-parser-ampersand Waleed Khan 2014-07-19 18:38:41 -0400
  • 4df46b13e6 Removed cmake from Travis's OS X dependencies. Waleed Khan 2014-07-19 18:27:44 -0400
  • b1bfda9f4e Merge remote-tracking branch 'upstream/master' into deck-parser-ampersand arxanas 2014-07-19 18:12:49 -0400
  • 0eb97c91b3 Fix #183: Deck parser doesn't too eagerly replace ampersands. arxanas 2014-07-19 14:47:19 -0400
  • 88e6d0d3eb Tabs to spaces. arxanas 2014-07-19 14:28:46 -0400
  • 021f0911c4 Merge remote-tracking branch 'upstream/master' into registered-user-only-server woogerboy21 2014-07-18 23:46:56 -0400
  • 843eba817b Merge pull request #194 from ctrlaltca/master_regression_180_tab Gavin Bisesi 2014-07-13 09:16:06 -0400
  • 1137179b88 Add WITH_QT4 note to README Gavin Bisesi 2014-07-13 09:08:32 -0400
  • b15d8e076c Merge pull request #209 from ctrlaltca/cpack_win_fixes Gavin Bisesi 2014-07-13 08:07:34 -0400
  • 23b0a6c0df Windows + CPack: fix packaging Fabio Bas 2014-07-12 01:38:00 +0200
  • c07b53999d Fix: ensure git is always run from the project directory Fabio Bas 2014-07-12 00:11:48 +0200
  • 534b223545 Merge remote-tracking branch 'upstream/master' into master_regression_180_tab Fabio Bas 2014-07-10 19:50:38 +0200
  • b5d8e7da10 Merge remote-tracking branch 'upstream/master' into master_feature_prices Fabio Bas 2014-07-10 19:48:50 +0200
  • f83d58309b Merge pull request #126 from ctrlaltca/cmake_qt5 Gavin Bisesi 2014-07-10 13:13:51 -0400
  • 86fa8f304d Change client send-ping timer back to 1sec Gavin Bisesi 2014-07-09 19:06:31 -0400
  • 52827573b0 Merge pull request #204 from ctrlaltca/master_issue_203 Gavin Bisesi 2014-07-09 16:31:48 -0400
  • ca5d719d7d Merge pull request #200 from arxanas/4x-cardname Gavin Bisesi 2014-07-09 11:50:33 -0400
  • ea8c55b2c9 Merge remote-tracking branch 'upstream/master' into cmake_qt5 Fabio Bas 2014-07-09 17:44:21 +0200
  • a6f299b247 fix #203 Fabio Bas 2014-07-09 17:40:50 +0200