Commit graph

  • 0f5f82d492 Merge pull request #358 from poixen/serverlogo2 Gavin Bisesi 2014-10-09 11:27:15 -0400
  • 359714214d Added .desktop file Matt Lowe 2014-10-08 18:46:31 +0200
  • 3c0a09bf5c Merge pull request #361 from woogerboy21/servatrice-dbtable-fix Gavin Bisesi 2014-10-08 08:50:00 -0400
  • 602fa25321 Merge pull request #359 from ctrlaltca/servatrice_reguser_fixes Gavin Bisesi 2014-10-08 08:41:13 -0400
  • 9cd1a5b33f correct _room db table, add _rooms_gametypes table woogerboy21 2014-10-07 14:49:24 -0400
  • 22af789c9e Servatrice: log to console authentication method on startup Fabio Bas 2014-10-07 17:04:22 +0200
  • 90c2101a43 Removed png file Matt Lowe 2014-10-07 16:50:19 +0200
  • 4866e94c86 Renamed resources Matt Lowe 2014-10-07 16:49:40 +0200
  • 15555c16fd Fix servatrice's regonly mode Fabio Bas 2014-10-06 22:56:09 +0200
  • faa66e4d7f Merge pull request #355 from ctrlaltca/servatrice_passwordauth Gavin Bisesi 2014-10-06 15:56:41 -0400
  • 0d35488c21 Added schema for _rooms table Fabio Bas 2014-10-06 21:49:38 +0200
  • 01bd26d228 Misc typos fixing Fabio Bas 2014-10-06 21:44:20 +0200
  • 5b50aa0f0a Servatrice logo Matt Lowe 2014-10-04 15:06:30 +0200
  • 006451f402 Merge pull request #238 from arxanas/no-overwrite-tokens-xml Gavin Bisesi 2014-10-06 11:34:58 -0400
  • 91dafdb3e8 Move server network settings to the bottom and add a disclaimer Fabio Bas 2014-10-04 18:21:07 +0200
  • 29cf353913 Give servatrice example configuration some love Fabio Bas 2014-10-04 17:51:27 +0200
  • 0d9eec4b64 Servatrice: added authentication type "password" Fabio Bas 2014-10-04 17:50:01 +0200
  • 0261862b1b Fix configuration loading Fabio Bas 2014-10-04 10:33:55 +0200
  • e240e47d2f Fixed svg for icon Matt Lowe 2014-10-03 00:30:24 +0200
  • 7cdd2a26f6 Icon changes Matt Lowe 2014-10-02 22:24:43 +0200
  • 294edb3295 Logo and card back refresh Matt Lowe 2014-10-02 21:01:45 +0200
  • 73c963e9c4 Merge pull request #346 from ctrlaltca/servatrice_win32 Gavin Bisesi 2014-10-03 10:56:13 -0400
  • 871f5f7c94 use qWarning instead of std::err Fabio Bas 2014-10-02 23:45:42 +0200
  • 8d8ccaad7f use 4 spaces instead of tabs Fabio Bas 2014-10-02 23:42:51 +0200
  • 37eaeaae13 servatrice: as a third choice, check for a config in /etc/servatrice/ Fabio Bas 2014-10-02 23:41:24 +0200
  • 85a4a94ba3 win32: Avoid wiping server.log on upgrade Fabio Bas 2014-10-02 23:26:25 +0200
  • b348068369 Servatrice: Add a default option for every config value Fabio Bas 2014-10-02 23:11:49 +0200
  • 4b38187d20 Fix logfile option in servatrice.ini Fabio Bas 2014-10-02 23:00:17 +0200
  • 8b32e51cab win32 NSIS installer: uninstall servatrice* Fabio Bas 2014-10-02 22:46:46 +0200
  • a1b6600fe1 Servatrice: group all the use of QSettings in a single file Fabio Bas 2014-10-02 22:37:50 +0200
  • 277aba79dc Merge pull request #336 from poixen/master Gavin Bisesi 2014-10-02 15:00:17 -0400
  • 48817ed283 Merge pull request #314 from ctrlaltca/win32_setup_fix Gavin Bisesi 2014-10-02 10:35:22 -0400
  • 9e63c7fa35 Merge pull request #313 from pliu037/oracle-error-msg Gavin Bisesi 2014-10-02 10:35:05 -0400
  • 3c598531ed Merge pull request #342 from acron0/auto-connect-fix Gavin Bisesi 2014-10-02 10:06:47 -0400
  • 263b5a40f5 Merge pull request #341 from ctrlaltca/servatrice_install_configs Gavin Bisesi 2014-10-02 10:06:03 -0400
  • 283bac0b80 Merge pull request #339 from ctrlaltca/qt5_no_libgcrypt Gavin Bisesi 2014-10-02 10:05:17 -0400
  • 1f58f7d848 Changed 'value' to 'setValue' on line 275 Antony Woods 2014-10-02 08:48:04 +0100
  • 7afdff1b3b Servatrice: install example ini and sql schema file Fabio Bas 2014-10-02 08:34:21 +0200
  • 55b20343e9 Note that libgcrypt is needed only for qt4 Gavin Bisesi 2014-10-01 16:30:19 -0400
  • 355de8fba4 Drop libgcrypt dependency for qt5 Fabio Bas 2014-10-01 20:21:22 +0200
  • b32aeb2211 Merge pull request #280 from pliu037/remove-.full-req Gavin Bisesi 2014-10-01 13:50:02 -0400
  • e3a94ecca3 Token PT is now set to DB values if not defined in event. Matt Lowe 2014-10-01 19:20:42 +0200
  • 7eed007f14 Merge pull request #281 from ctrlaltca/fix_202 Gavin Bisesi 2014-09-30 20:35:11 -0400
  • a80ccd882c Tokens use PT levels from cards.xml if available Matt Lowe 2014-10-01 00:57:07 +0200
  • 9752dcf495 Merge pull request #332 from ctrlaltca/sideboard-helpers Gavin Bisesi 2014-09-30 13:46:43 -0400
  • eaad8de8d0 Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers Fabio Bas 2014-09-29 18:25:10 +0200
  • b5de708756 Merge pull request #289 from acron0/auto-connect Gavin Bisesi 2014-09-29 10:24:06 -0400
  • ab7f354e36 Merge pull request #318 from catmanjan/master Gavin Bisesi 2014-09-19 10:22:04 -0400
  • 6f97e59c03 Change default scry to 1. Jan Martin 2014-09-19 21:41:57 +1000
  • 98e5211ad5 Fix oracle under windows Fabio Bas 2014-09-15 16:15:27 +0200
  • 3cd6cc9195 Added the location Oracle attempted to save cards.xml to the failure message. Peng Liu 2014-09-15 06:15:18 -0400
  • 8928a699f9 fix: grammar in french translation Zack Dibe 2014-09-11 23:44:52 +0200
  • 54e3867c72 finish fr translation Mawu3n4 2014-09-11 09:59:49 +0200
  • 466f5ae5e1 add: FR translations and fix bad grammar Mawu3n4 2014-09-10 20:48:40 +0200
  • fefb6fc612 Add sideboard helpers. Yuki Izumi 2014-08-30 18:27:45 +1000
  • f1b012c83d Adding modified translation files Antony Woods 2014-09-09 17:30:37 +0100
  • dbe46084ac Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect Antony Woods 2014-09-09 17:22:55 +0100
  • 2aeecc6063 Add note about tech support Gavin Bisesi 2014-09-09 12:04:06 -0400
  • fce1d6ac3f Change Qt4 to Qt4+5 in readme Gavin Bisesi 2014-09-08 14:46:27 -0400
  • 64791b45f6 Add note on updating translations. Gavin Bisesi 2014-09-08 14:46:01 -0400
  • 3c7abecac6 Merge pull request #292 from ctrlaltca/cmake_translations Gavin Bisesi 2014-09-08 09:38:55 -0400
  • d6b97976f9 Refreshed all translation files Fabio Bas 2014-09-06 10:40:23 +0200
  • a0b35ee60b Cockatrice - CMake: Include all existing translation files using a glob Fabio Bas 2014-09-06 10:38:59 +0200
  • e5eda9f172 Add a UPDATE_TRANSLATIONS options that actually updates translations! Fabio Bas 2014-09-04 16:15:01 +0200
  • 8c072224c8 Move travis ci badge to Building section Gavin Bisesi 2014-09-03 17:53:32 -0400
  • d93cb0a637 Add link to Gitter chat Gavin Bisesi 2014-09-03 17:52:31 -0400
  • 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 +0100
  • 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 +0100
  • 6f319c8b63 Merge pull request #286 from jturner/fix-build Gavin Bisesi 2014-08-19 20:31:41 -0400
  • f06d2123fc Remove invalid character James Turner 2014-08-19 17:39:05 -0400
  • 59b8d7044a Merge pull request #285 from pliu037/fix-oracle-save Gavin Bisesi 2014-08-15 09:24:22 -0400
  • 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 -0400
  • a83e6cdf48 Removed unused variable, bool stripped, from classes and functions. Peng Liu 2014-08-11 13:47:47 -0400
  • 0bb0530a31 Merge pull request #245 from pliu037/oracle-cards-path Gavin Bisesi 2014-08-11 10:13:38 -0400
  • 134810b979 Merge pull request #279 from ctrlaltca/valgrind_unified Gavin Bisesi 2014-08-11 09:11:12 -0400
  • 23a3b8364c Merge remote-tracking branch 'upstream/master' into fix_202 Fabio Bas 2014-08-11 15:07:43 +0200
  • 5c46cfc169 Merge pull request #179 from woogerboy21/registered-user-only-server Gavin Bisesi 2014-08-11 09:03:57 -0400
  • 484a6e8bdc Fix crash #202 Fabio Bas 2014-08-11 10:50:55 +0200
  • 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 -0400
  • 1da2e7154c Fixed Valgrind warnings Fabio Bas 2014-08-11 10:08:33 +0200
  • 6b8ca1e8a2 Cleaned up potential memory leak woogerboy21 2014-08-10 15:48:15 -0400
  • 8b32a1010a Merge pull request #265 from pliu037/clear-downloaded-pics Gavin Bisesi 2014-08-10 13:34:14 -0400
  • 4e3d6a141c Merge pull request #274 from ctrlaltca/serva_memleaks Gavin Bisesi 2014-08-08 12:22:44 -0400
  • 57efffcd2e Merge pull request #273 from ctrlaltca/picurl_handling Gavin Bisesi 2014-08-08 08:59:41 -0400
  • d55f6fdec1 fix: show card only found once by prefix Mawu3n4 2014-08-08 14:24:29 +0200
  • 6e3c7d33da Make protobuf cleanup its resourced when servatrice ends Fabio Bas 2014-08-08 13:43:50 +0200
  • 0a5106b8ef Don't leak a QSettings object at every logged message Fabio Bas 2014-08-08 09:57:07 +0200
  • 765e865aa2 Continue downloading card images after failing url on one. Daenyth 2014-07-02 19:18:05 -0400
  • 42f1c6938f Merged: First draft of better pic url error handling Daenyth 2014-06-29 23:00:58 -0400
  • e12d66df4f Merge pull request #271 from ctrlaltca/picurl_handling Gavin Bisesi 2014-08-07 17:25:38 -0400
  • bba8184d37 Fix off by one Fabio Bas 2014-08-07 22:45:59 +0200
  • 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 +0200
  • 3bce98e3a9 Fix crashes trying to load the picture of a card with no <set> Fabio Bas 2014-08-07 22:28:08 +0200
  • 0de0658acd Merge pull request #269 from arxanas/style-guide-memory-management Gavin Bisesi 2014-08-07 15:51:51 -0400
  • bee1ff39f5 Added section on memory management to CONTRIBUTING.md. Waleed Khan 2014-08-07 15:37:40 -0400
  • fe3dc02513 Merge pull request #266 from arxanas/token-dashes Gavin Bisesi 2014-08-07 15:34:47 -0400
  • 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 -0400
  • ae80752497 Added notification messages informing users of the success or failure of clearing downloaded images. Peng Liu 2014-08-07 14:00:59 -0400
  • 3375d45571 Logically inverted the if... else statement by removing the logical not (!). Cleaned up a ;;. Peng Liu 2014-08-07 12:58:03 -0400
  • ffc5b59fec Fix #258: Dashes to spaces. Waleed Khan 2014-08-07 12:24:49 -0400