Commit graph

346 commits

Author SHA1 Message Date
Max-Wilhelm Bruker
5692addf54 don't send useless information in getGameState; fixed bug that caused an attached card to have undefined coordinates when its parent card was destroyed by conceding or leaving 2012-01-30 00:21:47 +01:00
a b
7faa033855 Mac fixes 2012-01-29 21:17:32 +01:00
Max-Wilhelm Bruker
4895f2b4fd server code cleanup, changed in-game ping event to not use any bandwidth as long as nothing changes 2012-01-29 13:36:43 +01:00
Max-Wilhelm Bruker
e202d659a0 moc weirdness workaround on Unix, added install target 2012-01-21 22:13:27 +01:00
Max-Wilhelm Bruker
f385917a90 Win32 compile fix 2012-01-21 20:38:16 +01:00
Max-Wilhelm Bruker
3c24899de6 switched from qmake to cmake 2012-01-21 19:21:57 +01:00
Max-Wilhelm Bruker
16541141bd Cleaned up decklist code 2012-01-21 16:41:46 +01:00
Max-Wilhelm Bruker
7c2c6eac14 changed creation_time to time_t to get around Qt4.7 dependency 2012-01-03 01:13:15 +01:00
Max-Wilhelm Bruker
609e3fc41d converted SetCardAttr attr_name to enum 2012-01-02 20:20:31 +01:00
Max-Wilhelm Bruker
0c9a2b061c deck storage is fully working again, cleaned up some unnecessarily large messages 2012-01-02 15:46:14 +01:00
Max-Wilhelm Bruker
d4aaf9fff5 minor cleanups, server-side deck storage code is working again 2012-01-02 00:11:33 +01:00
Max-Wilhelm Bruker
ff3eb9b5f4 display reason for ban to banned user 2012-01-01 19:38:52 +01:00
Max-Wilhelm Bruker
6344b987de fixed pw loyalty in oracle, PB code working 2012-01-01 18:15:32 +01:00
Max-Wilhelm Bruker
d5c628966f PB: everything compiles except for deck storage 2012-01-01 02:48:24 +01:00
Max-Wilhelm Bruker
695fde7541 PB: enough for today 2011-12-31 00:12:46 +01:00
Max-Wilhelm Bruker
c4eb7ba6cf PB: more client files compile 2011-12-30 22:29:57 +01:00
Max-Wilhelm Bruker
d3b96b1a88 PB: server compiles again, standalone RemoteClient is able to log in 2011-12-30 21:50:25 +01:00
Max-Wilhelm Bruker
10018280e5 more PB 2011-12-30 02:03:26 +01:00
Max-Wilhelm Bruker
ca9122b9fb added responses + events 2011-12-29 19:40:41 +01:00
Max-Wilhelm Bruker
c5509db251 reasonable defaults 2011-12-19 00:03:05 +01:00
Max-Wilhelm Bruker
f115342e47 local mode is working again 2011-12-18 23:30:53 +01:00
Max-Wilhelm Bruker
38e4781624 fixed packet length calculation bug, re-enabled deck selection 2011-12-18 19:10:47 +01:00
Max-Wilhelm Bruker
314f17091d protobuf client->server communication almost working 2011-12-18 18:35:14 +01:00
Max-Wilhelm Bruker
6ca1d1f09f server crash fix 2011-12-18 12:59:04 +01:00
Max-Wilhelm Bruker
4eb9dfc5bf server-side part of client -> server commands almost converted to ProtocolBuffers. not usable yet 2011-12-04 23:21:31 +01:00
Max-Wilhelm Bruker
1455c093cc store sessions in database 2011-12-04 13:36:53 +01:00
Max-Wilhelm Bruker
6b18ba6bac concession fix 2011-11-13 16:55:41 +01:00
Max-Wilhelm Bruker
a34bccb530 give back host privileges to game creator when he rejoins 2011-11-13 13:58:21 +01:00
Max-Wilhelm Bruker
c7ef61f750 moderators can override game restrictions and kick players when spectating; game host privileges shift when host leaves 2011-11-13 13:13:41 +01:00
Max-Wilhelm Bruker
632e9bbff3 improved banning and deck hashing 2011-11-01 22:44:51 +01:00
unknown
3ea81dfe2b server deck hash fix 2011-10-04 17:17:49 +02:00
unknown
0bb4ef8bb8 added deck hashing 2011-10-04 16:55:18 +02:00
cockatrice
53330090fb added sha512 password hashing, protocol version 13, server version bump 2011-09-21 13:12:08 +00:00
unknown
8344920fdc minor server fix 2011-09-16 15:09:59 +02:00
unknown
da467468d5 improved facedown moving 2011-09-15 14:19:29 +02:00
unknown
1047ab08e8 added facedown to ServerInfo_Card 2011-09-15 12:24:33 +02:00
unknown
e105c42580 preliminary: moved auto-rejoin code back to login 2011-09-13 16:09:42 +02:00
Max-Wilhelm Bruker
f38c5f50ef server crash fix 2011-08-03 16:51:14 +02:00
Max-Wilhelm Bruker
a569a1b8b1 changed chat indentation, allow leftclick for CardInfoWidget in ChatView, changed GameSelector indentation 2011-08-03 01:19:57 +02:00
Max-Wilhelm Bruker
3ff5158b6f server crash fix 2011-08-02 21:10:38 +02:00
Max-Wilhelm Bruker
b38f0e2100 extra logging; minor server crash fix 2011-07-11 23:49:54 +02:00
Max-Wilhelm Bruker
c8813bb2aa extra server logging, server memory leak fixed, m12 2011-07-11 23:01:59 +02:00
Max-Wilhelm Bruker
f10d9c9bec strip newlines from msg in cmdRoomSay; improved i18n in MessageLogWidget 2011-07-06 18:45:56 +02:00
Max-Wilhelm Bruker
17609ec6f8 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-05 12:44:46 +02:00
Max-Wilhelm Bruker
ef42c7518a added argentina to countries 2011-07-05 12:44:39 +02:00
Max-Wilhelm Bruker
6a77e765a7 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-05 01:49:43 +02:00
Max-Wilhelm Bruker
c4a2229ae4 added debug stuff 2011-07-05 01:49:15 +02:00
Max-Wilhelm Bruker
83e2e3666a server memory leak fixed 2011-07-04 17:14:48 +02:00
Max-Wilhelm Bruker
fd171fa260 servatrice Qt 4.4 compile fix 2011-07-03 17:10:24 +02:00
Max-Wilhelm Bruker
898623f1ba filter running games; minor server code cleanup 2011-07-03 16:45:52 +02:00
Max-Wilhelm Bruker
abd5425796 finished getGamesOfUser function 2011-07-02 16:43:19 +02:00
Max-Wilhelm Bruker
d5de76ec4a Merge branch 'master' of ssh://129.217.164.162/home/brukie/cockatrice 2011-07-02 14:36:36 +02:00
Max-Wilhelm Bruker
be12a0b3a9 preliminary showGamesOfUser support 2011-07-02 14:36:10 +02:00
Max-Wilhelm Bruker
a86f6ba5b8 minor change 2011-07-02 02:14:08 +02:00
Max-Wilhelm Bruker
aa38733f03 fixed Server_Card::resetState 2011-06-27 14:50:07 +02:00
Max-Wilhelm Bruker
d0e832b069 limit game name length to 50 characters 2011-06-27 14:42:57 +02:00
Max-Wilhelm Bruker
05ebb83ba4 improved banning; added [url] and [card] tags for chat 2011-06-25 21:21:19 +02:00
Max-Wilhelm Bruker
4b84168bda client/server version bump; eventConnectionStateChanged 2011-06-25 17:50:28 +02:00
Max-Wilhelm Bruker
d892d320ea dynamic compression support 2011-06-25 15:58:38 +02:00
Max-Wilhelm Bruker
a4c3d48389 server shutdown function 2011-06-24 18:45:39 +02:00
Max-Wilhelm Bruker
b7ab2d97bd support for women 2011-06-22 17:39:25 +02:00
Max-Wilhelm Bruker
6226e381de price tag feature by Marcio Ribeiro 2011-06-16 16:43:01 +02:00
Max-Wilhelm Bruker
04a96be84a fixed doesntUntap bug (with protocol change) 2011-05-27 21:56:16 +02:00
Max-Wilhelm Bruker
808d2a3c01 Event context for mulligans, German translation 2011-05-21 23:48:46 +02:00
Max-Wilhelm Bruker
461a62e0c8 LocalServer crash fix 2011-05-08 17:56:52 +02:00
Max-Wilhelm Bruker
c4ba33dfeb server mutex fix 2011-04-21 02:04:15 +02:00
Max-Wilhelm Bruker
38b31681e2 changed leave game shortcut, server cleanups, added max_games_per_user 2011-04-21 01:52:09 +02:00
Max-Wilhelm Bruker
d0b8c6ebd9 changed mutex lock 2011-04-19 04:13:23 +02:00
Max-Wilhelm Bruker
2c6d112ba4 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-04-18 18:56:27 +02:00
Max-Wilhelm Bruker
69fce1fb5d thread fixes 2011-04-18 18:55:35 +02:00
Max-Wilhelm Bruker
6f3a20f53f SIGABRT handler, crash fix 2011-04-18 17:50:42 +02:00
Max-Wilhelm Bruker
9933b219a9 game list mutex in S_PH 2011-04-17 16:31:03 +02:00
Max-Wilhelm Bruker
2d8b12a576 reduced game selector minimum height; server race conditions fixed 2011-04-17 15:46:47 +02:00
Max-Wilhelm Bruker
42ad959220 Merge branch 'master' into experimental 2011-04-06 15:49:20 +02:00
Max-Wilhelm Bruker
6c5dd0b3d1 attach fix 2011-04-05 17:56:40 +02:00
Max-Wilhelm Bruker
6d5b29395c mutex and ghost games fixes 2011-03-29 23:54:08 +02:00
Max-Wilhelm Bruker
8e0f7dcf03 Merge branch 'master' of ../bla 2011-03-29 23:09:40 +02:00
Max-Wilhelm Bruker
2f98abe892 fixFreeSpaces fixed 2011-03-29 23:04:48 +02:00
Max-Wilhelm Bruker
eca941201d more mutexes 2011-03-22 22:46:15 +01:00
Max-Wilhelm Bruker
45890b836b added send buffer to limit socket operations to one thread 2011-03-22 20:45:18 +01:00
Max-Wilhelm Bruker
81a5d58d70 more mutexes 2011-03-22 19:37:56 +01:00
Max-Wilhelm Bruker
4548841a93 server crash fix 2011-03-22 18:31:26 +01:00
Max-Wilhelm Bruker
fd7593edc1 improved logging, improved server multithreading 2011-03-22 17:55:20 +01:00
Max-Wilhelm Bruker
be7779a466 reset card p/t when empty string is sent 2011-03-12 20:43:12 +01:00
Max-Wilhelm Bruker
480d2730c6 don't send full user info to clients in global join event 2011-03-12 20:31:20 +01:00
Max-Wilhelm Bruker
29c4c80ddf server crash fix 2011-03-11 15:35:31 +01:00
Max-Wilhelm Bruker
712aa9768f server crash fix 2011-03-10 00:59:45 +01:00
Max-Wilhelm Bruker
cd20a3d0f4 don't show p/t when playing facedown cards 2011-03-10 00:30:22 +01:00
Max-Wilhelm Bruker
de44918dce server crash fix 2011-03-09 23:53:41 +01:00
Max-Wilhelm Bruker
349a60fb58 concede fix 2011-03-09 15:46:33 +01:00
Max-Wilhelm Bruker
731dfcad5c kick users out of games 2011-03-03 17:05:44 +01:00
Max-Wilhelm Bruker
d6083a85c7 improved packet loss handling 2011-03-03 02:09:29 +01:00
Max-Wilhelm Bruker
657f97680a drop disconnected spectators from games instead of keeping them alive 2011-03-03 01:25:11 +01:00
Max-Wilhelm Bruker
57f9e2c3b4 user banning 2011-03-03 01:16:13 +01:00
Max-Wilhelm Bruker
6145d6d524 chat flood protection (yet untested) 2011-03-02 19:39:38 +01:00
Max-Wilhelm Bruker
3bb1d9a1de force users to log out their unregistered session after logging in with a new registered account 2011-03-02 17:18:44 +01:00
Max-Wilhelm Bruker
1bee788210 don't pm people ignoring you 2011-03-02 16:34:36 +01:00
Max-Wilhelm Bruker
0afdbc7222 more work on buddy&ignore 2011-03-01 21:04:45 +01:00
Max-Wilhelm Bruker
4149f78001 more buddy&ignore code, added missing file 2011-03-01 20:49:36 +01:00
Max-Wilhelm Bruker
9e34c9c985 more buddy list & ignore list code 2011-02-28 20:44:03 +01:00
Max-Wilhelm Bruker
102e246c6d login consistency fix; limit length of user names to 35 2011-02-23 23:46:18 +01:00
Max-Wilhelm Bruker
acac5addd6 initial commit: buddy list, ignore list 2011-02-20 16:47:13 +01:00
Max-Wilhelm Bruker
ce80d29f50 improved cipt handling, initial p/t for cards 2011-02-16 20:05:03 +01:00
Max-Wilhelm Bruker
d05603f83b p/t changes 2011-02-16 18:34:46 +01:00
Max-Wilhelm Bruker
d4f600393f minor visual change, server crash fix, multiplayer leave/concede fixes 2011-02-15 22:50:16 +01:00
Max-Wilhelm Bruker
29e5773fb5 minor server fix, added mbs to sets.xml 2011-02-09 13:47:21 +01:00
Max-Wilhelm Bruker
04742f6fb9 implemented game types 2011-01-27 19:13:22 +01:00
Max-Wilhelm Bruker
7116382a96 added 'undo last draw' feature. protocol version bump (12) 2011-01-27 17:49:31 +01:00
Max-Wilhelm Bruker
25de242180 controller change bug fix 2011-01-26 13:44:02 +01:00
Max-Wilhelm Bruker
b702a12428 server fixFreeSpaces fix 2011-01-26 03:31:54 +01:00
Max-Wilhelm Bruker
596e7be8b1 fixed one server memory leak 2011-01-25 23:14:07 +01:00
Max-Wilhelm Bruker
2c50cce6e2 don't broadcast user avatar along with game list updates 2011-01-25 22:10:33 +01:00
Max-Wilhelm Bruker
92e842bb74 fixed direct chat, fixed in-game attachment bugs 2011-01-25 00:12:35 +01:00
Max-Wilhelm Bruker
f6849ff02b sideboarding bug fix 2011-01-21 19:20:47 +01:00
Max-Wilhelm Bruker
6cebad2513 Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-01-21 18:03:28 +01:00
Max-Wilhelm Bruker
6b370ce16b allow controller change even from a different zone 2011-01-21 18:00:01 +01:00
brukie
dc0f21cce4 Threaded picture caching 2011-01-19 00:16:41 +01:00
Max-Wilhelm Bruker
72ee0d7bdf code merge 2011-01-15 21:41:16 +01:00
Max-Wilhelm Bruker
9c527fb5aa Click to hide revealed cards; MultiMove function 2011-01-15 21:39:24 +01:00
Max-Wilhelm Bruker
5bcacb1e18 minor fix 2011-01-15 14:21:47 +01:00
Max-Wilhelm Bruker
bd9e142d1d added admin tab; server status message update 2011-01-14 16:55:16 +01:00
Max-Wilhelm Bruker
714a0eee50 don't waste bandwidth with spaces or default-value items 2011-01-13 15:02:13 +01:00
Max-Wilhelm Bruker
7f7398de6a user details box 2011-01-10 20:37:34 +01:00
Max-Wilhelm Bruker
5544de3213 minor fixes; added round clock 2011-01-08 14:22:41 +01:00
Max-Wilhelm Bruker
55d493e7ef single player works again, version bump 2011-01-03 20:46:15 +01:00
Max-Wilhelm Bruker
78d81ae65a room stuff and minor fixes 2011-01-03 19:01:49 +01:00
Max-Wilhelm Bruker
80277ff573 rooms work mostly 2011-01-02 16:13:07 +01:00
Max-Wilhelm Bruker
b73001e9fd merge 2011-01-01 22:53:54 +01:00
Max-Wilhelm Bruker
082c94e4c4 improved mulligan behaviour 2011-01-01 20:52:41 +01:00
Max-Wilhelm Bruker
d8d4563292 initial commit for rooms 2010-12-24 02:21:00 +01:00
Max-Wilhelm Bruker
231887367c card menu improvement, change controller support (bug #3) 2010-12-23 19:21:47 +01:00
Max-Wilhelm Bruker
feb1dac1e1 attach arrow bug fix, improved stacking 2010-12-16 00:42:46 +01:00
Max-Wilhelm Bruker
f4962d021e experimental card stacking 2010-12-14 19:26:40 +01:00
Max-Wilhelm Bruker
fe397cd708 server spectator bug fix 2010-12-02 16:58:35 +01:00
Max-Wilhelm Bruker
ec602aefe1 server crash and inconsistency fix 2010-11-23 02:07:56 +01:00
Max-Wilhelm Bruker
6b0c644d2f server status information table 2010-11-16 17:28:14 +01:00
Max-Wilhelm Bruker
92d40515f2 changed card hover handling 2010-11-09 16:19:13 +01:00
Max-Wilhelm Bruker
5b7dd037c1 attach bug fix 2010-11-09 14:26:54 +01:00
Max-Wilhelm Bruker
ae70f5f17c protocol and server version bump 2010-11-04 00:28:52 +01:00
Max-Wilhelm Bruker
82bc4274ae merge fix 2010-11-03 21:35:30 +01:00
Max-Wilhelm Bruker
df5791d318 Introduced stack zone, shrunk table to have higher zoom factor 2010-11-03 21:28:43 +01:00
Max-Wilhelm Bruker
e1380f199e full reveal card support 2010-10-28 18:44:32 +02:00
Max-Wilhelm Bruker
1cd76c2641 preliminary reveal_card support 2010-10-27 22:44:33 +02:00
Max-Wilhelm Bruker
b0b58ca7bd server crash fix; protocol response fix 2010-10-13 20:08:10 +02:00
Max-Wilhelm Bruker
842f266d82 xml entity fix 2010-10-12 16:21:26 +02:00
Max-Wilhelm Bruker
bd06cd5796 removed some debugging warnings; fixed card name and player name display; display avatar in game 2010-10-11 19:01:46 +02:00
Max-Wilhelm Bruker
8d6a4f4f90 preliminary avatar support 2010-10-10 00:06:05 +02:00
Max-Wilhelm Bruker
b1d8c7bda0 Made QColor wrapper class so that Servatrice will compile without QtGui 2010-10-09 18:50:06 +02:00
Max-Wilhelm Bruker
28a77f10e4 Server crash fix 2010-10-01 18:12:40 +02:00
Max-Wilhelm Bruker
e92840c849 moved call to rng constructor to main() 2010-09-23 15:43:39 +02:00