Zach
|
c675cf4010
|
Merge pull request #1272 from Fizztastic/fix_577
Joining a full game joins you as spectator
|
2015-07-25 22:16:00 -07:00 |
|
Fabio Bas
|
9c38b08407
|
Again on the same problem
|
2015-07-25 19:51:32 +02:00 |
|
Fabio Bas
|
c714932e25
|
Fix compilation under OSX with homebrew's qt5.5
|
2015-07-25 19:28:30 +02:00 |
|
Fabio Bas
|
1ffc9b4561
|
Refactor servatrice email send
|
2015-07-25 18:48:34 +02:00 |
|
mildmongrel
|
ba50025e80
|
tablezone refactor and cleanup
|
2015-07-24 16:15:08 -07:00 |
|
Fabio Bas
|
800a17e483
|
Force black text color on deck list; fix #1289
|
2015-07-24 19:35:31 +02:00 |
|
Fabio Bas
|
119871d114
|
fix compilation with gcc in paranoic mode
deckview.cpp:244:6: warning: no previous declaration for 'bool
sortCardsByName(DeckViewCard*, DeckViewCard*)' [-Wmissing-declarations]
|
2015-07-24 19:29:06 +02:00 |
|
ctrlaltca
|
903292ad3b
|
Merge pull request #1288 from ctrlaltca/travis_qt5_homebrew
Hack to make travis always detect the installed qt5 version
|
2015-07-22 21:30:15 +02:00 |
|
Fabio Bas
|
713fa92c65
|
Hack to make travis always detect the installed qt5 version
|
2015-07-22 18:04:56 +02:00 |
|
Fabio Bas
|
946410de2b
|
Fix misleading error message in servatrice; fix #1275
|
2015-07-22 17:51:30 +02:00 |
|
Fabio Bas
|
90655ff631
|
Prefer enabled sets when loading images; fix #1235
|
2015-07-22 17:35:44 +02:00 |
|
Fabio Bas
|
7f358d289e
|
Fix calculation of ban expiration; fix #1283
|
2015-07-21 22:32:31 +02:00 |
|
Jeff
|
3f22024281
|
Joining a full game joins you as spectator
|
2015-07-18 01:33:15 -04:00 |
|
ctrlaltca
|
0d5e169648
|
Merge pull request #1270 from ctrlaltca/fix_1269
Fix change flag in edit account; Fix #1269
|
2015-07-16 18:01:40 +02:00 |
|
Fabio Bas
|
c9e1585322
|
Fix change flag in edit account; Fix #1269
|
2015-07-16 17:59:28 +02:00 |
|
ctrlaltca
|
61b2b46b79
|
Merge pull request #1267 from Cockatrice/revert-1261-fix_982
Revert "Confirmation dialog on close"
|
2015-07-16 12:30:37 +02:00 |
|
ctrlaltca
|
9b9db297b3
|
Revert "Confirmation dialog on close"
|
2015-07-16 14:30:12 +02:00 |
|
Zach
|
e0b71d3b05
|
Merge pull request #1257 from ctrlaltca/messageparser
Chatview: split message parser and add "highlight words"
|
2015-07-15 20:00:08 -04:00 |
|
Zach
|
1d425f5b66
|
Merge pull request #1261 from ZeldaZach/fix_982
Confirmation dialog on close
|
2015-07-15 18:57:03 -04:00 |
|
Zach H
|
ebd516fbf3
|
confirmation dialog on close
|
2015-07-15 18:34:21 -04:00 |
|
Zach
|
da3ade3205
|
Merge pull request #1264 from ZeldaZach/color_popup
Add colors to popup
|
2015-07-15 16:55:17 -04:00 |
|
Fabio Bas
|
ef831d2749
|
Reworded settings sentence
|
2015-07-15 22:44:24 +02:00 |
|
Zach H
|
d956a1d309
|
add colors to popup
|
2015-07-15 16:38:29 -04:00 |
|
Zach
|
97acbbfd41
|
Merge pull request #1262 from ctrlaltca/servatrice_mail
Merge memory leak fix for smtp client
|
2015-07-15 12:24:23 -04: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:
https://github.com/bluetiger9/SmtpClient-for-Qt/commit/c12f70b721a80dfbb
fd4feb5c0f17ddef93d5a56
|
2015-07-15 12:42:56 +02:00 |
|
Fabio Bas
|
efe388bddd
|
Fix server message color; try to detect words inside parentheses, punctuation, etc..
|
2015-07-15 11:52:04 +02:00 |
|
woogerboy21
|
51d12f3ed6
|
Merge pull request #1259 from woogerboy21/update_servatrice_scripts
Script Cleanup
|
2015-07-14 15:33:11 -04:00 |
|
woogerboy21
|
d2af7ff99e
|
Merge pull request #1254 from ZeldaZach/fix_1248
require pass & email confirmation
|
2015-07-14 15:21:35 -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 |
|
Zach H
|
c29bf1ae17
|
require pass & email confirmation
|
2015-07-14 14:12:49 -04:00 |
|
woogerboy21
|
f1cafa0609
|
Merge pull request #1258 from woogerboy21/servatrice_remove_pcconsoleecho
Removed Player Count Debug Line
|
2015-07-14 09:57:24 -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 |
|
Fabio Bas
|
2e3e6c55ff
|
Updated with latest changes from #1243
|
2015-07-14 09:19:07 +02:00 |
|
woogerboy21
|
8a0fdd2089
|
Merge pull request #1252 from woogerboy21/max_player_limit
Servatrice: Restrict the total number of users able to connect (Max User Limit)
|
2015-07-13 18:20:19 -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
|
ea40db972d
|
Merge pull request #1244 from woogerboy21/multi_server_sessions_update
Multi Server Session Functionality
|
2015-07-13 13:12:27 -04:00 |
|
Zach
|
acaeadfcb3
|
Merge pull request #1241 from ZeldaZach/fix_719
|
2015-07-13 12:52:18 -04:00 |
|
Zach H
|
29aecc4eb8
|
Green kick msg
|
2015-07-13 03:05:03 -04:00 |
|
Fabio Bas
|
87c70466a4
|
Rework message parser
|
2015-07-12 23:56:32 +02:00 |
|
Zach H
|
97f298452e
|
first fixes
|
2015-07-12 11:00:11 -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 |
|
Zach H
|
dc05a14f4c
|
Highlight Custom Words
|
2015-07-11 22:46:00 -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 |
|