Commit graph

  • b9cb61abd0 First draft of better pic url error handling Daenyth 2014-06-29 23:00:58 -04:00
  • 922e98af67 Add pricing from deckbrew.com Fabio Bas 2014-06-29 23:30:32 +02:00
  • 4d6f46b06e Change client ping send interval to 9 sec Daenyth 2014-06-29 14:46:06 -04:00
  • d86fa410df Chat room: ensure focus on the input line Fabio Bas 2014-06-29 19:16:31 +02:00
  • 27bd00bec8 Direct chat: ensure focus is on the input line; fixes #113 Fabio Bas 2014-06-29 18:06:39 +02:00
  • 052996b7a1 Merge remote-tracking branch 'upstream/master' into cmake_qt5 Fabio Bas 2014-06-29 17:13:12 +02:00
  • c0981a1743 Prettier package name Fabio Bas 2014-06-28 19:53:15 +02:00
  • 3509df76b7 Remove old version parsing from nsis script Fabio Bas 2014-06-28 19:48:51 +02:00
  • fc5a193e0d NSIS: remove additional files on uninstall Fabio Bas 2014-06-28 19:39:47 +02:00
  • fc24ffdec2 Cmake reorganization Fabio Bas 2014-06-28 19:39:26 +02:00
  • e997b1d2bc Windows: drop the old nsis script Fabio Bas 2014-06-28 18:44:19 +02:00
  • 803fd7c95d Windows: Generate an nsis package on the fly with "make package" Fabio Bas 2014-06-28 18:43:18 +02:00
  • ec3690fd29 Fix typo in gcc opts Daenyth 2014-06-28 11:04:12 -04:00
  • 29a7415f95 Merge pull request #3 from Daenyth/cmake_qt5 ctrlaltca 2014-06-28 15:27:51 +02:00
  • 09d6d26fb2 Merge branch 'master' into cmake_qt5 Daenyth 2014-06-28 09:13:10 -04:00
  • 8d31fe6cbc Clean up deck load chat message Daenyth 2014-06-28 09:04:45 -04:00
  • 4c2a553f03 Have servatrice inform players of sideboard size Daenyth 2014-06-28 00:36:08 -04:00
  • c0bd7db658 Install libgcrypt on osx travis Daenyth 2014-06-27 22:57:24 -04:00
  • 38aa1f60ed Don't pass warn/err flags for release mode build. Daenyth 2014-06-27 22:50:21 -04:00
  • 6d3fe428e7 Fix some warnings Daenyth 2014-06-27 22:19:23 -04:00
  • d3b4ef38a0 Compile servatrice on travis Daenyth 2014-06-27 20:42:19 -04:00
  • 6da64315d2 Merge branch 'pr138' Daenyth 2014-06-27 20:00:46 -04:00
  • 1d02e0d5ec Clarify comment about typedef for OSX compiling Daenyth 2014-06-27 20:00:29 -04:00
  • e258f8625a Merge pull request #121 from woogerboy21/serverlog-filtering Gavin Bisesi 2014-06-27 19:02:30 -04:00
  • f685bd2abe formatting woogerboy21 2014-06-27 18:18:03 -04:00
  • 69a8fa0bb1 formatting woogerboy21 2014-06-27 18:17:19 -04:00
  • d19340a117 Windows: create nsis package using cake Fabio Bas 2014-06-27 20:21:26 +02:00
  • 096f200eb9 Install libraries and plugins automatically under windows Fabio Bas 2014-06-27 17:40:29 +02:00
  • fc8c55ae97 Added cmake policy specific for win32 compilation Fabio Bas 2014-06-27 17:24:25 +02:00
  • 34772cccab Compilation fix for MSVC+Qt5 Fabio Bas 2014-06-27 17:09:09 +02:00
  • 54805fb14e Merge remote-tracking branch 'upstream/master' into cmake_qt5 Fabio Bas 2014-06-27 15:21:01 +02:00
  • 080fd326ed Fixed #131: Compiles on OS X now. arxanas 2014-06-26 16:57:47 -04:00
  • b83fe95b05 removed extra un-needed empty line. woogerboy21 2014-06-26 14:46:22 -04:00
  • c30c23f8c5 removed extra un-needed empty line. woogerboy21 2014-06-26 14:45:56 -04:00
  • 365de1fdd0 added multiple filter capabilities woogerboy21 2014-06-26 14:38:57 -04:00
  • 0f710fd480 added multiple filter capabilities woogerboy21 2014-06-26 14:37:45 -04:00
  • 634dd91b66 Set some cmake policies to mute cmake warnings Fabio Bas 2014-06-26 20:19:47 +02:00
  • 977cf7340a settings update/addition woogerboy21 2014-06-26 00:40:21 -04:00
  • 91a96643f0 updated filtering code woogerboy21 2014-06-26 00:38:43 -04:00
  • 1ef419a875 revised filtering code woogerboy21 2014-06-26 00:35:39 -04:00
  • 5cdb4b5136 updated for revised server log filtering woogerboy21 2014-06-26 00:30:38 -04:00
  • fb7de2ad1d Merge branch 'windows-nsis-fix' 2014-06-25-Release Daenyth 2014-06-25 20:26:56 -04:00
  • 144bb7fa89 Merge remote-tracking branch 'origin/invalid-windows-paths' Daenyth 2014-06-25 20:26:46 -04:00
  • fcc62a1e1f Use defined(Q_OS_WIN) in #elif to satisfy MSVC Gavin Bisesi 2014-06-25 17:09:17 -04:00
  • 62ca6130d1 #include <QtConcurrent> only for qt5, qt4 has this in QtCore Fabio Bas 2014-06-25 19:28:03 +02:00
  • 4e56ceb623 revert changes in .travis.yml Fabio Bas 2014-06-25 19:13:11 +02:00
  • 07ed519a25 Apply the patch in the previous commit globally Fabio Bas 2014-06-25 19:12:38 +02:00
  • 382a382c70 Maybe workaround buggy cmake module Fabio Bas 2014-06-25 18:50:58 +02:00
  • 4e4401a9e2 maybe fix travis build for ubuntu Fabio Bas 2014-06-25 18:39:26 +02:00
  • 567a6db184 Merge remote-tracking branch 'upstream/master' into cmake_qt5 Fabio Bas 2014-06-25 18:38:02 +02:00
  • bda01b2044 Install dependencies for travis more generally Gavin Bisesi 2014-06-25 11:48:48 -04:00
  • 2d400e55c7 Add OSX build flag to travis yml Gavin Bisesi 2014-06-25 11:33:40 -04:00
  • 0e7a5e582c Merge pull request #129 from VanNostrand/doc Gavin Bisesi 2014-06-25 10:12:12 -04:00
  • 2354ed6909 Require Qt4 >=4.8.0; remove some ifdefs on qt version Fabio Bas 2014-06-25 16:00:48 +02:00
  • c4458b16b2 Qt5: fix plugin installation Fabio Bas 2014-06-25 15:53:25 +02:00
  • 809f390e2f Merge remote-tracking branch 'upstream/master' into cmake_qt5 Fabio Bas 2014-06-25 15:46:50 +02:00
  • 312acb3402 Recompiled usermanual. Mark Morschhäuser 2014-06-25 09:16:00 +02:00
  • 7035150351 Deckstats: move QUrl handling into its own function; better separation of qt4/qt5 code Fabio Bas 2014-06-25 09:07:02 +02:00
  • aee86ce45a Mark QGraphicsItem for AbstractGraphicsItem Daenyth 2014-06-25 01:53:19 -04:00
  • 1c9540befa Set cmake module path to local for findqtmobility Daenyth 2014-06-25 01:48:30 -04:00
  • 0eb00fe39c Add build-essential to travis cfg Daenyth 2014-06-25 01:31:43 -04:00
  • 5ea59908a8 Cache apt for travis Daenyth 2014-06-25 01:29:06 -04:00
  • 8a331e30c6 Don't install qtmultimedia - not needed Daenyth 2014-06-25 01:24:14 -04:00
  • 44445704e7 Install qt-multimedia-dev for travis Daenyth 2014-06-25 01:21:24 -04:00
  • ba1fc86f29 Install qt dep for travis Daenyth 2014-06-25 01:18:52 -04:00
  • 478c7f234f Set up dependencies for travis Daenyth 2014-06-25 01:17:12 -04:00
  • 0dd4661b7c Add travis build icon to README Daenyth 2014-06-25 01:14:43 -04:00
  • 0b87821497 Add rough draft for .travis.yml Daenyth 2014-06-25 00:58:58 -04:00
  • d811fee2f3 Include missing qdebug Daenyth 2014-06-25 00:11:55 -04:00
  • 65f59747c9 Merge pull request #116 from ctrlaltca/feature-cpack Gavin Bisesi 2014-06-24 21:08:57 -04:00
  • df659e58fe Mask set shortcodes for windows illegal filenames Daenyth 2014-06-24 20:49:03 -04:00
  • 6dbdaafb33 Ported cockatrice Fabio Bas 2014-06-24 19:13:47 +02:00
  • bab340f7b7 Reworked a bit message handling from previous commit Fabio Bas 2014-06-24 18:52:04 +02:00
  • 2953c6ba2a Ported servatrice Fabio Bas 2014-06-24 18:42:46 +02:00
  • 80f68306b5 Ported oracle to Qt5 Fabio Bas 2014-06-24 18:28:09 +02:00
  • 5c13c06982 Merge remote-tracking branch 'upstream/master' into cmake_qt5 Fabio Bas 2014-06-24 18:13:26 +02:00
  • e5d9692d78 Fall back to plain text load when xml load fails Daenyth 2014-06-24 00:14:59 -04:00
  • 0420f4f7af Log download failures Daenyth 2014-06-23 23:44:13 -04:00
  • 02fb28eb9b Merge branch 'master' into windows-nsis-fix Daenyth 2014-06-23 23:16:20 -04:00
  • 632e7f487c Add debugging to file for windows Daenyth 2014-06-23 23:15:53 -04:00
  • e925403bc5 Log cardname when downloading Daenyth 2014-06-23 22:18:40 -04:00
  • fc599972f3 Write to APPDATA/Cockatrice, not APPDATA Daenyth 2014-06-23 21:25:09 -04:00
  • f1e6aebaba Set cockatrice path settings to use appdata instead of instdir Daenyth 2014-06-23 21:21:08 -04:00
  • f7635f9e49 Don't recursive remove program files/cockatrice. Daenyth 2014-06-23 21:12:25 -04:00
  • ec00bdebed verbose incrementation woogerboy21 2014-06-23 09:18:49 -04:00
  • 39e0c5a887 variable cleanup woogerboy21 2014-06-23 09:16:40 -04:00
  • 46ceeadbbd updated code structure woogerboy21 2014-06-23 03:41:46 -04:00
  • 234a68dfd0 improved code structure woogerboy21 2014-06-23 03:38:26 -04:00
  • 36e4b84ba7 Merge pull request #2 from Daenyth/feature-cpack ctrlaltca 2014-06-23 08:43:07 +02:00
  • c5fae5682a updated for clarity woogerboy21 2014-06-23 01:39:13 -04:00
  • f8b2e81283 revised log filter code woogerboy21 2014-06-23 01:20:45 -04:00
  • 236e0a4197 added loglevel variable woogerboy21 2014-06-23 00:09:21 -04:00
  • 5592346979 added server log filtering woogerboy21 2014-06-23 00:07:12 -04:00
  • ea08fe168c Fix Q_INTERFACES warnings Daenyth 2014-06-22 22:32:53 -04:00
  • 4574df0a2e Remove testclient cmake option. Daenyth 2014-06-22 21:25:57 -04:00
  • e5d15e8dbc Notify deck editor when price feature setting is changed Daenyth 2014-06-22 21:19:53 -04:00
  • 951f08dd11 Update CentOS doc in user manual Daenyth 2014-06-22 20:50:49 -04:00
  • c54f7b9245 Log on failed path copy Daenyth 2014-06-22 20:14:22 -04:00
  • 3e43429f13 Merge branch 'feature-cpack' of github.com:Daenyth/Cockatrice into feature-cpack Daenyth 2014-06-22 20:08:30 -04:00
  • 2ca145f908 Merge branch 'feature-cpack' of https://github.com/ctrlaltca/Cockatrice into feature-cpack Fabio Bas 2014-06-22 23:44:04 +02:00