jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 00:24:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1495 commits 44 branches 177 tags 141 MiB
Commit graph

285 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
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
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
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
woogerboy21
46ceeadbbd updated code structure 
cleaned code structure up for clarity
 2014-06-23 03:41:46 -04:00
woogerboy21
236e0a4197 added loglevel variable 
added log filtering variable
 2014-06-23 00:09:21 -04:00
woogerboy21
5592346979 added server log filtering 
added log filtering based on configuration file setting
0 = log everything
1 = log nothing
2 = chat logging only
 2014-06-23 00:07:12 -04:00
Fabio Bas
2eebddea9a Port "make package" fix to oracle and servatrice 2014-06-22 23:41:15 +02:00
Fabio Bas
b44365b73c This finally fixes both make install and make package 2014-06-22 23:41:15 +02:00
Fabio Bas
6d1de0c617 Partially revert previous commits; ensure the bundle is fixed up correctly 2014-06-22 23:41:15 +02:00
Fabio Bas
41c7ce8022 Fix qt.conf file creation for "make package" 2014-06-22 23:41:15 +02:00
Fabio Bas
99f3519da5 Workaround permission problem in ixup_bundle 
Without this change, make install and make package would require “sudo”
under osx
 2014-06-22 23:41:15 +02:00
Fabio Bas
eca318c34d Make install paths relative to prepare for CPack 2014-06-12 23:29:42 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
4b49458eeb servatrice's CMakeLists.txt: major overhaul 
* Remove cockatrice_HEADERS (obsoleted by automoc)
* Remove compilation flags definition and Qt4 finding calls
* Make use of CMAKE_INSTALL_PREFIX
* use INSTALL(TARGETS) in place of INSTALL(PROGRAM)
* Osx: create a proper application bundle
* Added comments
 2014-06-10 23:34:01 +02:00
Daenyth
347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
Max-Wilhelm Bruker
ce642e3000 don't use Server_Room::getInfo when updating 2013-02-15 19:31:37 +01:00
Max-Wilhelm Bruker
7a30b827c8 changed Server_Room::gamesMutex to QReadWriteLock 2013-02-11 15:43:31 +01:00
Max-Wilhelm Bruker
49d2fdc93d changed users table in servatrice.sql 2013-02-11 14:40:32 +01:00
Max-Wilhelm Bruker
1f6fbfddb3 updated servatrice.sql 2013-02-03 14:55:18 +01:00
Max-Wilhelm Bruker
b2dbfeb7f3 added thread names (2) 2013-01-27 16:42:53 +01:00
Max-Wilhelm Bruker
ae01144547 added thread names 2013-01-27 16:40:30 +01:00
Max-Wilhelm Bruker
c65f327e71 server crash fixes 2013-01-27 15:15:27 +01:00
Max-Wilhelm Bruker
4f97db62d7 server deadlock fix #2 2013-01-26 17:03:31 +01:00
Max-Wilhelm Bruker
8d596619e7 server deadlock fix 2013-01-26 16:34:24 +01:00
Max-Wilhelm Bruker
d5ccda49a1 server code cleanup 2013-01-23 11:51:59 +01:00
Max-Wilhelm Bruker
2deabebc7c added PasswordHasher::initialize() to make libgcrypt warnings go away 2013-01-12 18:05:08 +01:00
Max-Wilhelm Bruker
d6cddbea13 added index to sql file 2013-01-10 02:01:19 +01:00
Max-Wilhelm Bruker
915e809eb5 changed user -> id_user in decklist_folders and decklist_files (issue #48) 2013-01-10 00:01:06 +01:00
Max-Wilhelm Bruker
2e06b95e5c deadlock fix 2013-01-09 22:28:49 +01:00
Max-Wilhelm Bruker
de87bc6546 compile fixes by hasufell 2012-10-28 21:43:41 +01:00
Max-Wilhelm Bruker
43d7cf6a1a removed recursive lock in server; moved object serialisation to worker thread 2012-10-14 13:19:03 +02:00
Daenyth
af09d0d294 Reject more invalid usernames from clients. 
Specifically this should cover people connecting with a username of
"\u200C"
 2012-07-25 00:12:35 -04:00
Max-Wilhelm Bruker
a1e35ccda5 servatrice: create correct game ids when not using a database 2012-07-17 18:47:00 +02:00
Max-Wilhelm Bruker
c8852b450d don't open database in connection pools if main database connection is not valid 2012-07-17 18:15:10 +02:00
Max-Wilhelm Bruker
2c22fc93ff Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-29 15:48:04 +02:00
Max-Wilhelm Bruker
2eb3df1cde servatrice.sql fixes 2012-06-29 15:47:53 +02:00
Max-Wilhelm Bruker
4d8d2056f6 Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-28 21:35:02 +02:00
Max-Wilhelm Bruker
ed79e8f30a added missing column in servatrice.sql 2012-06-28 21:34:55 +02:00
Max-Wilhelm Bruker
a91090a828 added missing tables in servatrice.sql 2012-06-28 10:54:08 +02:00
Max-Wilhelm Bruker
8e5f5e4cbd added missing table to servatrice.sql 2012-06-27 11:20:53 +02:00
Max-Wilhelm Bruker
e326f9613a added numberPools=0 option to make server unthreaded 2012-06-24 23:49:10 +02:00
Max-Wilhelm Bruker
7d1ad3b4fa Merge branch 'master' of git://github.com/mbruker/Cockatrice into devel 2012-06-10 13:00:58 +02:00
Daenyth
00c03d857e Fix compile error with gcc >= 4.7 2012-06-10 00:11:12 -04:00
Max-Wilhelm Bruker
80439762cf hide login passwords from server log; call logDebugMessage in S_PH thread instead of Server thread 2012-06-03 19:23:15 +02:00
Max-Wilhelm Bruker
d7e7606104 fixed 'open deck in deck editor' option in game, fixed freeze when closing local game 2012-05-28 19:34:07 +02:00