Commit graph

1137 commits

Author SHA1 Message Date
Max-Wilhelm Bruker
733aa6c52b Server_CardZone speed optimisation 2013-01-03 18:16:17 +01:00
Max-Wilhelm Bruker
8b6eace312 code cleanup 2013-01-03 17:18:37 +01:00
Max-Wilhelm Bruker
cc3760a7df fixed deadlock condition 2012-11-16 21:42:17 +01:00
Max-Wilhelm Bruker
de87bc6546 compile fixes by hasufell 2012-10-28 21:43:41 +01:00
Max-Wilhelm Bruker
43d7cf6a1a removed recursive lock in server; moved object serialisation to worker thread 2012-10-14 13:19:03 +02:00
Max-Wilhelm Bruker
e7fc3b59a7 changed ShutdownDialog to use QDialogButtonBox 2012-10-14 11:19:04 +02:00
Max-Wilhelm Bruker
ba5669652c added Dominican Republic 2012-07-24 20:20:41 +02:00
Max-Wilhelm Bruker
1409c50fbe Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-07-22 18:16:11 +02:00
Max-Wilhelm Bruker
03cef19783 added New Zealand 2012-07-22 18:15:49 +02:00
Max-Wilhelm Bruker
4c9165f099 fixed #62: shuffling doesn't reveal the top card even if AlwaysRevealTopCard is set 2012-07-17 19:22:09 +02:00
Max-Wilhelm Bruker
886f12d116 fixed #63: spectators have sideboard lock icons 2012-07-17 19:17:26 +02:00
Max-Wilhelm Bruker
28b18575f2 fixed issue #66: game creators can't kick spectators; unfortunately, this fix is client-side 2012-07-17 19:06:12 +02:00
Max-Wilhelm Bruker
a1e35ccda5 servatrice: create correct game ids when not using a database 2012-07-17 18:47:00 +02:00
Max-Wilhelm Bruker
c8852b450d don't open database in connection pools if main database connection is not valid 2012-07-17 18:15:10 +02:00
Max-Wilhelm Bruker
2c22fc93ff Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-29 15:48:04 +02:00
Max-Wilhelm Bruker
2eb3df1cde servatrice.sql fixes 2012-06-29 15:47:53 +02:00
Max-Wilhelm Bruker
4d8d2056f6 Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-28 21:35:02 +02:00
Max-Wilhelm Bruker
ed79e8f30a added missing column in servatrice.sql 2012-06-28 21:34:55 +02:00
Max-Wilhelm Bruker
63dc0bd4a9 Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-28 10:54:21 +02:00
Max-Wilhelm Bruker
a91090a828 added missing tables in servatrice.sql 2012-06-28 10:54:08 +02:00
Max-Wilhelm Bruker
0abb4c84c2 Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-27 21:47:37 +02:00
Max-Wilhelm Bruker
7938171aca Mac client: translation path fix 2012-06-27 21:44:49 +02:00
Max-Wilhelm Bruker
03663edbae included 'view replay' icon 2012-06-27 21:27:41 +02:00
Max-Wilhelm Bruker
c7131e3a1d Windows client: translation path fix 2012-06-27 20:41:42 +02:00
Max-Wilhelm Bruker
371299551b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-27 20:03:55 +02:00
Max-Wilhelm Bruker
f080e8b1a4 fixed bug #61: replay doesn't show game info; also fixed playing area not being displayed in any subgame but the first 2012-06-27 20:03:39 +02:00
Max-Wilhelm Bruker
e17751ccdf added Croatia to countries 2012-06-27 13:30:24 +02:00
Max-Wilhelm Bruker
8e5f5e4cbd added missing table to servatrice.sql 2012-06-27 11:20:53 +02:00
Max-Wilhelm Bruker
5d219871ad client: disable Ok button in 'load deck from server' dialog by default 2012-06-26 20:22:50 +02:00
Max-Wilhelm Bruker
7f0b13530d client: fixed crash due to evaluation of null ServerInfo_User object when watching replay while not logged on 2012-06-25 21:33:10 +02:00
Max-Wilhelm Bruker
b1f37a18c9 client: fixed crash that happened when trying to send a game command in the replay viewer 2012-06-25 21:11:01 +02:00
Max-Wilhelm Bruker
e7b58c4d8e server: fixed spectator count not being updated 2012-06-25 13:07:26 +02:00
Max-Wilhelm Bruker
593be45d94 added missing retranslateUi() call in TabMessage; minor Swedish fixes 2012-06-25 12:16:02 +02:00
Max-Wilhelm Bruker
7cc775cb58 added missing retranslateUi calls 2012-06-25 03:03:38 +02:00
Max-Wilhelm Bruker
8cc5ee28a3 disallow face-down cards in other zones than the table 2012-06-25 01:04:13 +02:00
Max-Wilhelm Bruker
e326f9613a added numberPools=0 option to make server unthreaded 2012-06-24 23:49:10 +02:00
Max-Wilhelm Bruker
87584a3a76 updated Spanish; adjusted details for release 2012-06-24 16:40:05 +02:00
Max-Wilhelm Bruker
0bd0361a27 updated Italian 2012-06-24 16:04:50 +02:00
Max-Wilhelm Bruker
fe7d42738c translation merge 2012-06-10 13:08:47 +02:00
Max-Wilhelm Bruker
7d1ad3b4fa Merge branch 'master' of git://github.com/mbruker/Cockatrice into devel 2012-06-10 13:00:58 +02:00
Max-Wilhelm Bruker
7f6e1e7314 Merge pull request #57 from Daenyth/master
Fix compile error with gcc >= 4.7
2012-06-10 04:00:24 -07:00
Daenyth
00c03d857e Fix compile error with gcc >= 4.7 2012-06-10 00:11:12 -04:00
armyfrank
22e12db15e Updated Japanese translation 2012-06-09 13:25:48 +09:00
armyfrank
9373106594 Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation 2012-06-09 13:18:14 +09:00
Max-Wilhelm Bruker
7c1ca629df cleaned up remoteclient.cpp compiler warnings 2012-06-03 20:29:33 +02:00
Max-Wilhelm Bruker
25b97d1e56 Converted PriceUpdater from QScriptEngine to Qt-Json. I don't feel comfortable running unchecked JS code from an external source. 2012-06-03 20:16:12 +02:00
Max-Wilhelm Bruker
50f7560033 Merge branch 'NicolasMerge' into devel 2012-06-03 19:32:08 +02:00
NicolasPerrenoud
243fe25ce1 Fix priceUpdater bug. If a card is in the main and in the side, the
price is dispay in both places.
2012-06-03 19:27:28 +02:00
Max-Wilhelm Bruker
17c8bdb1cd Merge branch 'NicolasMerge' into devel 2012-06-03 19:23:48 +02:00
Max-Wilhelm Bruker
80439762cf hide login passwords from server log; call logDebugMessage in S_PH thread instead of Server thread 2012-06-03 19:23:15 +02:00