woogerboy21
cfebd53d5d
Corrected proto warnings
2015-08-25 23:40:08 -04:00
woogerboy21
7453385903
Merge pull request #1417 from woogerboy21/send_clientver
...
Extend the login protocol to send the client version (as optional)
2015-08-24 11:54:04 -04:00
woogerboy21
364df4daf0
Extend the login protocol to send the client id (as optional)
2015-08-24 11:38:24 -04:00
Zach
324ddda4dd
Merge pull request #1416 from ZeldaZach/fix_1411
...
Define URLs
2015-08-23 23:00:22 -04:00
Zach
14da4efe6d
Merge pull request #1414 from ZeldaZach/fix_1412
...
Prevent bad flags
2015-08-23 17:59:52 -04:00
Zach H
a8727d5a50
define URLs
2015-08-23 17:57:26 -04:00
Zach
4d2fdaec08
Merge pull request #1407 from Fizztastic/fix_1396
...
Option to opt-out of remember game settings
2015-08-23 16:28:01 -04:00
Zach H
8ffe310855
prevent bad flags
2015-08-23 16:27:18 -04:00
ctrlaltca
ab33258ce9
Merge pull request #1415 from ctrlaltca/translations
...
Translations: extracted new strings
2015-08-23 20:54:50 +02:00
Fabio Bas
b335bc5e7d
Translations: extracted new strings
2015-08-23 20:54:11 +02:00
Jeff
ca82fd867a
Option to opt-out of remember game settings
2015-08-22 15:52:03 -04:00
Zach
432c856f0d
Merge pull request #1400 from woogerboy21/logout_old_session
...
Log old session out of server if logging in from a second location
2015-08-22 15:37:50 -04:00
woogerboy21
b0630b81ca
Log old session out of server if logging in from a second location
2015-08-22 13:41:02 -04:00
Gavin Bisesi
0c0413f056
Merge pull request #1404 from Cockatrice/docker-tweak
...
Use servatrice as docker entrypoint
2015-08-22 09:57:10 -04:00
Gavin Bisesi
34c78b3113
Use servatrice as docker entrypoint
...
This lets you "docker run servatrice" and pass command line arguments
2015-08-22 08:43:44 -04:00
ctrlaltca
18ec8e20b6
Merge pull request #1381 from ZeldaZach/flags_to_lower
...
Country to lower (fix win bug)
2015-08-22 11:53:22 +02:00
Zach
e9156ecd62
Merge pull request #1391 from woogerboy21/admin_adjustmods
...
Allows admins to promote users to mod and demote mod to user
2015-08-22 00:03:46 -04:00
woogerboy21
2a0197a7ab
Merge pull request #2 from Cockatrice/admin_adjustmods
...
Address PR feedback
2015-08-21 23:08:29 -04:00
Gavin Bisesi
66f14c1168
Address PR feedback
2015-08-21 23:03:15 -04:00
Zach
a6a62b3334
Merge pull request #1354 from Cockatrice/fix-1351
...
Fix #1351 - Server ignores only-reg if in "none" auth mode.
2015-08-21 22:15:32 -04:00
Daenyth
6170c9037f
Fix #1351 - Server ignores only-reg if in "none" auth mode.
...
When in none auth mode, registered users don't exist; hence the setting
makes the game impossible to join.
Normally the setting would be greyed out when the user is unregistered,
but commit 475c54bf
2015-08-21 20:30:46 -04:00
Zach H
41b10308ba
country to lower (fix win bug)
2015-08-21 20:05:49 -04:00
Zach
9c28cdd1f5
Merge pull request #1394 from Fizztastic/fix_1387
...
Add LineEditCompleter to Tab_Game
2015-08-20 23:46:19 -04:00
Jeff
50e0b6dd35
Merge lines
2015-08-20 23:33:06 -04:00
Jeff
97d0cfa3d9
Fix first word completion
2015-08-20 23:01:32 -04:00
woogerboy21
39fcabe921
Allows moderators to promote users to mod and demote mod to user
2015-08-20 22:42:10 -04:00
Jeff
05f2bc8392
Fix Conflicts
2015-08-20 22:27:46 -04:00
Jeff
e9bad2cacb
Merge branch 'master' into fix_1387
...
Conflicts:
cockatrice/CMakeLists.txt
cockatrice/src/tab_game.h
cockatrice/src/tab_room.cpp
2015-08-20 22:23:47 -04:00
Jeff
b3d96cc5da
Merge remote-tracking branch 'Cockatrice/master' into fix_1387
2015-08-20 22:17:06 -04:00
Zach
b2ab2c6eba
Merge pull request #1382 from marcofernandezheras/Customizable-shortcuts
...
Customizable shortcuts
2015-08-20 21:44:05 -04:00
marco
c6aba5a6d0
Renamed file + reduced window size + resfresh on change
2015-08-20 20:23:08 +02:00
Jeff
a64ea17357
Add LineEditCompleter to Tab_Game
2015-08-19 18:46:08 -04:00
woogerboy21
1ef9041815
Merge pull request #1389 from Cockatrice/schema_level_correction
...
Corrected miss-matched schema versions
2015-08-18 08:04:29 -04:00
woogerboy21
65635bcdd8
Corrected miss-matched schema versions
...
Schema version should be 7 (not 6) for current commit level. Not sure exactly why it wasn't updated.
2015-08-18 07:40:12 -04:00
Zach
8c0722953f
Merge pull request #1386 from Fizztastic/fix_1383
...
Fix linked cardwidget not showing PT/Loyalty
2015-08-17 17:14:30 -04:00
Jeff
f3c43cb50f
Fix linked cardwidget not showing PT/Loyalty
2015-08-16 19:02:55 -04:00
marco
d3d6f70496
Removed 2nd arg from ShortcutsSettings::getShortcut
2015-08-16 21:53:59 +02:00
marco
1ca89e0b09
Moved counters to a new tab
2015-08-16 15:38:23 +02:00
woogerboy21
487cbb23cb
Merge pull request #1379 from woogerboy21/room_userlevel
...
Add permission levels to rooms
2015-08-16 08:57:34 -04:00
marco
713a8148d3
Customizable shorcuts
2015-08-16 14:24:04 +02:00
marco
be82472f35
Merge branch 'master' into Customizable-shortcuts
2015-08-16 14:01:48 +02:00
marco
4cb53ccaed
Merge branch 'master' into Customizable-shortcuts
2015-08-16 13:52:34 +02:00
marco
beaa4e9383
Configurable shortcuts
2015-08-16 13:46:57 +02:00
woogerboy21
702f949196
Updated response block to look better
2015-08-15 21:17:32 -04:00
woogerboy21
3e94c9d283
Define permission levels for rooms
2015-08-15 21:00:51 -04:00
woogerboy21
5634b564e8
Merge pull request #1378 from woogerboy21/last_login
...
Add last_login column to user table and populate upon login
2015-08-15 20:24:18 -04:00
Zach
98fa9eb159
Merge pull request #1356 from Fizztastic/ChatRoomCompleter
...
Username Completer in server room
2015-08-15 20:08:34 -04:00
woogerboy21
bb0b626cee
Add last_login column to user table and populate upon login
2015-08-15 03:00:34 -04:00
woogerboy21
0f4dc18074
Merge pull request #1374 from woogerboy21/ban_by_clientid
...
Ban by client ID
2015-08-14 11:25:01 -04:00
Zach
4b0ccc30ec
Merge pull request #1376 from Fizztastic/customsets_option
2015-08-14 11:04:06 -04:00
