aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3019 commits 1 branch 0 tags 51 MiB
Commit graph

1885 commits

Author SHA1 Message Date
woogerboy21
044c2356ff Added server/client feature set communication 2015-09-02 17:54:06 -04:00
marco
baa61d0571 Merge branch 'master' into Refactor-settings 
Conflicts:
	oracle/CMakeLists.txt
 2015-09-01 21:28:53 +02:00
Fabio Bas
6d7baec37b Merge with master 2015-08-31 22:55:46 +02:00
Fabio Bas
5cfb034452 merged with master 2015-08-31 22:48:14 +02:00
Fabio Bas
fcff6301ed Fetched new translations. Arrr! 2015-08-27 18:32:14 +02:00
tooomm
83e9f9deba typos resolved 
@marcofernandezheras ok?
 2015-08-26 15:33:05 +02:00
marco
0b94b47f72 Servatrice portable + cmake options 
Use -DPORTABLE=1 to build a portable version
 2015-08-25 21:25:13 +02:00
marco
4125d690fa Fix merge & relative path for portable build 2015-08-25 20:22:31 +02: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
marco
be7efa98cf Fix relative path for image download & settings 2015-08-23 15:54:52 +02:00
marco
1e2d5b0693 Fix translate setting + Mod oracle to portable build 2015-08-23 14:14:11 +02:00
Jeff
ca82fd867a Option to opt-out of remember game settings 2015-08-22 15:52:03 -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
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
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 introduced a new edge case where the stored setting
would apply to the field even if the user is unregistered, making the
setting possible to apply in no-reg mode. Regardless, any client could
have done this, not just the default cockatrice.

The server side fix should prevent all issues in the future.
 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
marco
c8d59eec5e Refactred settings to use settingscache & ini files 2015-08-22 01:05:15 +02: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
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
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
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
Zach
98fa9eb159 Merge pull request #1356 from Fizztastic/ChatRoomCompleter 
Username Completer in server room
 2015-08-15 20:08: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
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