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
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
poixen
9bf3178b2f
Merge pull request #1307 from poixen/hostselection
...
Previous server connection history
2015-08-12 12:59:23 +02:00
Zach H
b57a316bfd
remove max screen default
2015-08-11 17:10:05 -04:00
Gavin Bisesi
59568bf13c
Revert " #1351 Fix"
2015-08-09 15:52:32 -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
woogerboy21
3f78e0bec3
Update Error 11 Clarity
2015-08-09 12:56:09 -04:00
marco
b0bf94e378
Shorcut read from settings
2015-08-09 12:16:52 +02:00
woogerboy21
afa2c67e87
Actually pass the generated client id.
2015-08-08 17:22:59 -04:00
woogerboy21
567c1a148d
Fix local game due to clientid check in response container.
2015-08-08 17:08:43 -04:00
Gavin Bisesi
481a57edf6
Show more informative error on registration failure
2015-08-08 09:55:23 -04:00
Gavin Bisesi
bf7cf61b85
Add more informative message on unrecognized login response
...
When logging in and receiving a reply that isn't understood, show a more informative error message.
`tr() + tr()` for better translation flexibility.
2015-08-08 09:48:18 -04:00
woogerboy21
bc99024e4f
Added server side setting to allow the requirement of a client id from clients.
2015-08-08 08:52:19 -04:00
woogerboy21
94942e1a92
Commit to resolve requests made by @Daenyth discussed after the commit.
...
See https://github.com/Cockatrice/Cockatrice/pull/1340 for details.
2015-08-08 08:52:19 -04:00
marco
e9e75961f4
Redesigning deck editor to work with docks
...
Moved setting files & Added code for a future portable build
2015-08-07 23:44:40 +02:00
woogerboy21
ba90d84a13
Merge pull request #1340 from woogerboy21/clientid
...
Client ID Generation
2015-08-06 14:17:06 -04:00
tooomm
94d4ff8c1b
removed space
2015-08-06 10:11:00 +02:00
woogerboy21
52db13a1ca
Initial release of client ID generation.
2015-08-05 10:15:49 -04:00
Zach
44d757f691
Merge pull request #1328 from marcofernandezheras/FixBug#1296
...
Ctrl + Double Click: Add card to SB
2015-08-03 22:47:32 -04:00
marco
0d10d6f85d
Fixes issue #1296
2015-08-04 00:17:44 +02:00
woogerboy21
13011180f7
Merge pull request #1313 from woogerboy21/update_pingtime
...
Update Client & Server ping time
2015-08-03 12:31:20 -04:00
ctrlaltca
4b5fb30248
Merge pull request #1318 from ctrlaltca/fix_linking_faq_url
...
Fix "Linking FAQ" url
2015-08-01 11:18:16 +02:00
ctrlaltca
622e018cd4
Merge pull request #1320 from ctrlaltca/translations
...
Updated translations
2015-08-01 11:18:04 +02:00
Fabio Bas
7e7c0ef4d2
Updated translations
2015-08-01 10:55:06 +02:00
Fabio Bas
6dfd2e65f6
Fix "Linking FAQ" url
2015-08-01 08:07:47 +02:00
woogerboy21
8c7301b19f
Updated server and client ping to 5 seconds. Also changed hard set 1 second value on the ping timers to read values from the settings cache.
2015-07-29 23:44:00 -04:00
Matt Lowe
1ca24b2597
Previous server connection history
...
This adds the ability to select previous servers from a list to connect
to.
You can remove items from the drop down by selecting them and pressing
delete.
If you connect to a new host it will be added to the previous hosts.
It will remember the last host connected to in the dropdown.
2015-07-28 20:04:01 +02:00
Zach H
8a86165890
allow URL redirects
2015-07-28 02:41:08 -04:00
Matt Lowe
46f28f92b6
Changed app title when logged in
...
As seen in this image, you cant see where you are logged in.
How it looks now:
2015-07-27 16:19:19 +02:00
