Commit graph

  • 90c2101a43 Removed png file Matt Lowe 2014-10-07 16:50:19 +02:00
  • 4866e94c86 Renamed resources Matt Lowe 2014-10-07 16:49:40 +02:00
  • 15555c16fd Fix servatrice's regonly mode Fabio Bas 2014-10-06 22:56:09 +02:00
  • faa66e4d7f Merge pull request #355 from ctrlaltca/servatrice_passwordauth Gavin Bisesi 2014-10-06 15:56:41 -04:00
  • 0d35488c21 Added schema for _rooms table Fabio Bas 2014-10-06 21:49:38 +02:00
  • 01bd26d228 Misc typos fixing Fabio Bas 2014-10-06 21:44:20 +02:00
  • 5b50aa0f0a Servatrice logo Matt Lowe 2014-10-04 15:06:30 +02:00
  • 006451f402 Merge pull request #238 from arxanas/no-overwrite-tokens-xml Gavin Bisesi 2014-10-06 11:34:58 -04:00
  • ef919dda4d Servatrice logo Matt Lowe 2014-10-04 15:06:30 +02:00
  • 9f46f02ebd Merge remote-tracking branch 'upstream/master' Matt Lowe 2014-10-05 21:06:42 +02:00
  • 4ededc8353 Merge b96eafeced into 73c963e9c4 ctrlaltca 2014-10-04 16:30:56 +00:00
  • b96eafeced revert commits not belonging to this branch, sorry Fabio Bas 2014-10-04 18:30:48 +02:00
  • 91dafdb3e8 Move server network settings to the bottom and add a disclaimer Fabio Bas 2014-10-04 18:21:07 +02:00
  • 29cf353913 Give servatrice example configuration some love Fabio Bas 2014-10-04 17:51:27 +02:00
  • 0d9eec4b64 Servatrice: added authentication type "password" Fabio Bas 2014-10-04 17:50:01 +02:00
  • 9ed7b07d4b Servatrice logo Matt Lowe 2014-10-04 15:06:30 +02:00
  • 88235afb21 use qWarning instead of std::err Fabio Bas 2014-10-02 23:45:42 +02:00
  • 7c935519eb use 4 spaces instead of tabs Fabio Bas 2014-10-02 23:42:51 +02:00
  • 952f25054c servatrice: as a third choice, check for a config in /etc/servatrice/ Fabio Bas 2014-10-02 23:41:24 +02:00
  • 0caf7bb193 win32: Avoid wiping server.log on upgrade Fabio Bas 2014-10-02 23:26:25 +02:00
  • 04f173f934 Servatrice: Add a default option for every config value Fabio Bas 2014-10-02 23:11:49 +02:00
  • 267e6cd039 Fix logfile option in servatrice.ini Fabio Bas 2014-10-02 23:00:17 +02:00
  • 65252dda14 win32 NSIS installer: uninstall servatrice* Fabio Bas 2014-10-02 22:46:46 +02:00
  • 57c1aba760 Servatrice: group all the use of QSettings in a single file Fabio Bas 2014-10-02 22:37:50 +02:00
  • 2292997e04 Changed 'value' to 'setValue' on line 275 Antony Woods 2014-10-02 08:48:04 +01:00
  • 77bbe6b664 Servatrice: install example ini and sql schema file Fabio Bas 2014-10-02 08:34:21 +02:00
  • 7b4dabac78 Note that libgcrypt is needed only for qt4 Gavin Bisesi 2014-10-01 16:30:19 -04:00
  • 909657b3ca Drop libgcrypt dependency for qt5 Fabio Bas 2014-10-01 20:21:22 +02:00
  • a26ebee8e3 Fix oracle under windows Fabio Bas 2014-09-15 16:15:27 +02:00
  • 0d0fe73369 Added the location Oracle attempted to save cards.xml to the failure message. Peng Liu 2014-09-15 06:15:18 -04:00
  • 41a6af8ee4 Add sideboard helpers. Yuki Izumi 2014-08-30 18:27:45 +10:00
  • 7104382e51 Adding modified translation files Antony Woods 2014-09-09 17:30:37 +01:00
  • b8ea6e09ce 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
  • cc5fb333f7 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
  • e6b007b36e Removed unused variable, bool stripped, from classes and functions. Peng Liu 2014-08-11 13:47:47 -04:00
  • cd64af7803 Fix crash #202 Fabio Bas 2014-08-11 10:50:55 +02:00
  • 1f35e2d140 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
  • 0261862b1b Fix configuration loading Fabio Bas 2014-10-04 10:33:55 +02:00
  • e240e47d2f Fixed svg for icon Matt Lowe 2014-10-03 00:30:24 +02:00
  • 7cdd2a26f6 Icon changes Matt Lowe 2014-10-02 22:24:43 +02:00
  • 294edb3295 Logo and card back refresh Matt Lowe 2014-10-02 21:01:45 +02:00
  • 4b94cde360 Merge 98d50cffc7 into 73c963e9c4 Matthew Lowe 2014-10-03 14:56:14 +00:00
  • 73c963e9c4 Merge pull request #346 from ctrlaltca/servatrice_win32 Gavin Bisesi 2014-10-03 10:56:13 -04:00
  • 98d50cffc7 Fixed svg for icon Matt Lowe 2014-10-03 00:30:24 +02:00
  • 871f5f7c94 use qWarning instead of std::err Fabio Bas 2014-10-02 23:45:42 +02:00
  • 8d8ccaad7f use 4 spaces instead of tabs Fabio Bas 2014-10-02 23:42:51 +02:00
  • 37eaeaae13 servatrice: as a third choice, check for a config in /etc/servatrice/ Fabio Bas 2014-10-02 23:41:24 +02:00
  • 85a4a94ba3 win32: Avoid wiping server.log on upgrade Fabio Bas 2014-10-02 23:26:25 +02:00
  • b348068369 Servatrice: Add a default option for every config value Fabio Bas 2014-10-02 23:11:49 +02:00
  • 4b38187d20 Fix logfile option in servatrice.ini Fabio Bas 2014-10-02 23:00:17 +02:00
  • 8b32e51cab win32 NSIS installer: uninstall servatrice* Fabio Bas 2014-10-02 22:46:46 +02:00
  • a1b6600fe1 Servatrice: group all the use of QSettings in a single file Fabio Bas 2014-10-02 22:37:50 +02:00
  • 4b4bebdc35 Icon changes Matt Lowe 2014-10-02 22:24:43 +02:00
  • 3d1f540293 WIP images Matt Lowe 2014-10-02 21:16:04 +02:00
  • 93af823b2e Logo and card back refresh Matt Lowe 2014-10-02 21:01:45 +02:00
  • 277aba79dc Merge pull request #336 from poixen/master Gavin Bisesi 2014-10-02 15:00:17 -04:00
  • 48817ed283 Merge pull request #314 from ctrlaltca/win32_setup_fix Gavin Bisesi 2014-10-02 10:35:22 -04:00
  • 9e63c7fa35 Merge pull request #313 from pliu037/oracle-error-msg Gavin Bisesi 2014-10-02 10:35:05 -04:00
  • 3c598531ed Merge pull request #342 from acron0/auto-connect-fix Gavin Bisesi 2014-10-02 10:06:47 -04:00
  • 263b5a40f5 Merge pull request #341 from ctrlaltca/servatrice_install_configs Gavin Bisesi 2014-10-02 10:06:03 -04:00
  • 283bac0b80 Merge pull request #339 from ctrlaltca/qt5_no_libgcrypt Gavin Bisesi 2014-10-02 10:05:17 -04:00
  • 1f58f7d848 Changed 'value' to 'setValue' on line 275 Antony Woods 2014-10-02 08:48:04 +01:00
  • 7afdff1b3b Servatrice: install example ini and sql schema file Fabio Bas 2014-10-02 08:34:21 +02:00
  • 55b20343e9 Note that libgcrypt is needed only for qt4 Gavin Bisesi 2014-10-01 16:30:19 -04:00
  • 355de8fba4 Drop libgcrypt dependency for qt5 Fabio Bas 2014-10-01 20:21:22 +02:00
  • b32aeb2211 Merge pull request #280 from pliu037/remove-.full-req Gavin Bisesi 2014-10-01 13:50:02 -04:00
  • e3a94ecca3 Token PT is now set to DB values if not defined in event. Matt Lowe 2014-10-01 19:20:42 +02:00
  • 7eed007f14 Merge pull request #281 from ctrlaltca/fix_202 Gavin Bisesi 2014-09-30 20:35:11 -04:00
  • a80ccd882c Tokens use PT levels from cards.xml if available Matt Lowe 2014-10-01 00:57:07 +02:00
  • 9752dcf495 Merge pull request #332 from ctrlaltca/sideboard-helpers Gavin Bisesi 2014-09-30 13:46:43 -04:00
  • eaad8de8d0 Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers Fabio Bas 2014-09-29 18:25:10 +02:00
  • b5de708756 Merge pull request #289 from acron0/auto-connect Gavin Bisesi 2014-09-29 10:24:06 -04:00
  • ab7f354e36 Merge pull request #318 from catmanjan/master Gavin Bisesi 2014-09-19 10:22:04 -04:00
  • 6f97e59c03 Change default scry to 1. Jan Martin 2014-09-19 21:41:57 +10:00
  • 98e5211ad5 Fix oracle under windows Fabio Bas 2014-09-15 16:15:27 +02:00
  • 3cd6cc9195 Added the location Oracle attempted to save cards.xml to the failure message. Peng Liu 2014-09-15 06:15:18 -04:00
  • 8928a699f9 fix: grammar in french translation Zack Dibe 2014-09-11 23:44:52 +02:00
  • 54e3867c72 finish fr translation Mawu3n4 2014-09-11 09:59:49 +02:00
  • 466f5ae5e1 add: FR translations and fix bad grammar Mawu3n4 2014-09-10 20:48:40 +02:00
  • 86e3780c66 Merge 0c0b3caa10 into 9586212f60 Zack Dibe 2014-09-11 12:24:06 +00:00
  • 0c0b3caa10 fix: back to a basic gitignore Mawu3n4 2014-09-11 14:22:12 +02:00
  • 94cb0b05a8 fix: build in gitignore Mawu3n4 2014-09-11 14:15:19 +02:00
  • 45266997f0 Merge 2aeecc6063 into 9586212f60 satsukiyatoshi 2014-09-11 08:11:56 +00:00
  • cf2ac1f5cf add: gitignore Mawu3n4 2014-09-11 10:02:06 +02:00
  • 3d90bd8892 add: more thorough gitignore Mawu3n4 2014-09-11 10:01:18 +02:00
  • 62c20dc0db finish fr translation Mawu3n4 2014-09-11 09:59:49 +02:00
  • fefb6fc612 Add sideboard helpers. Yuki Izumi 2014-08-30 18:27:45 +10:00
  • f94f4c6553 add: FR translations and fix bad grammar Mawu3n4 2014-09-10 20:48:40 +02:00
  • 0b5f79623f add: gitignore and build files in giitignore Mawu3n4 2014-09-10 20:48:08 +02:00
  • f1b012c83d Adding modified translation files Antony Woods 2014-09-09 17:30:37 +01:00
  • dbe46084ac Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect Antony Woods 2014-09-09 17:22:55 +01:00
  • 2aeecc6063 Add note about tech support Gavin Bisesi 2014-09-09 12:04:06 -04:00
  • fce1d6ac3f Change Qt4 to Qt4+5 in readme Gavin Bisesi 2014-09-08 14:46:27 -04:00
  • 64791b45f6 Add note on updating translations. Gavin Bisesi 2014-09-08 14:46:01 -04:00
  • 3c7abecac6 Merge pull request #292 from ctrlaltca/cmake_translations Gavin Bisesi 2014-09-08 09:38:55 -04:00
  • d6b97976f9 Refreshed all translation files Fabio Bas 2014-09-06 10:40:23 +02:00
  • a0b35ee60b Cockatrice - CMake: Include all existing translation files using a glob Fabio Bas 2014-09-06 10:38:59 +02:00
  • e5eda9f172 Add a UPDATE_TRANSLATIONS options that actually updates translations! Fabio Bas 2014-09-04 16:15:01 +02:00
  • 8c072224c8 Move travis ci badge to Building section Gavin Bisesi 2014-09-03 17:53:32 -04:00
  • d93cb0a637 Add link to Gitter chat Gavin Bisesi 2014-09-03 17:52:31 -04:00