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
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
woogerboy21
b102a05a36
Add ability to ban by client id
2015-08-14 00:06:37 -04:00
Jeff
386716b8db
Add option to open customsets folder
2015-08-13 23:52:38 -04:00
Jeff
50d67467dc
Username Completer in server room
...
Adds QCompleter in server room and a setting to enable/disable it.
2015-08-13 23:51:39 -04:00
Zach
26e63a9a3a
Merge pull request #1343 from tooomm/readme-toc-change
...
readme adjustments
2015-08-13 21:17:07 -04:00
tooomm
d5c00b0cb5
remove arrows with link to top
2015-08-13 16:21:10 +02:00
woogerboy21
8bf58af727
Merge pull request #1365 from woogerboy21/add_clientid_tosessions
...
Add clientid field to sessions table.
2015-08-12 08:07:01 -04:00
poixen
9bf3178b2f
Merge pull request #1307 from poixen/hostselection
...
Previous server connection history
2015-08-12 12:59:23 +02:00
Zach
54ff4ef417
Merge pull request #1369 from ZeldaZach/fix_1360
...
remove max screen default
2015-08-11 17:41:13 -04:00
Zach H
b57a316bfd
remove max screen default
2015-08-11 17:10:05 -04:00
Zach
1c3e13109f
Merge pull request #1361 from woogerboy21/servatrice_disable_replaystorage
...
Add option to servatrice to disable replay storage.
2015-08-11 16:32:37 -04:00
Zach
26b9560753
Merge pull request #1367 from woogerboy21/add_script_maintcountrycodes
...
Added lower case country code on correction.
2015-08-11 16:05:56 -04:00
woogerboy21
7c81f8a610
Added lower case country code on correction.
2015-08-11 15:46:59 -04:00
Zach
bf230f2c86
Merge pull request #1366 from woogerboy21/add_script_maintcountrycodes
...
Add script to validate/clear invalid country codes in the DB.
2015-08-11 15:18:11 -04:00
woogerboy21
f636c0ee19
Add script to validate/clear invalid country codes in the DB.
2015-08-11 14:20:40 -04:00
woogerboy21
d52cf379ee
Updated servatrice.sql to reflect new sessions table field.
2015-08-11 12:53:56 -04:00
woogerboy21
eb5833609a
Add clientid field to sessions table.
2015-08-11 12:45:04 -04:00
Zach
e9478ff99c
Merge pull request #1362 from woogerboy21/rem_clientid_protoreq
...
Removed clientid requirements from the protocol handler.
2015-08-10 17:36:31 -04:00
woogerboy21
fa77cdf3b5
Removed clientid requirements from the protocol handler.
2015-08-10 16:07:20 -04:00
woogerboy21
fefceac2c6
Add option to servatrice to disable replay storage.
2015-08-10 15:29:30 -04:00
Gavin Bisesi
ea9e966330
Merge pull request #1353 from Cockatrice/revert-1352-nonreg_nodbserver_fix
...
Revert "#1351 Fix"
2015-08-09 15:52:42 -04:00
Gavin Bisesi
59568bf13c
Revert " #1351 Fix"
2015-08-09 15:52:32 -04:00
woogerboy21
de1b925b7d
Merge pull request #1352 from Cockatrice/nonreg_nodbserver_fix
...
#1351 Fix
2015-08-09 15:25:14 -04:00
woogerboy21
5fc0da6ab9
#1351 Fix
...
This update address's the issue were a server with no db has only non-registered users but when creating a game will cause the dialogue to only allow the check box of "registered users only" resulting in a game that no user will ever be able to join.
2015-08-09 15:07:30 -04:00
