Mark Morschhäuser
|
562de0553f
|
Fixed compile warnings due to missing \n at EOF.
|
2013-05-15 21:31:47 +02:00 |
|
Daenyth
|
347d30a84b
|
Merge branch 'master' of git://github.com/mbruker/Cockatrice
|
2013-02-27 12:36:14 -05:00 |
|
Max-Wilhelm Bruker
|
ce642e3000
|
don't use Server_Room::getInfo when updating
|
2013-02-15 19:31:37 +01:00 |
|
Max-Wilhelm Bruker
|
7a30b827c8
|
changed Server_Room::gamesMutex to QReadWriteLock
|
2013-02-11 15:43:31 +01:00 |
|
Max-Wilhelm Bruker
|
00029eeeb4
|
Server_Room optimisation
|
2013-02-11 15:29:19 +01:00 |
|
Max-Wilhelm Bruker
|
9f13254d01
|
don't allow players to move cards that are attached to something
|
2013-02-03 18:23:54 +01:00 |
|
Max-Wilhelm Bruker
|
6807bb0bd7
|
server crash fix
|
2013-01-28 13:40:42 +01:00 |
|
Max-Wilhelm Bruker
|
c65f327e71
|
server crash fixes
|
2013-01-27 15:15:27 +01:00 |
|
Max-Wilhelm Bruker
|
14287e54f9
|
server crash fix
|
2013-01-26 16:08:42 +01:00 |
|
Max-Wilhelm Bruker
|
d5ccda49a1
|
server code cleanup
|
2013-01-23 11:51:59 +01:00 |
|
Max-Wilhelm Bruker
|
60a1f5d7d1
|
Server_CardZone::getFreeGridColumn() now runs in O(log n), which should remove the performance bottleneck when processing insertCard(x = -1) commands on a large zone, e.g. createToken
|
2013-01-20 16:40:15 +01:00 |
|
Max-Wilhelm Bruker
|
590ab2f598
|
fixed #84: game creator couldn't re-join his game if the only buddies flag was set
|
2013-01-19 21:17:21 +01:00 |
|
Max-Wilhelm Bruker
|
2789116d03
|
fixed cmdDeckSelect (2)
|
2013-01-12 16:33:29 +01:00 |
|
Max-Wilhelm Bruker
|
1d151d2d12
|
cmdDeckSelect fixed
|
2013-01-10 14:31:07 +01:00 |
|
Max-Wilhelm Bruker
|
733aa6c52b
|
Server_CardZone speed optimisation
|
2013-01-03 18:16:17 +01:00 |
|
Max-Wilhelm Bruker
|
8b6eace312
|
code cleanup
|
2013-01-03 17:18:37 +01:00 |
|
Max-Wilhelm Bruker
|
cc3760a7df
|
fixed deadlock condition
|
2012-11-16 21:42:17 +01:00 |
|
Max-Wilhelm Bruker
|
43d7cf6a1a
|
removed recursive lock in server; moved object serialisation to worker thread
|
2012-10-14 13:19:03 +02:00 |
|
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
|
4c9165f099
|
fixed #62: shuffling doesn't reveal the top card even if AlwaysRevealTopCard is set
|
2012-07-17 19:22:09 +02:00 |
|
Max-Wilhelm Bruker
|
886f12d116
|
fixed #63: spectators have sideboard lock icons
|
2012-07-17 19:17:26 +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
|
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
|
e7b58c4d8e
|
server: fixed spectator count not being updated
|
2012-06-25 13:07:26 +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
|
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
|
7157963204
|
removed usleep() call to enable compilation on Windows again
|
2012-06-02 19:38:31 +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
|
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
|
981db47f9e
|
initial commit for connection pools
|
2012-05-20 18:47:28 +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
|
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
|
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
|
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
|
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
|
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
|
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
|
f553fd7456
|
some token code
|
2012-04-05 11:48:13 +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
|
767d53b5a8
|
merged from master
|
2012-03-31 18:41:01 +02:00 |
|
Max-Wilhelm Bruker
|
b289ab0d9f
|
fixed server crash condition
|
2012-03-31 18:07:31 +02:00 |
|
Max-Wilhelm Bruker
|
13b992cf12
|
show ban duration in client
|
2012-03-31 12:07:25 +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
|
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
|
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
|
2ce18a82f5
|
RevealCards message log bug fixed
|
2012-03-24 15:25:32 +01:00 |
|
Max-Wilhelm Bruker
|
80967b59e3
|
fixed another faceDown bug
|
2012-03-22 23:42:26 +01:00 |
|
Max-Wilhelm Bruker
|
af8e357487
|
improved code for automatic joining of persistent games; disconnecting + reconnecting works as it should with ISL
|
2012-03-18 21:57:21 +01:00 |
|
Max-Wilhelm Bruker
|
5db0fcd6ae
|
cleanups, games work with ISL, now we just need to clean up better when the ISL connection dies
|
2012-03-18 18:48:14 +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
|
9706ecd98a
|
added mutex for RNG, moved game command implementation from S_PH to S_Player in preparation for forwarding of game commands via tunneling interface
|
2012-03-17 22:26:12 +01:00 |
|
Max-Wilhelm Bruker
|
671214c60e
|
mutex fixes, server shutdown works again
|
2012-03-17 19:05:22 +01:00 |
|
Max-Wilhelm Bruker
|
c23af44749
|
changed a lot of thread locking code in the server, rooms are working with ISL now
|
2012-03-17 16:09:00 +01:00 |
|
Max-Wilhelm Bruker
|
572e4eaafa
|
more ISL code, mutex fixes
|
2012-03-12 00:36:44 +01:00 |
|
Max-Wilhelm Bruker
|
0ae18d7b2e
|
more ISL code: join, leave, and userMessage work on both sides
|
2012-03-11 17:25:45 +01:00 |
|
Max-Wilhelm Bruker
|
5963c2239c
|
renamed servernetwork to ISL (inter-server link), join/leave is working
|
2012-03-10 19:02:15 +01:00 |
|
Max-Wilhelm Bruker
|
dda78661ea
|
added missing table unlock command
|
2012-03-10 16:38:00 +01:00 |
|
Max-Wilhelm Bruker
|
c9b66e4239
|
more ServerNetwork code
|
2012-03-04 19:23:43 +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
|
a27bc20887
|
added missing file
|
2012-03-02 20:45:57 +01:00 |
|
Max-Wilhelm Bruker
|
8481e61e8f
|
Replays split up, one for each subgame
|
2012-03-02 20:45:04 +01:00 |
|
Max-Wilhelm Bruker
|
65d4c77ee8
|
cmake fix
|
2012-02-25 23:18:08 +01:00 |
|
Max-Wilhelm Bruker
|
89b8fe1e21
|
cmake fix
|
2012-02-25 23:10:56 +01:00 |
|
Max-Wilhelm Bruker
|
c6c6a970c6
|
interface & client tab for replay transfer
|
2012-02-25 19:33:44 +01:00 |
|
Max-Wilhelm Bruker
|
703426d848
|
cmake fix
|
2012-02-25 15:18:14 +01:00 |
|
Max-Wilhelm Bruker
|
96213fc3f3
|
Windows fixes
|
2012-02-25 14:50:06 +01:00 |
|
Max-Wilhelm Bruker
|
89c920479c
|
cmake fix
|
2012-02-21 01:21:32 +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
|
d50d179b2f
|
server-side replay support
|
2012-02-20 22:13:48 +01:00 |
|
Max-Wilhelm Bruker
|
a2778ab129
|
fixed bug #21: Players can't draw arrow to avatar icons any more
|
2012-02-16 21:22:46 +01:00 |
|
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 |
|