Commit Graph
100 Commits
Author SHA1 Message Date
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 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 0abb4c84c2 Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-06-27 21:47:37 +02:00
Max-Wilhelm Bruker 03663edbae included 'view replay' icon 2012-06-27 21:27:41 +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 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 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 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
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
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 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 61f5cd478d Qt 4.8 crash fix 2012-04-27 00:03:08 +02:00
Max-Wilhelm Bruker 13d3de5c1c don't show card p/t and loyalty in CardInfoWidget when showing only the picture 2012-04-22 18:35:32 +02:00
Max-Wilhelm Bruker 089d082cf4 moved translations out of resources file 2012-04-22 18:14:17 +02:00
Max-Wilhelm Bruker b26444435c introduced more general grammatical cases 2012-04-22 17:23:10 +02:00
Max-Wilhelm Bruker 8f6de6637f don't call QAudioOutput constructor unless sound is enabled 2012-04-22 12:51:33 +02:00
Max-Wilhelm Bruker 81d7c08f08 use player menu as default menu for table zone, fixing issue #38 2012-04-22 12:28:23 +02:00
Max-Wilhelm Bruker cc516823d7 deck editor is tab, replay viewer is tab, deck editor shown by default, cache window geometry between sessions, 'open this deck in deck editor' open in game 2012-04-22 12:23:33 +02:00
Max-Wilhelm Bruker 3edecf98c3 if cards in multiple zones are selected, don't create drag items for the ones you're not supposed to move 2012-04-22 11:19:37 +02:00
Max-Wilhelm Bruker 6a52d65c4c Merge ../bla into devel 2012-04-22 11:08:30 +02:00
Max-Wilhelm Bruker 539b693ac4 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel 2012-04-22 11:02:52 +02:00
Max-Wilhelm Bruker 7649a36962 merged server crash fix 2012-04-22 11:02:36 +02:00
Max-Wilhelm Bruker 0a30f22e5f Merge branch 'master' of github.com:mbruker/Cockatrice 2012-04-22 10:58:15 +02:00
Max-Wilhelm Bruker afe5c72204 server crash fix 2012-04-22 10:57:42 +02:00
Max-Wilhelm Bruker 1cd63375ba ignore unregistered users fix 2012-04-02 00:14:43 +02:00
Max-Wilhelm Bruker a319ce3afb fix for rare condition when the game screen would remain white when the game starts 2012-04-01 21:15:13 +02:00
Max-Wilhelm Bruker 40fbbc5982 added size contraints for zone view & scroll bars, fixing issue #34 2012-04-01 14:01:20 +02:00
Max-Wilhelm Bruker c835a827b0 AlwaysRevealTopCard done, issue #31 fixed 2012-04-01 11:45:01 +02:00
Max-Wilhelm Bruker 840b577f42 complete server-side AlwaysRevealTopCard support, related to issue #31 2012-03-31 22:47:42 +02:00
Max-Wilhelm Bruker 005a4363d3 removed unnecessary mutex calls 2012-03-31 22:08:22 +02:00
Max-Wilhelm Bruker 7417236c3a preliminary AlwaysRevealTopCard support related to issue #31, server code cleanup (finally removed getGameState) 2012-03-31 21:47:30 +02:00
Max-Wilhelm Bruker 75bac4a5b9 fixed gameStateKnown bug 2012-03-31 19:07:45 +02:00
Max-Wilhelm Bruker 767d53b5a8 merged from master 2012-03-31 18:41:01 +02:00
Max-Wilhelm Bruker befe2d523d Merge branch 'server_crash_fix' 2012-03-31 18:07:54 +02:00
Max-Wilhelm Bruker b289ab0d9f fixed server crash condition 2012-03-31 18:07:31 +02:00
Max-Wilhelm Bruker cdda3f15a0 added option to ignore unregistered users in chat; switched UserList data storage to QMap to speed up lookups; issue #28 fixed 2012-03-31 15:06:47 +02:00
Max-Wilhelm Bruker ff632911f2 don't use QSortFilterProxyModel in TabDeckStorage and TabReplays unnecessarily 2012-03-31 13:28:04 +02:00
Max-Wilhelm Bruker 13b992cf12 show ban duration in client 2012-03-31 12:07:25 +02:00
Max-Wilhelm Bruker 78d188c462 minor visual improvements, German translation update 2012-03-30 21:44:28 +02:00
Max-Wilhelm Bruker 212c58f99a check 'show unavailable games' by default in ShowGamesOfUser dialog 2012-03-30 21:22:47 +02:00
Max-Wilhelm Bruker 6b14b4e543 added game filter dialog in GameSelector; switched all dialogs to QDialogButtonBox; issue #32 fixed 2012-03-30 21:09:35 +02:00
Max-Wilhelm Bruker facfc3cc52 added more filter options to GamesProxyModel, user interface still missing (related to issue #32) 2012-03-28 23:52:21 +02:00
Max-Wilhelm Bruker deaebddb0b don't show 'no password for spectators' when spectating is disallowed, fixing issue #26 2012-03-28 21:09:01 +02:00
Max-Wilhelm Bruker b2b7242802 changed lock icon, added sideboard locking, issue #15 fixed 2012-03-27 20:32:24 +02:00
Max-Wilhelm Bruker 0b51af888c Don't close the game tab immediately when kicked out of a game. Fixes bug #25 2012-03-26 19:32:27 +02:00
Max-Wilhelm Bruker d251078feb fixed user list bug in threaded client, fixed buddy list crash in server 2012-03-26 00:54:44 +02:00
Max-Wilhelm Bruker fd5be3d525 added option --debug-output to redirect client output to file 2012-03-25 19:48:50 +02:00
Max-Wilhelm Bruker 40d2b57de9 crash fix 2012-03-25 17:16:42 +02:00
Max-Wilhelm Bruker 0e7f7887ad added swedish translation to qrc 2012-03-25 17:11:39 +02:00
Max-Wilhelm Bruker ac62ce9839 removed debugging line 2012-03-25 17:07:26 +02:00
Max-Wilhelm Bruker eced4e2340 merge 2012-03-25 17:06:48 +02:00
Max-Wilhelm Bruker 1224eae1c0 added button to test custom translation file 2012-03-25 17:02:52 +02:00