gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
3,111 Commits 53 Branches 176 Tags
e68b8b314afbab2d603775286aeabbdcf70fde10
Commit Graph
3111 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabio Bas 76ba3b557d Fix compilation of servatrice with mdvc 
Should fix #1336
 2015-08-09 18:17:10 +02:00
woogerboy21 1f22f1743c Merge pull request #1348 from woogerboy21/fix_clientid_dbmigration 
Add database migration script for client id
 2015-08-09 09:19:12 -04:00
woogerboy21 b4e0c00cca Add database migration script for client id 2015-08-09 08:47:21 -04:00
marco b0bf94e378 Shorcut read from settings 2015-08-09 12:16:52 +02:00
woogerboy21 644ea0482f Merge pull request #1347 from woogerboy21/fix_clientid_localgame 
Fix local game not starting properly.
 2015-08-08 17:33:34 -04: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
woogerboy21 17392f1ae5 Moved the RegOnlyRequirement functions out of the Database interface into the proper Server block of code. 2015-08-08 16:24:37 -04:00
woogerboy21 129a6983ed Merge pull request #1345 from Cockatrice/login-error-message 
Add more informative message on unrecognized login response
 2015-08-08 11:12:50 -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 c64bc3fb81 Merge pull request #1344 from woogerboy21/clientid_commit_res 
Commit to resolve requests made by @Daenyth discussed after the commit.
 2015-08-08 09:23:21 -04:00
woogerboy21 b53bd08175 Merge branch 'clientid_commit_res' of ssh://github.com/woogerboy21/Cockatrice into clientid_commit_res 2015-08-08 08:52:47 -04:00
woogerboy21 af237c7d07 Fixed space/tabing issues. 2015-08-08 08:52:19 -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
woogerboy21 62dc3a7ca3 Merge pull request #1342 from marcofernandezheras/CardInfoLayout 
Deck Editor layout
 2015-08-08 08:28:12 -04:00
woogerboy21 2211a8de4a Fixed space/tabing issues. 2015-08-07 22:32:39 -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 b62ffdeb0b Added server side setting to allow the requirement of a client id from clients. 2015-08-07 15:52:55 -04:00
woogerboy21 95cc10a278 Commit to resolve requests made by @Daenyth discussed after the commit. 
See https://github.com/Cockatrice/Cockatrice/pull/1340 for details.
 2015-08-07 13:21:31 -04:00
tooomm 8ebd8532d6 readme adjustments 
- toc changed (removed DocToc)
- relinks to the toc on top under every category
- image included on top
- added other servers in community ressources
 2015-08-06 23:21:51 +02:00
woogerboy21 ba90d84a13 Merge pull request #1340 from woogerboy21/clientid 
Client ID Generation
 2015-08-06 14:17:06 -04:00
poixen 5a541d6248 Merge pull request #1341 from tooomm/patch-2 
removed space
 2015-08-06 11:34:04 +02: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
Zach dfb7847dab Update README.md 2015-08-01 21:45:14 -04:00
Zach c28da9f066 Merge pull request #1321 from ZeldaZach/readme 
README fix
 2015-08-01 21:35:41 -04:00
Zach H ee6020ab8c url fix 2015-08-01 21:35:21 -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
ctrlaltca 8d2cd29a3f Merge pull request #1308 from ZeldaZach/fix_1301 
Allow URL redirects for card images
 2015-08-01 07:59:58 +02:00
Zach da48b71442 Merge pull request #1310 from ctrlaltca/emails 
Servatrice: do not disclose user emails to clients
 2015-07-31 10:57:52 -04:00
woogerboy21 eb9ca58fd0 Updated pingClockTimeout to account for adjustments in client keep alive settings value. 
Changed the default value for the client keep alive variable back to 1 (since that is what the setting is if the value is not found in the configuration ini file).
 2015-07-30 16:38:02 -04: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
Fabio Bas 8d325b9e19 Servatrice: do not disclose user emails to clients 2015-07-28 22:20:40 +02: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
Zach 183fbd2805 Merge pull request #1305 from poixen/appname 
Changed app title when logged in
 2015-07-27 19:51:24 -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
Zach c0bb640a37 Merge pull request #1295 from ctrlaltca/servatrice_email_v2 
Refactor servatrice email send
 2015-07-26 21:13:58 -07:00
Zach 9aa161575d Merge pull request #1303 from ZeldaZach/fix_1069 
fix 1032 merge conflicts
 2015-07-26 21:12:50 -07:00
Zach H 475c54bfe1 fix 1032 merge conflicts 2015-07-27 00:01:05 -04:00
Zach e318b70329 Merge pull request #1286 from ctrlaltca/disabled_sets 
Prefer enabled sets when loading images
 2015-07-26 12:10:00 -07:00
Zach bd92f18e9d Merge pull request #1293 from ctrlaltca/fix_1289 
Force black text color on deck list
 2015-07-26 12:05:52 -07:00