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 |
|
Max-Wilhelm Bruker
|
2a5050fdc4
|
added Chile to countries
|
2012-06-03 18:26:50 +02:00 |
|
Max-Wilhelm Bruker
|
551fdb464e
|
added Venezuela to countries
|
2012-06-03 18:22:56 +02:00 |
|
Max-Wilhelm Bruker
|
31967cab44
|
fixed CIW not disappearing after being opened by ChatView
|
2012-06-02 20:15:55 +02:00 |
|
NicolasPerrenoud
|
805f3e8fe5
|
merged from NicolasPerrenoud
|
2012-06-02 20:13:21 +02:00 |
|
Max-Wilhelm Bruker
|
7157963204
|
removed usleep() call to enable compilation on Windows again
|
2012-06-02 19:38:31 +02:00 |
|
Max-Wilhelm Bruker
|
60f99818e1
|
fixed DlgEditTokens crash when removing a token
|
2012-06-02 18:09:19 +02:00 |
|
Max-Wilhelm Bruker
|
089c937167
|
use proper anchors in MessageLogWidget, effectively fixing issue #54
|
2012-06-02 17:22:19 +02:00 |
|
Max-Wilhelm Bruker
|
aa2488fb91
|
server crash fix; also fixes single player crash on Mac wrt AlwaysRevealTopCard
|
2012-06-02 16:33:16 +02:00 |
|
Max-Wilhelm Bruker
|
d7e7606104
|
fixed 'open deck in deck editor' option in game, fixed freeze when closing local game
|
2012-05-28 19:34:07 +02:00 |
|
Max-Wilhelm Bruker
|
9af69f53af
|
server compile fix for older Qt versions
|
2012-05-28 19:03:05 +02:00 |
|
Max-Wilhelm Bruker
|
9d0133bae6
|
fix for older Qt versions
|
2012-05-28 19:01:29 +02:00 |
|
Max-Wilhelm Bruker
|
520300dc86
|
made server threaded, fixing issue #51
|
2012-05-28 18:51:58 +02:00 |
|
Max-Wilhelm Bruker
|
b328c1ed4d
|
database interface separated from server, multiple concurrent database connections are now possible
|
2012-05-28 16:32:45 +02:00 |
|
Max-Wilhelm Bruker
|
2b89c353bf
|
merged security fix from master
|
2012-05-22 22:18:45 +02:00 |
|
Max-Wilhelm Bruker
|
887ee0e86d
|
fixed server security issue concerning deck deletion
|
2012-05-22 21:43:22 +02:00 |
|
Max-Wilhelm Bruker
|
981db47f9e
|
initial commit for connection pools
|
2012-05-20 18:47:28 +02:00 |
|
Max-Wilhelm Bruker
|
c2edd33e90
|
added stub for Chinese
|
2012-05-20 14:52:58 +02:00 |
|
Max-Wilhelm Bruker
|
b6700658d7
|
updated Portugese and Swedish
|
2012-05-18 19:11:17 +02:00 |
|