Commit graph

  • 4ef2ca341c Merge bf85ea8ff9 into 6f319c8b63 Londerson 2014-09-01 12:04:57 +00:00
  • bf85ea8ff9 translate some texts for pt-br Londerson 2014-09-01 08:56:26 -03:00
  • 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 Antony Woods 2014-08-29 16:53:30 +01:00
  • 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. Antony Woods 2014-08-27 21:25:11 +01:00
  • 6f319c8b63 Merge pull request #286 from jturner/fix-build Gavin Bisesi 2014-08-19 20:31:41 -04:00
  • f06d2123fc Remove invalid character James Turner 2014-08-19 17:39:05 -04:00
  • 59b8d7044a Merge pull request #285 from pliu037/fix-oracle-save Gavin Bisesi 2014-08-15 09:24:22 -04:00
  • 9a934f3a43 Fixed a bug that caused Oracle to be stuck in an infinite loop if the default path checkbox was checked but failed to write. Peng Liu 2014-08-15 01:09:21 -04:00
  • a83e6cdf48 Removed unused variable, bool stripped, from classes and functions. Peng Liu 2014-08-11 13:47:47 -04:00
  • 0bb0530a31 Merge pull request #245 from pliu037/oracle-cards-path Gavin Bisesi 2014-08-11 10:13:38 -04:00
  • 134810b979 Merge pull request #279 from ctrlaltca/valgrind_unified Gavin Bisesi 2014-08-11 09:11:12 -04:00
  • 23a3b8364c Merge remote-tracking branch 'upstream/master' into fix_202 Fabio Bas 2014-08-11 15:07:43 +02:00
  • 5c46cfc169 Merge pull request #179 from woogerboy21/registered-user-only-server Gavin Bisesi 2014-08-11 09:03:57 -04:00
  • 484a6e8bdc Fix crash #202 Fabio Bas 2014-08-11 10:50:55 +02:00
  • 781460d6ac Cockatrice can now load images both with and without .full. Will need to clean-up bool stripped (used to determine .full suffix inclusion). Peng Liu 2014-08-11 04:37:00 -04:00
  • 1da2e7154c Fixed Valgrind warnings Fabio Bas 2014-08-11 10:08:33 +02:00
  • 08f14aa8b4 Merge 3684e26263 into 8b32a1010a ctrlaltca 2014-08-11 08:03:29 +00:00
  • 3684e26263 Merge remote-tracking branch 'upstream/master' into valgrind Fabio Bas 2014-08-11 10:03:16 +02:00
  • 6b8ca1e8a2 Cleaned up potential memory leak woogerboy21 2014-08-10 15:48:15 -04:00
  • 8b32a1010a Merge pull request #265 from pliu037/clear-downloaded-pics Gavin Bisesi 2014-08-10 13:34:14 -04:00
  • 32f1f17d52 Initialize privatePlayerId in GameEventStorage Fabio Bas 2014-08-09 12:41:12 +02:00
  • 83f57b096c Initialize symbolSize and ySpacing in PhasesToolbar Fabio Bas 2014-08-09 12:27:44 +02:00
  • 3a5cdd6ba8 Reorder class member variables initialization in TabGame Fabio Bas 2014-08-09 12:09:37 +02:00
  • 954489e6c0 Merge branch 'master' into valgrind Fabio Bas 2014-08-09 11:38:53 +02:00
  • 4e3d6a141c Merge pull request #274 from ctrlaltca/serva_memleaks Gavin Bisesi 2014-08-08 12:22:44 -04:00
  • 57efffcd2e Merge pull request #273 from ctrlaltca/picurl_handling Gavin Bisesi 2014-08-08 08:59:41 -04:00
  • d55f6fdec1 fix: show card only found once by prefix Mawu3n4 2014-08-08 14:24:29 +02:00
  • 6e3c7d33da Make protobuf cleanup its resourced when servatrice ends Fabio Bas 2014-08-08 13:43:50 +02:00
  • 0a5106b8ef Don't leak a QSettings object at every logged message Fabio Bas 2014-08-08 09:57:07 +02:00
  • 765e865aa2 Continue downloading card images after failing url on one. Daenyth 2014-07-02 19:18:05 -04:00
  • 42f1c6938f Merged: First draft of better pic url error handling Daenyth 2014-06-29 23:00:58 -04:00
  • e12d66df4f Merge pull request #271 from ctrlaltca/picurl_handling Gavin Bisesi 2014-08-07 17:25:38 -04:00
  • bba8184d37 Fix off by one Fabio Bas 2014-08-07 22:45:59 +02:00
  • 88dfea8ece Don't save card pictures if we don't have a proper set name for it Fabio Bas 2014-08-07 22:45:43 +02:00
  • 3bce98e3a9 Fix crashes trying to load the picture of a card with no <set> Fabio Bas 2014-08-07 22:28:08 +02:00
  • 176f42a7dd Merge 5779f061e5 into 7eb6e623f1 ctrlaltca 2014-08-07 21:03:42 +00:00
  • 5779f061e5 Fix off by one Fabio Bas 2014-08-07 22:45:59 +02:00
  • 99c7c8eea3 Don't save card pictures if we don't have a proper set name for it Fabio Bas 2014-08-07 22:45:43 +02:00
  • 942709763d Fix crashes trying to load the picture of a card with no <set> Fabio Bas 2014-08-07 22:28:08 +02:00
  • 0de0658acd Merge pull request #269 from arxanas/style-guide-memory-management Gavin Bisesi 2014-08-07 15:51:51 -04:00
  • 9383961140 Merge remote-tracking branch 'upstream/master' into better-picurl-error-handling Fabio Bas 2014-08-07 21:38:57 +02:00
  • bee1ff39f5 Added section on memory management to CONTRIBUTING.md. Waleed Khan 2014-08-07 15:37:40 -04:00
  • fe3dc02513 Merge pull request #266 from arxanas/token-dashes Gavin Bisesi 2014-08-07 15:34:47 -04:00
  • 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. Peng Liu 2014-08-07 14:15:02 -04:00
  • ae80752497 Added notification messages informing users of the success or failure of clearing downloaded images. Peng Liu 2014-08-07 14:00:59 -04:00
  • 3375d45571 Logically inverted the if... else statement by removing the logical not (!). Cleaned up a ;;. Peng Liu 2014-08-07 12:58:03 -04:00
  • ffc5b59fec Fix #258: Dashes to spaces. Waleed Khan 2014-08-07 12:24:49 -04:00
  • 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 -04:00
  • ab7d70a9c8 Merge pull request #263 from ctrlaltca/oracle_icon Gavin Bisesi 2014-08-07 12:00:46 -04:00
  • 1a4abc3d63 Merge pull request #264 from arxanas/style-guide Gavin Bisesi 2014-08-07 11:58:37 -04:00
  • da9592f0d8 Added style guide. Waleed Khan 2014-08-07 11:52:40 -04:00
  • 10ab53c4ac fix: find by prefix if card not found only Mawu3n4 2014-08-07 17:43:14 +02:00
  • 40e9735678 Add icon to oracle Fabio Bas 2014-08-07 17:27:15 +02:00
  • c0d4669088 Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml Waleed Khan 2014-08-07 11:06:41 -04:00
  • af4d662c54 Merge pull request #262 from ctrlaltca/fix_134 Gavin Bisesi 2014-08-07 10:39:13 -04:00
  • 2e051c3fd7 add success notification to oracle Fabio Bas 2014-08-07 16:10:57 +02:00
  • 9092f2298b fix: remove auto Dibe Zackaria 2014-08-06 20:27:04 +02:00
  • e8abd6eb63 fix: typo Dibe Zackaria 2014-08-06 20:13:59 +02:00
  • 7d190ddaf7 fix: pushed old version Mawu3n4 2014-08-06 18:01:47 +02:00
  • 621a47de9c add: find token cards by prefix Mawu3n4 2014-08-06 17:54:47 +02:00
  • ef1fbc0db9 Merge pull request #256 from pliu037/handle-PNGs-2 Gavin Bisesi 2014-08-06 10:42:15 -04:00
  • 8b588c6fd3 Merge branch 'ctrlaltca-pr256' into handle-PNGs-2 Peng Liu 2014-08-06 04:55:27 -04:00
  • 6502a182e8 Support loading of files with wrong extension Fabio Bas 2014-08-06 09:31:22 +02:00
  • 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 -04:00
  • 605479694d Removed some redundant code. Factored out translations. Peng Liu 2014-08-05 08:50:42 -04:00
  • 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 -04:00
  • 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 -04:00
  • 387086cb4c Added support for PNG images (both for downloading/saving and loading). Peng Liu 2014-08-04 15:45:49 -04:00
  • 9837f8bb18 Merge pull request #254 from ctrlaltca/compilation_warning_246 Gavin Bisesi 2014-08-04 14:37:06 -04:00
  • 3667ab504c Fix compilation warning introduced in #246 Fabio Bas 2014-08-04 20:09:53 +02:00
  • 9ba2ae71a8 Merge pull request #244 from ctrlaltca/cards_xsd Gavin Bisesi 2014-08-04 10:51:11 -04:00
  • 8d482245ff Merge pull request #251 from arxanas/case-insensitive-tokens Gavin Bisesi 2014-08-04 10:50:25 -04:00
  • 6f45bbc82c Merge pull request #246 from pliu037/create-CUSTOM-folder Gavin Bisesi 2014-08-04 10:49:39 -04:00
  • a9eaf65a82 Changed .toLatin1() to .toUtf8(). Peng Liu 2014-08-02 23:44:31 -04:00
  • 309494111c Fix #248: the token dialog generates cards irrespective of their case and punctation. Waleed Khan 2014-08-02 19:32:24 -04:00
  • 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 -04:00
  • 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 -04:00
  • 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 -04:00
  • ffed0e00fe Merge pull request #214 from pliu037/master Gavin Bisesi 2014-07-31 13:42:57 -04:00
  • b2e1855af7 Fix: <color> can appear more than once Fabio Bas 2014-07-31 18:40:10 +02:00
  • c1b7d71dca Added schema for cards.xml Fabio Bas 2014-07-31 17:53:39 +02:00
  • ca6bd669ce Merge pull request #233 from ctrlaltca/regression_card_picurl Gavin Bisesi 2014-07-31 11:30:26 -04:00
  • 6c53c1afc3 Cleaned up some code and reworked the logic regarding which cards.xml Oracle and Cockatrice consider default. Original: If default is checked, Oracle will always save to the AppData path. 1st commit: If a path to cards.xml is set, Oracle will update that cards.xml. Bug: Running Oracle before setting a cards.xml (i.e.: on a fresh install) will lead to Oracle asking for a location at which to save cards.xml, even if default was checked. 2nd commit: Fix of 1st commit +: 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. This commit: Fix of 2nd commit +: 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 copy. pliu037 2014-07-31 07:25:59 -04:00
  • 41aaec2c08 Fixed a bug related to running Oracle before Cockatrice, leading to no default path for cards.xml. pliu037 2014-07-31 06:31:32 -04:00
  • 31912ee7c6 Oracle will now update whichever cards.xml is being used by Cockatrice as default instead of the previous behaviour of updating cards.xml within the user's app data. pliu037 2014-07-31 04:33:00 -04:00
  • 7d5ce6f0ef Merge pull request #235 from ctrlaltca/offline_users_menu Gavin Bisesi 2014-07-30 15:49:43 -04:00
  • 951e43b166 Update cmake build flags in README Gavin Bisesi 2014-07-30 15:47:57 -04:00
  • 1e5a00d100 Merge pull request #228 from ctrlaltca/error_suppression Gavin Bisesi 2014-07-30 15:44:08 -04:00
  • 14d6b011d7 Merge pull request #236 from arxanas/remove-price-column Gavin Bisesi 2014-07-30 09:55:25 -04:00
  • 9ba5d7968e Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml. Waleed Khan 2014-07-29 23:46:04 -04:00
  • 8df7e9f164 Fix #231: tokens.xml no longer overwritten by cards.xml. Waleed Khan 2014-07-27 20:55:47 -04:00
  • 9e12c5b2d4 Use custom picUrl if picUrlHq is not defined Fabio Bas 2014-07-27 22:06:35 +02:00
  • 6b9daf3d15 Enable Show this user's games" for offline users Fabio Bas 2014-07-27 21:29:27 +02:00
  • c3a68fcbd3 Cleaned up some lines of code pliu037 2014-07-27 12:47:05 -04:00
  • 689acc1e32 Fix #110: Price column is removed when the setting is disabled. Waleed Khan 2014-07-26 21:13:30 -04:00
  • fe12f71b93 Disable some usercontextmenu actions if the user is offline; fix #234 Fabio Bas 2014-07-27 00:26:12 +02:00
  • aa225f8df7 Add back support for custom picture urls in cards.xml Fabio Bas 2014-07-26 23:36:51 +02:00
  • 1f0ba0ea08 Debug compilation: check flags actually supported by the compiler Fabio Bas 2014-07-25 17:32:12 +02:00
  • ea897ee2ef Merge pull request #229 from arxanas/deckbrew-prices Gavin Bisesi 2014-07-25 08:42:20 -04:00
  • fe9f7a22b1 Fix issue mentioned in #152: price updater loads all cards now. Waleed Khan 2014-07-24 19:53:05 -04:00