Commit graph

236 commits

Author SHA1 Message Date
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
Max-Wilhelm Bruker
23a0080c45 user level display 2010-09-20 18:52:36 +02:00
Max-Wilhelm Bruker
e597325ec3 implemented direct chat 2010-09-18 23:47:39 +02:00
Max-Wilhelm Bruker
a8e166b609 crash fix 2010-09-18 21:14:58 +02:00
Max-Wilhelm Bruker
f9446f9822 generalized user information 2010-09-18 21:05:28 +02:00
Max-Wilhelm Bruker
adaa1d5323 fixed flipCard code 2010-09-17 22:59:13 +02:00
Max-Wilhelm Bruker
8e9bbf3581 Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice 2010-09-15 21:49:26 +02:00
Max-Wilhelm Bruker
d52b00fbd8 extra files 2010-09-15 21:49:13 +02:00
Max-Wilhelm Bruker
7e9879c0ea Included SFMT RNG 2010-09-15 21:48:52 +02:00
Max-Wilhelm Bruker
6fb16545ee Fixed server crash when unattaching card 2010-09-14 17:20:59 +02:00
Max-Wilhelm Bruker
e15806db34 arrow crash bugfix 2010-09-10 22:40:46 +02:00