gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,850 Commits 53 Branches 176 Tags
9e349d8b886cc94de1cdf0a37b8827e162088c7b
Commit Graph
338 Commits
Author SHA1 Message Date
woogerboy21 84a5117b4c Default logging to enable with no config file 
If no configuration file is found, default the logger to logging enabled.
 2014-11-11 14:15:02 -05:00
Fabio Bas c0ee060af4 Fixed vendor name 2014-11-09 23:14:36 +01:00
Fabio Bas a716d73a42 OSX: Add proper infos to info.plist 
fixes #411
 2014-11-09 21:03:10 +01:00
woogerboy21 950fc01363 Correct gametype primary key 
Updated rooms_gametype to reflect proper column as primary key.
 2014-10-24 21:02:45 -04:00
Fabio Bas 754b97f212 Servatrice: open in a terminal window when started from the menu 2014-10-11 13:38:07 +02:00
Fabio Bas c0abb347ac Servatrice: Install icons and desktop file under linux 2014-10-11 13:37:52 +02:00
Gavin Bisesi 0f5f82d492 Merge pull request #358 from poixen/serverlogo2 
Servatrice logo
 2014-10-09 11:27:15 -04:00
Matt Lowe 359714214d Added .desktop file 2014-10-08 18:46:31 +02:00
Gavin Bisesi 3c0a09bf5c Merge pull request #361 from woogerboy21/servatrice-dbtable-fix 
correct _room db table, add _rooms_gametypes table
 2014-10-08 08:50:00 -04:00
woogerboy21 9cd1a5b33f correct _room db table, add _rooms_gametypes table 
Corrected table column in _rooms db table and added _rooms_gametypes
table.
 2014-10-07 14:49:24 -04:00
Fabio Bas 22af789c9e Servatrice: log to console authentication method on startup 2014-10-07 17:04:22 +02:00
Matt Lowe 90c2101a43 Removed png file 2014-10-07 16:50:19 +02:00
Matt Lowe 4866e94c86 Renamed resources 
+ renamed the resources to servatrice.*
 2014-10-07 16:49:40 +02:00
Fabio Bas 15555c16fd Fix servatrice's regonly mode 2014-10-06 22:56:09 +02:00
Fabio Bas 0d35488c21 Added schema for _rooms table 2014-10-06 21:49:38 +02:00
Fabio Bas 01bd26d228 Misc typos fixing 2014-10-06 21:44:20 +02:00
Matt Lowe 5b50aa0f0a Servatrice logo 
+ added resources needed for servatrice logo
~ updated CMakeLists.txt to include the new resources
 2014-10-06 21:04:37 +02:00
Fabio Bas 91dafdb3e8 Move server network settings to the bottom and add a disclaimer 2014-10-04 18:21:07 +02:00
Fabio Bas 29cf353913 Give servatrice example configuration some love 
added "password" settings
commented all settings
 2014-10-04 17:51:27 +02:00
Fabio Bas 0d9eec4b64 Servatrice: added authentication type "password" 2014-10-04 17:50:01 +02:00
Fabio Bas 0261862b1b Fix configuration loading 2014-10-04 10:33:55 +02:00
Fabio Bas 871f5f7c94 use qWarning instead of std::err 2014-10-02 23:45:42 +02:00
Fabio Bas 8d8ccaad7f use 4 spaces instead of tabs 2014-10-02 23:42:51 +02:00
Fabio Bas 37eaeaae13 servatrice: as a third choice, check for a config in /etc/servatrice/ 2014-10-02 23:41:24 +02:00
Fabio Bas b348068369 Servatrice: Add a default option for every config value 
add an empty room swell, if none had been defined in the config (or we
are running with no config at all)
 2014-10-02 23:11:49 +02:00
Fabio Bas 4b38187d20 Fix logfile option in servatrice.ini 
servatrice was using hardcocded filename “server.log” even if a custom
value was specified
 2014-10-02 23:00:17 +02:00
Fabio Bas a1b6600fe1 Servatrice: group all the use of QSettings in a single file 
and add a method to guess the path of servatrice.ini
 2014-10-02 22:37:50 +02:00
Gavin Bisesi 263b5a40f5 Merge pull request #341 from ctrlaltca/servatrice_install_configs 
Servatrice: install example ini and sql schema file
 2014-10-02 10:06:03 -04:00
Fabio Bas 7afdff1b3b Servatrice: install example ini and sql schema file 
WIN: in the binary directory
OSX: in the app bundle’s Resources subdirectory
LINUX: in $PREFIX/share/servatrice
 2014-10-02 08:34:21 +02:00
Fabio Bas 355de8fba4 Drop libgcrypt dependency for qt5 2014-10-01 20:21:22 +02:00
Gavin Bisesi 5c46cfc169 Merge pull request #179 from woogerboy21/registered-user-only-server 
Registered Only Server
 2014-08-11 09:03:57 -04:00
Fabio Bas 6e3c7d33da Make protobuf cleanup its resourced when servatrice ends 
Should help make valgrind’s log a bit cleaner
 2014-08-08 13:43:50 +02:00
Fabio Bas 0a5106b8ef Don't leak a QSettings object at every logged message 2014-08-08 09:57:07 +02:00
Fabio Bas 13bd35e020 Servatrice: add prototypes for local functions 2014-07-24 18:16:08 +02:00
Fabio Bas 036980eb44 ISO C++ forbids variable length array 2014-07-24 17:37:54 +02:00
woogerboy21 021f0911c4 Merge remote-tracking branch 'upstream/master' into registered-user-only-server 
Conflicts:
	common/server.cpp
	common/server_protocolhandler.cpp
	servatrice/src/servatrice.cpp
 2014-07-18 23:46:56 -04:00
Fabio Bas d894c53265 Servatrice: fix handling of incoming connections on qt5 2014-07-08 22:05:06 +02:00
Fabio Bas e9895d643f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-07-03 16:40:04 +02:00
woogerboy21 0a1fe7f5a8 Requested Cleanup 
Corrected tab to 4 space (per request)
Moved regonly option under authentication ini location (per request)
 2014-07-02 22:27:05 -04:00
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
woogerboy21 9ba74fee5c Example Update 
Renamed mysql configuration file to include example extension and set
git to ignore mysql.cnf per request.
 2014-07-02 13:23:50 -04:00
woogerboy21 b27873667b Optimization 
Updates for performance improvements per request
 2014-07-02 11:11:17 -04:00
woogerboy21 2b55170110 DB Maint Scripts 
External shell script to help maintain the cockatrice database tables.
 2014-07-01 13:11:52 -04:00
Fabio Bas fc24ffdec2 Cmake reorganization 
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
 2014-06-28 19:39:26 +02:00
Daenyth 09d6d26fb2 Merge branch 'master' into cmake_qt5 
Conflicts:
	cockatrice/src/main.cpp
 2014-06-28 09:13:10 -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
Fabio Bas 096f200eb9 Install libraries and plugins automatically under windows 
You won’t have to copy manually all the dlls in the release directory
anymore
 2014-06-27 17:40:29 +02:00
Fabio Bas 34772cccab Compilation fix for MSVC+Qt5 2014-06-27 17:09:09 +02:00
woogerboy21 b83fe95b05 removed extra un-needed empty line. 
removed extra un-needed empty line.
 2014-06-26 14:46:22 -04:00