aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1335 commits 1 branch 0 tags 51 MiB
Commit graph

745 commits

Author SHA1 Message Date
Daenyth
af09d0d294 Reject more invalid usernames from clients. 
Specifically this should cover people connecting with a username of
"\u200C"
 2012-07-25 00:12:35 -04: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
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
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
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
87584a3a76 updated Spanish; adjusted details for release 2012-06-24 16:40:05 +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
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
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
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
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
b328c1ed4d database interface separated from server, multiple concurrent database connections are now possible 2012-05-28 16:32:45 +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
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
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
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
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
Max-Wilhelm Bruker
c7fa2fe985 fixed clone function, updated servatrice.ini.example to reflect changes in room creation syntax 2012-04-26 16:22:48 +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
38cf2621b4 preliminary changes to make deck editor a tab 2012-04-22 05:06:51 -04:00
Max-Wilhelm Bruker
eb927d77c3 updated German translation; added some missing retranslateUi() calls 2012-04-08 23:58:25 +02:00
Max-Wilhelm Bruker
95cd293b9c context menu for a message sender's name in chat; also display the user level icon next to the name; minor consistency and type-safety changes 2012-04-08 23:48:02 +02:00
Max-Wilhelm Bruker
f9e0b6fe9e moved the user list context menu to a separate class to avoid redundant code 2012-04-07 23:05:45 +02:00
Max-Wilhelm Bruker
ae19d3dc4b fixed game list update bug, minor optimizations, restrict client protocol output to QT_DEBUG mode 2012-04-06 17:52:23 +02:00
Max-Wilhelm Bruker
118b575e58 updated German translation, minor token fix 2012-04-06 15:34:00 +02:00
Max-Wilhelm Bruker
12b5e39440 improved token dialog w/ storage inside the deck list - now we need a reliable online source for token data (preferably with pictures) 2012-04-06 15:16:52 +02:00
Max-Wilhelm Bruker
f553fd7456 some token code 2012-04-05 11:48:13 +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
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
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
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
Max-Wilhelm Bruker
95dd3fc04c added credits for Swedish translation 2012-03-25 16:40:54 +02:00
Max-Wilhelm Bruker
7833363501 Merge branch 'master' of github.com:mbruker/Cockatrice 2012-03-25 15:48:57 +02:00
Max-Wilhelm Bruker
9a34d7b929 translation update, included stub for Swedish 2012-03-25 15:48:29 +02:00
Max-Wilhelm Bruker
3b70ad8c66 minor fixes wrt commit 4e4a7563db 2012-03-25 14:41:52 +02:00
Max-Wilhelm Bruker
4e4a7563db The remote client now runs in an extra thread, fixing issue #29 2012-03-25 13:19:40 +02:00
Max-Wilhelm Bruker
542fd2c5c8 added menu item: game->game information, issue #1 fixed 2012-03-24 22:09:06 +01:00
Max-Wilhelm Bruker
5ff1fd8ec6 added peeking at facedown cards, fixing issue #7 2012-03-24 18:52:08 +01:00
Max-Wilhelm Bruker
662df6d972 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel 2012-03-24 17:50:29 +01:00
Max-Wilhelm Bruker
adbb607700 Revealing a library to a player now grants that player permission to drag cards out of that library onto his own table. This permission is revoked by shuffling the library. The zone view window tracks content changes of the zone for as long as the permission lasts so that card ID changes are kept track of. This hopefully fixes issues #5 and #12. 2012-03-24 17:48:25 +01:00
Max-Wilhelm Bruker
10d958c4ce Merge branch 'master' into devel 2012-03-23 12:18:16 +01:00
Max-Wilhelm Bruker
c92f3e4239 fix for issue #17: oracle: convert smart quotes to normal quotes in card names 2012-03-23 12:17:59 +01:00
Max-Wilhelm Bruker
c9a8429044 always get next game/replay id from database to avoid id collisions in multi-server mode 2012-03-17 23:01:56 +01:00
Max-Wilhelm Bruker
671214c60e mutex fixes, server shutdown works again 2012-03-17 19:05:22 +01:00
Max-Wilhelm Bruker
9e1ee50081 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel 2012-03-17 17:08:19 +01:00
Max-Wilhelm Bruker
2259204890 cleaned up PictureLoader thread 2012-03-17 17:07:48 +01:00
Max-Wilhelm Bruker
61b351aa9f fixed client crash that occurred when the game ended with a card tap/untap animation running 2012-03-11 11:26:07 +01:00
Max-Wilhelm Bruker
76c7d96310 CardInfoWidget as popup now has a card size related to the screen size 2012-03-10 23:26:35 +01:00
Max-Wilhelm Bruker
b0378544c4 added icon for expiration lock button, added close button to replay tab, minor GUI fixes 2012-03-04 12:05:28 +01:00
Max-Wilhelm Bruker
acb03c2bf2 replays expire after two weeks, lock can be toggled to prevent that 2012-03-04 11:35:56 +01:00
Max-Wilhelm Bruker
a876a0bf5f tell logged in clients about new replays 2012-03-03 18:10:16 +01:00
Max-Wilhelm Bruker
2487476fcc added checkbox to disable password storage 2012-03-03 15:54:50 +01:00
Max-Wilhelm Bruker
8481e61e8f Replays split up, one for each subgame 2012-03-02 20:45:04 +01:00
Max-Wilhelm Bruker
4dc712286f preliminary client-side replay watching code 2012-02-26 16:35:34 +01:00
Max-Wilhelm Bruker
c6c6a970c6 interface & client tab for replay transfer 2012-02-25 19:33:44 +01:00
Max-Wilhelm Bruker
89bb8e72ee use 'git describe' to generate version info for the about box and servatrice. fixes issue #20 2012-02-21 01:08:16 +01:00
Max-Wilhelm Bruker
a1bcd9854f preliminary client-side replay support, works in principle 2012-02-21 00:09:03 +01:00