jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
2849 commits 43 branches 177 tags 141 MiB
Commit graph

438 commits

Author SHA1 Message Date
Zach
f3ee1eac12 Merge pull request #1287 from ctrlaltca/servatrice_db_version 
Fix misleading error message in servatrice; fix #1275
 2015-07-25 22:36:01 -07:00
Fabio Bas
946410de2b Fix misleading error message in servatrice; fix #1275 2015-07-22 17:51:30 +02:00
Fabio Bas
7f358d289e Fix calculation of ban expiration; fix #1283 2015-07-21 22:32:31 +02:00
Fabio Bas
5dc7c60b4d reorder parameters 2015-07-15 15:17:23 +02:00
Fabio Bas
056edd8570 Merge memory leak fix for smtp client 
source:
c12f70b721
fd4feb5c0f17ddef93d5a56
 2015-07-15 12:42:56 +02:00
woogerboy21
51d12f3ed6 Merge pull request #1259 from woogerboy21/update_servatrice_scripts 
Script Cleanup
 2015-07-14 15:33:11 -04:00
woogerboy21
795c05257f Inactive accounts script description update 
Updated description in script to clarify things.
 2015-07-14 15:10:25 -04:00
woogerboy21
44025c667e Script Cleanup 
Added the ability to specify custom database name.
Added the ability to specify custom table prefix.
Created sub folders for operating systems.
 2015-07-14 15:05:02 -04:00
woogerboy21
d91bbcfbce Removed Player Count Debug Line 
Removed the output put to console for every logged in user.  It just cluttered things up.
 2015-07-14 08:54:05 -04:00
woogerboy21
a9acb3f1cc Total Max User Restriction 
Syntax correction.
 2015-07-13 17:54:03 -04:00
woogerboy21
aa540f7968 Merge pull request #1240 from woogerboy21/db_backup_scripts 
Update DB Scripts
 2015-07-13 13:51:08 -04:00
Zach
7ebf817b17 Merge pull request #1197 from Cockatrice/cpp11 2015-07-13 13:23:18 -04:00
woogerboy21
217d8fa165 Multi Server Session Functionality 
Fix #1130
Adds the server id in the SQL query for userSessionExists function.
 2015-07-11 23:18:37 -04:00
woogerboy21
ff5ea7fc1f Added log maint script 
Added log maint script
 2015-07-11 17:03:37 -04:00
woogerboy21
9338e7e71f Added -e option 
Added -e option by request
Updated process checking method to allow -e option
 2015-07-11 16:35:12 -04:00
woogerboy21
10019bf985 Cleanup 
Added -u options by request.
Removed line for running log cleanup prior to backup.
Added abort warning.
 2015-07-11 15:41:59 -04:00
woogerboy21
04c09647d7 Update DB Scripts 
Added backup / restore scripts.
Added table size script
Updated existing scripts to use variable location for mysql.cnf file
 2015-07-11 11:22:54 -04:00
Matt Lowe
894d6c8d2d Refactored tabs to spaces 
Removed tabs in favour of 4 spaces.
 2015-07-07 21:01:19 +02:00
Fabio Bas
14bce93c7a make gcc an happy puppy 2015-07-06 09:14:29 +02:00
Fabio Bas
68f1358f54 rebased on master 2015-07-05 22:48:09 +02:00
Fabio Bas
7f5f290c93 Profile management 2015-07-05 22:44:35 +02:00
Fabio Bas
26f317ee75 Profile management 2015-07-05 16:39:55 +02:00
Zach
31890450dc Merge pull request #1205 from ZeldaZach/fix_1173 
Server Name Rules Information
 2015-07-04 19:37:50 -04:00
woogerboy21
a14a642b2b Merge pull request #1181 from ctrlaltca/servatrice_reload_config 
Servatrice: refactor signal handling and permit config reloading
 2015-07-03 12:29:12 -04:00
