Commit graph

967 commits

Author SHA1 Message Date
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
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
faf6b2c5cb Merge /home/brukie/.VirtualBox/Machines/Windows XP/shared/cock_devel 2012-02-25 15:18:34 +01:00
Max-Wilhelm Bruker
703426d848 cmake fix 2012-02-25 15:18:14 +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
96213fc3f3 Windows fixes 2012-02-25 14:50:06 +01:00
Max-Wilhelm Bruker
89eaa14ec2 cmake fix 2012-02-25 14:48:31 +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
a1bcd9854f preliminary client-side replay support, works in principle 2012-02-21 00:09:03 +01:00
Max-Wilhelm Bruker
d50d179b2f server-side replay support 2012-02-20 22:13:48 +01:00
Max-Wilhelm Bruker
7cec442694 setDoesntUntap fixed, card menu moved to player to avoid unnecessary allocation of QActions 2012-02-20 17:26:46 +01:00
Max-Wilhelm Bruker
8af0f01db8 CardInfoWidget fix 2012-02-20 12:53:33 +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
cockatrice
10cbe4bf2e protobuf compile fix 2012-01-30 11:02:33 +00: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
a b
7faa033855 Mac fixes 2012-01-29 21:17:32 +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
mbruker
332ca29d62 Merge pull request #4 from Daenyth/show-unjoinable-checkbox
Change "Show full" "Show running" checkboxes to a single box
2012-01-29 08:02:06 -08: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
mbruker
c7662999d3 Merge pull request #3 from Daenyth/master
Add planeswalker loyalty to CardInfoWidget
2012-01-29 07:56:36 -08: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
c9cd6f5d57 DKA added to sets 2012-01-27 14:22:25 +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
mbruker
355c0919e7 Merge pull request #8 from Daenyth/translation
Translation: gd (Scots Gaelic)
2012-01-22 03:44:37 -08: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