Commit Graph
1495 Commits
Author SHA1 Message Date
woogerboy21 d246fa39fe Registered Only Server
Implemented the ability to set the server to only allow registered
users.  Also updated client to reflect the log-in rejection as well as
put a check in place for the server to not start if db connection is not
available yet registration is required.
2014-07-02 20:52:22 -04:00
Gavin Bisesi fb4a7b3274 Give more friendly login error message 2014-07-01 12:04:33 -04:00
Gavin Bisesi e955732ba8 Merge pull request #163 from arxanas/vanguard-card-names
Fix #155: Vanguard card names no longer conflict with regular card names.
2014-07-01 07:04:01 -04:00
arxanas f730dca14c Fix #155: Vanguard card names no longer conflict with regular card names. 2014-07-01 02:29:25 -04:00
Daenyth 4d6f46b06e Change client ping send interval to 9 sec 2014-06-29 14:46:06 -04:00
Daenyth ec3690fd29 Fix typo in gcc opts 2014-06-28 11:04:12 -04:00
Daenyth 8d31fe6cbc Clean up deck load chat message 2014-06-28 09:04:45 -04:00
Daenyth 4c2a553f03 Have servatrice inform players of sideboard size
Ref #142
2014-06-28 00:36:43 -04:00
Daenyth c0bd7db658 Install libgcrypt on osx travis 2014-06-27 22:57:24 -04:00
Daenyth 38aa1f60ed Don't pass warn/err flags for release mode build.
It's making travis complicated
2014-06-27 22:50:21 -04:00
Daenyth 6d3fe428e7 Fix some warnings
Ref #127
2014-06-27 22:19:23 -04:00
Daenyth d3b4ef38a0 Compile servatrice on travis 2014-06-27 20:42:19 -04:00
Daenyth 6da64315d2 Merge branch 'pr138' 2014-06-27 20:00:46 -04:00
Daenyth 1d02e0d5ec Clarify comment about typedef for OSX compiling 2014-06-27 20:00:29 -04:00
Gavin Bisesi e258f8625a Merge pull request #121 from woogerboy21/serverlog-filtering
Server log filtering
2014-06-27 19:02:30 -04:00
woogerboy21 f685bd2abe formatting
4 space indent + code flow rewrite for easier readability.
2014-06-27 18:18:03 -04:00
arxanas 080fd326ed Fixed #131: Compiles on OS X now. 2014-06-26 16:57:47 -04:00
woogerboy21 b83fe95b05 removed extra un-needed empty line.
removed extra un-needed empty line.
2014-06-26 14:46:22 -04:00
woogerboy21 365de1fdd0 added multiple filter capabilities
changed the single qstring log filtering to qstringlist to allow multiple filtering capabilities
2014-06-26 14:38:57 -04:00
woogerboy21 977cf7340a settings update/addition
updated settings name (loglevel) to a more descriptive name (writelog)
added logfilters setting to allow user defined filters.
2014-06-26 00:40:21 -04:00
woogerboy21 91a96643f0 updated filtering code
rewrote filtering code to allow for user input
code only filters on single string at the moment (still needs updated).
2014-06-26 00:38:43 -04:00
Daenyth fb7de2ad1d Merge branch 'windows-nsis-fix' 2014-06-25-Release 2014-06-25 20:26:56 -04:00
Daenyth 144bb7fa89 Merge remote-tracking branch 'origin/invalid-windows-paths' 2014-06-25 20:26:46 -04:00
Gavin Bisesi fcc62a1e1f Use defined(Q_OS_WIN) in #elif to satisfy MSVC
It's always windows.
2014-06-25 17:09:17 -04:00
Gavin Bisesi bda01b2044 Install dependencies for travis more generally 2014-06-25 11:48:48 -04:00
Gavin Bisesi 2d400e55c7 Add OSX build flag to travis yml 2014-06-25 11:33:40 -04:00
Gavin Bisesi 0e7a5e582c Merge pull request #129 from VanNostrand/doc
Recompiled usermanual.
2014-06-25 10:12:12 -04:00
Mark Morschhäuser 312acb3402 Recompiled usermanual. 2014-06-25 09:16:00 +02:00
Daenyth aee86ce45a Mark QGraphicsItem for AbstractGraphicsItem 2014-06-25 01:53:19 -04:00
Daenyth 1c9540befa Set cmake module path to local for findqtmobility 2014-06-25 01:48:30 -04:00
Daenyth 0eb00fe39c Add build-essential to travis cfg
This can't be causing the failure can it? It can't find QtMultimedia..
2014-06-25 01:31:43 -04:00
Daenyth 5ea59908a8 Cache apt for travis 2014-06-25 01:29:06 -04:00
Daenyth 8a331e30c6 Don't install qtmultimedia - not needed 2014-06-25 01:24:14 -04:00
Daenyth 44445704e7 Install qt-multimedia-dev for travis 2014-06-25 01:21:24 -04:00
Daenyth ba1fc86f29 Install qt dep for travis 2014-06-25 01:18:52 -04:00
Daenyth 478c7f234f Set up dependencies for travis 2014-06-25 01:17:12 -04:00
Daenyth 0dd4661b7c Add travis build icon to README 2014-06-25 01:14:43 -04:00
Daenyth 0b87821497 Add rough draft for .travis.yml 2014-06-25 01:08:41 -04:00
Daenyth d811fee2f3 Include missing qdebug
Dunno how I missed that.

Fix #128
2014-06-25 00:11:55 -04:00
Gavin Bisesi 65f59747c9 Merge pull request #116 from ctrlaltca/feature-cpack
Use cpack to create osx's dmg
2014-06-24 21:08:57 -04:00
Daenyth df659e58fe Mask set shortcodes for windows illegal filenames
Ref #122
2014-06-24 20:49:03 -04:00
Daenyth e5d9692d78 Fall back to plain text load when xml load fails 2014-06-24 00:14:59 -04:00
Daenyth 0420f4f7af Log download failures 2014-06-23 23:44:13 -04:00
Daenyth 02fb28eb9b Merge branch 'master' into windows-nsis-fix 2014-06-23 23:16:20 -04:00
Daenyth 632e7f487c Add debugging to file for windows 2014-06-23 23:15:53 -04:00
Daenyth e925403bc5 Log cardname when downloading 2014-06-23 22:18:40 -04:00
Daenyth fc599972f3 Write to APPDATA/Cockatrice, not APPDATA 2014-06-23 21:25:09 -04:00
Daenyth f1e6aebaba Set cockatrice path settings to use appdata instead of instdir
Putting user stuff in program files is bad
2014-06-23 21:21:08 -04:00
Daenyth f7635f9e49 Don't recursive remove program files/cockatrice.
This should prevent deleting old deck files
2014-06-23 21:12:25 -04:00
woogerboy21 ec00bdebed verbose incrementation
removed un-used variables
changed switch case to increase verbose level as loglevel increases
captured unset loglevel to default to highest verbose log level
2014-06-23 09:18:49 -04:00