 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
|
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
|
d792c3ddc6
|
Merge branch 'devel' of git://github.com/mbruker/Cockatrice into servernetwork
|
2012-03-17 17:08:47 +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
|
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
|
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
|
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
|
decf1c04bd
|
switched NetworkServerThread to new thread creation method, SSL is working
|
2012-03-10 16:16:31 +01:00 |
|
|
Max-Wilhelm Bruker
|
0719d4c6ed
|
client-side SSL works, thread initialization needs fixing
|
2012-03-04 23:15:39 +01:00 |
|
|
Max-Wilhelm Bruker
|
c9b66e4239
|
more ServerNetwork code
|
2012-03-04 19:23:43 +01:00 |
|
|
Max-Wilhelm Bruker
|
6bbc76af2b
|
Merge branch 'devel' into servernetwork
|
2012-03-04 12:23:22 +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
|
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
|
50e53fbe53
|
initial commit for server network support
|
2012-02-26 21:00:05 +01:00 |
|
|
Max-Wilhelm Bruker
|
4dc712286f
|
preliminary client-side replay watching code
|
2012-02-26 16:35:34 +01:00 |
|
|
Max-Wilhelm Bruker
|
65d4c77ee8
|
cmake fix
|
2012-02-25 23:18:08 +01:00 |
|
|
Max-Wilhelm Bruker
|
c6c6a970c6
|
interface & client tab for replay transfer
|
2012-02-25 19:33:44 +01:00 |
|
|
Max-Wilhelm Bruker
|
faf6b2c5cb
|
Merge /home/brukie/.VirtualBox/Machines/Windows XP/shared/cock_devel
|
2012-02-25 15:18:34 +01:00 |
|
|
Max-Wilhelm Bruker
|
50295b6e98
|
Merge /home/brukie/.VirtualBox/Machines/Windows XP/shared/cock_devel
|
2012-02-25 14:56:12 +01:00 |
|
|
Max-Wilhelm Bruker
|
89eaa14ec2
|
cmake fix
|
2012-02-25 14:48:31 +01:00 |
|
|
Max-Wilhelm Bruker
|
aa158a4be3
|
Merge branch 'devel' of git://github.com/mbruker/Cockatrice
|
2012-02-16 21:23:07 +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
|
a0655e083f
|
hq picture fix
|
2012-02-16 21:13:01 +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 |
|
|
Max-Wilhelm Bruker
|
eb06d6b4ea
|
when banning an ip address, terminate the connection of everyone with that address
|
2012-01-29 20:55:24 +01:00 |
|
|
Max-Wilhelm Bruker
|
e8844deeef
|
added unix desktop icons and menu items to install target
|
2012-01-29 18:30:02 +01:00 |
|
|
Max-Wilhelm Bruker
|
8824cd7e84
|
Merge ../cockmerge
|
2012-01-29 17:15:05 +01:00 |
|
|
Max-Wilhelm Bruker
|
5182820964
|
merged from master
|
2012-01-29 17:14:59 +01:00 |
|
|
Max-Wilhelm Bruker
|
f622a41e7a
|
cleaner implementation of loyalty display criterium
|
2012-01-29 17:00:57 +01:00 |
|
|
Max-Wilhelm Bruker
|
ccfdc0a084
|
Merge branch 'master' of git://github.com/mbruker/Cockatrice
|
2012-01-29 16:56:50 +01:00 |
|
|
Max-Wilhelm Bruker
|
6d4510b506
|
merged from master
|
2012-01-29 16:54:22 +01:00 |
|
|
Max-Wilhelm Bruker
|
848b52b287
|
removed setFixedSize in oracle
|
2012-01-29 16:00:12 +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
|
a64df4a0f5
|
Use QDesktopServices::StandardLocation for platform independent default paths that don't touch the application's own folder
|
2012-01-22 14:18:28 +01:00 |
|
|
Max-Wilhelm Bruker
|
cf4bc71d57
|
made client / server compilation optional
|
2012-01-21 22:29:10 +01:00 |
|
|
Max-Wilhelm Bruker
|
068658995d
|
added compiler flags
|
2012-01-21 22:24:20 +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
|
ab11a40863
|
ARM compile fix, reported by Jeff Hoogland
|
2012-01-15 12:15:20 +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
|
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
|
ca3a7e69a1
|
stop card tap/untap animation in CardItem::resetState() to avoid unfinished animation during zone change
|
2011-12-04 14:51:24 +01:00 |
|
|
Max-Wilhelm Bruker
|
eb6520a737
|
store network traffic statistics in database
|
2011-12-04 14:24:36 +01:00 |
|
|
Max-Wilhelm Bruker
|
1455c093cc
|
store sessions in database
|
2011-12-04 13:36:53 +01:00 |
|
|
Max-Wilhelm Bruker
|
7611bdd7cb
|
Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
|
2011-11-17 21:44:24 +01:00 |
|
|
Max-Wilhelm Bruker
|
7efee472ed
|
face down dragging fixed, minor french translation fix
|
2011-11-17 21:43:32 +01:00 |
|
|
Max-Wilhelm Bruker
|
6b18ba6bac
|
concession fix
|
2011-11-13 16:55:41 +01:00 |
|
|
Max-Wilhelm Bruker
|
3ea0729229
|
is_admin=2 fix
|
2011-11-13 15:06:57 +01:00 |
|
|
Max-Wilhelm Bruker
|
7806024c2b
|
excluded unfinished translations from release
|
2011-11-13 14:00:45 +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
|
0d53f3f3e1
|
lupdate
|
2011-11-13 13:14:30 +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
|
bca7b6414b
|
hide messages from ignored users in room chat
|
2011-11-13 11:06:28 +01:00 |
|
|
Max-Wilhelm Bruker
|
7dc2563390
|
sets.xml updated; don't try to retrieve empty picture urls
|
2011-11-12 00:52:04 +01:00 |
|
|
Max-Wilhelm Bruker
|
632e9bbff3
|
improved banning and deck hashing
|
2011-11-01 22:44:51 +01:00 |
|
|
Max-Wilhelm Bruker
|
1bfa355974
|
German translation fix, take bottom card via Ctrl+Drag
|
2011-10-16 12:10:28 +02:00 |
|
|
Max-Wilhelm Bruker
|
3211801e39
|
show hand context menu when hand counter is rightclicked
|
2011-10-16 11:51:06 +02:00 |
|
|
Max-Wilhelm Bruker
|
5c13b50cf0
|
zoneView weirdness fix
|
2011-10-04 20:05:47 +02:00 |
|
|
Max-Wilhelm Bruker
|
963e8f0d90
|
Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
|
2011-09-30 19:03:28 +02:00 |
|
|
Max-Wilhelm Bruker
|
4bdb9e1ddc
|
added Guatemala
|
2011-09-30 19:02:33 +02:00 |
|
|
Max-Wilhelm Bruker
|
ec743b73db
|
italian translation fix
|
2011-09-27 20:16:18 +02:00 |
|
|
Max-Wilhelm Bruker
|
b33b3778f0
|
italian translation nearly done
|
2011-09-26 18:47:15 +02:00 |
|
|
Max-Wilhelm Bruker
|
7f06471d36
|
Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
|
2011-09-21 21:06:27 +02:00 |
|
|
Max-Wilhelm Bruker
|
a61558117f
|
qtmultimedia related compile fix (hopefully), adjusted maximum ban duration
|
2011-09-21 21:06:19 +02:00 |
|
|
Max-Wilhelm Bruker
|
742a10cc1f
|
updated resource file
|
2011-09-15 18:17:31 +02:00 |
|
|
Max-Wilhelm Bruker
|
47d63ad551
|
added some countries and zonebgs
|
2011-09-15 18:15:45 +02:00 |
|
|
Max-Wilhelm Bruker
|
b50530dca1
|
added italian translation stub, sort in-game player list by spectator/player
|
2011-08-23 20:23:40 +02:00 |
|
|
Max-Wilhelm Bruker
|
0f4b044468
|
auto-configure sounds path in Windows installer
|
2011-08-03 17:02:04 +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
|
c90b1b6a8e
|
don't hash passwords in the client
|
2011-08-02 21:57:30 +02:00 |
|
|
Max-Wilhelm Bruker
|
b2ba83acb1
|
chat view scrollbar locking fix
|
2011-08-02 21:49:12 +02:00 |
|
|
Max-Wilhelm Bruker
|
3ff5158b6f
|
server crash fix
|
2011-08-02 21:10:38 +02:00 |
|
|
Max-Wilhelm Bruker
|
4f4049fccf
|
ZoneViewZone fix
|
2011-07-22 22:04:13 +02:00 |
|
|
Max-Wilhelm Bruker
|
60722e6e47
|
Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
|
2011-07-21 19:17:53 +02:00 |
|