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 |
|
Max-Wilhelm Bruker
|
49befa210d
|
updated translation catalogues
|
2012-05-18 19:06:53 +02:00 |
|
Max-Wilhelm Bruker
|
44d688b1d5
|
added deckstats.net interface in deck editor, fixing issue #39
|
2012-05-17 20:11:46 +02:00 |
|
Max-Wilhelm Bruker
|
3ba3952604
|
fixed issue #37: add option to manually add token cards to the database
|
2012-05-17 18:29:35 +02:00 |
|
Max-Wilhelm Bruker
|
d5a1032cf3
|
updated German translation
|
2012-05-09 23:33:43 +02:00 |
|
Max-Wilhelm Bruker
|
8b3a3c285a
|
additional minor fix wrt issue #42
|
2012-05-09 23:28:13 +02:00 |
|
Max-Wilhelm Bruker
|
295cc65dce
|
minor fix wrt issue #42
|
2012-05-09 23:25:29 +02:00 |
|
Max-Wilhelm Bruker
|
b9087715bf
|
fixed issue #42: make 'client deprecated' message work for v13 client <-> v14 server
|
2012-05-09 23:13:23 +02:00 |
|
Max-Wilhelm Bruker
|
f7975d8ace
|
fixed issue #50: ensure that tcp_nodelay is set
|
2012-05-09 21:57:06 +02:00 |
|
Max-Wilhelm Bruker
|
b106f76294
|
Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel
|
2012-05-09 21:52:27 +02:00 |
|
Max-Wilhelm Bruker
|
0eee6d7ab9
|
fixed issue #49: when editing a remote deck, be able to directly save it there
|
2012-05-09 21:52:09 +02:00 |
|
Max-Wilhelm Bruker
|
c043fe3c5a
|
client local game crash fix
|
2012-05-08 12:48:24 +02:00 |
|
Max-Wilhelm Bruker
|
f00eaa83d4
|
added missing file
|
2012-05-07 20:24:18 +02:00 |
|
Max-Wilhelm Bruker
|
e76502cf0e
|
handle dead commands when the connection is lost before the reply gets processed
|
2012-05-01 21:16:16 +02:00 |
|
Max-Wilhelm Bruker
|
53afd65beb
|
merged incomplete polish translation
|
2012-05-01 20:13:13 +02:00 |
|
Max-Wilhelm Bruker
|
f6f8ad82b2
|
server code cleanup
|
2012-05-01 12:48:59 +02:00 |
|
Max-Wilhelm Bruker
|
e5a0a08569
|
fixed #43: add delete button to local dir view in deck storage tab and in remote dir view in replays tab
|
2012-05-01 12:08:09 +02:00 |
|
Max-Wilhelm Bruker
|
7c8b3fc5e3
|
fixed #45: Terminate servatrice if critical error in e.g. listen() happens during initialization
|
2012-05-01 10:58:08 +02:00 |
|
Max-Wilhelm Bruker
|
875610e1b3
|
mac fixes
|
2012-04-27 00:39:34 +02:00 |
|
Max-Wilhelm Bruker
|
61f5cd478d
|
Qt 4.8 crash fix
|
2012-04-27 00:03:08 +02:00 |
|