Gavin Bises
8ed9d35724 Update project to C++11 compilation. 2015-07-03 10:02:31 -04:00
Fabio Bas
f5be6f836e Improved logging of SIGHUP and cmdReloadConfig 2015-07-03 09:09:41 +02:00
Fabio Bas
af9140d8c4 make gcc an happy puppy 2015-07-01 20:13:38 +02:00
Fabio Bas
8cac72158a MSVC fixes 2015-06-30 22:33:29 +02:00
Fabio Bas
6cf3db7e6b Servatrice: refactor signal handling and permit config reloading 2015-06-30 22:21:26 +02:00
Fabio Bas
02dcaff356 Publish username rules in login failure, too 2015-06-30 18:44:40 +02:00
Fabio Bas
4c27304047 publish username rules in registration failure 2015-06-29 23:35:27 +02:00
woogerboy21
304835c526 Activation Email Misspelling 
Corrected the misspelling of the word "activating' in the servatrice.ini example file.
 2015-06-29 17:05:48 -04:00
Matt Lowe
23b163341e Escaped additional punctuation 2015-06-24 13:08:38 +02:00
Matt Lowe
d76073cdd1 Added default values 2015-06-22 22:02:36 +02:00
Matt Lowe
a795d7d884 Moved username formatting to INI file 
Rather than having the username limitations hard coded, I have moved it
into the ini file. I have added some examples to the code and also to
the ini.

This is only and example and can be expanded on by others.
 2015-06-20 23:14:45 +02:00
Fabio Bas
25a202b6fc Typo 2015-06-03 08:38:50 +02:00
Fabio Bas
0688dce449 Sql: Added "IF NOT EXISTS" where missing 2015-06-01 14:48:38 +02:00
Fabio Bas
135205d368 Implement migrations; fix #153 2015-05-31 17:36:15 +02:00
Fabio Bas
83773e5e37 Fix #1119 2015-05-31 16:52:22 +02:00
Fabio Bas
657a5164e9 Fix servatrice compilation with msvc 2015-05-25 17:07:47 +02:00
Fabio Bas
13b8fd4516 gcc -Werror=unused-parameter 2015-05-24 23:15:23 +02:00
Fabio Bas
471f6371b5 More work 
* Refactored code out of common/ into servatrice/
 * added smtp client library
 * disable registration when connected
 * validate email address
 * send activation token via email
 2015-05-24 23:02:51 +02:00
Fabio Bas
8cf4461616 fix qt4 compilation 2015-05-24 01:00:55 +02:00
Fabio Bas
ff1aed717e Added token generation, user activation command and response. 2015-05-24 00:37:45 +02:00
Fabio Bas
d7b6f76191 missing file from previous commit 2015-05-23 20:13:21 +02:00
Fabio Bas
5ace0dd892 Almost completed registration 
* added missing bits of serverside code;
 * added fronted in client;
 * removed demo python scripts;
 2015-05-23 20:13:03 +02:00
Gavin Bises
735fcbf311 Add first draft of protocol extension for registration 
Stub for registration command handling in server

First draft of handling registration requests

WIP (will be rebased)

clean up bad imports (rebase this later)

Finish checkUserIsBanned method

Add username validity check

Check servatrice registration settings

WIP

Finish(?) server side of registration

Needs testing

Fix switch case compile failure

I have no idea why I have to do this

WIP for registration testing python script

Stub register script initial attempt

Rearrange register script

First try at sending reg

register.py sends commands correctly now

Add more debug to register.py

Pack bytes the right way - servatrice can parse py script sends now

register.py should be working now

Parse xml hack correctly

Log registration enabled settings on server start

Insert gender correctly on register

Show tcpserver error message on failed gameserver listen

Fail startup if db configured and can't be opened.

TIL qt5 comes without mysql by default in homebrew...
 2015-05-22 18:55:51 +02:00
Fabio Bas
590894d283 Fix macro for MSVC; fix #1063 2015-05-11 09:00:25 +02:00
Fabio Bas
c605948975 Catch std exceptions thrown by protobuf and try to pretty print them 2015-05-02 21:17:55 +02:00
tooomm
a6970d9624 svg+png updates 
-updated and cleaned up cockatrice+servatrice svg's
-added old original svg's for future adjustments
-updated cockatrice+servatrice png's

ico+icns updates

-see #925 for more details
-updated svg's as source for new icon files

bmp updates

-updated svg's as source for new installer logos

cleaned up oracle.svg

cleaned up oracle.svg /2

svg updates /2

removed sensible data

`inkscape:export-filename` removed

removed sensible data

inkscape:export-filename

removed sensible data

inkscape:export-filename

removed sensible data

inkscape:export-filename

fix

fix2
 2015-04-28 16:06:36 +02:00