Max-Wilhelm Bruker
|
0e7f7887ad
|
added swedish translation to qrc
|
2012-03-25 17:11:39 +02:00 |
|
Max-Wilhelm Bruker
|
ac62ce9839
|
removed debugging line
|
2012-03-25 17:07:26 +02:00 |
|
Max-Wilhelm Bruker
|
eced4e2340
|
merge
|
2012-03-25 17:06:48 +02:00 |
|
Max-Wilhelm Bruker
|
1224eae1c0
|
added button to test custom translation file
|
2012-03-25 17:02:52 +02:00 |
|
Max-Wilhelm Bruker
|
95dd3fc04c
|
added credits for Swedish translation
|
2012-03-25 16:40:54 +02:00 |
|
Max-Wilhelm Bruker
|
9dcf205d36
|
really added the file this time
|
2012-03-25 15:49:43 +02:00 |
|
Max-Wilhelm Bruker
|
7833363501
|
Merge branch 'master' of github.com:mbruker/Cockatrice
|
2012-03-25 15:48:57 +02:00 |
|
Max-Wilhelm Bruker
|
9a34d7b929
|
translation update, included stub for Swedish
|
2012-03-25 15:48:29 +02:00 |
|
Max-Wilhelm Bruker
|
3b70ad8c66
|
minor fixes wrt commit 4e4a7563db
|
2012-03-25 14:41:52 +02:00 |
|
Max-Wilhelm Bruker
|
4e4a7563db
|
The remote client now runs in an extra thread, fixing issue #29
|
2012-03-25 13:19:40 +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
|
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
|
10d958c4ce
|
Merge branch 'master' into devel
|
2012-03-23 12:18:16 +01:00 |
|
Max-Wilhelm Bruker
|
c92f3e4239
|
fix for issue #17: oracle: convert smart quotes to normal quotes in card names
|
2012-03-23 12:17:59 +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
|
671214c60e
|
mutex fixes, server shutdown works again
|
2012-03-17 19:05:22 +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
|
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
|
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
|
8481e61e8f
|
Replays split up, one for each subgame
|
2012-03-02 20:45:04 +01:00 |
|
Max-Wilhelm Bruker
|
4dc712286f
|
preliminary client-side replay watching code
|
2012-02-26 16:35:34 +01:00 |
|
Max-Wilhelm Bruker
|
c6c6a970c6
|
interface & client tab for replay transfer
|
2012-02-25 19:33:44 +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
|
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
|
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 |
|
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
|
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
|
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
|
609e3fc41d
|
converted SetCardAttr attr_name to enum
|
2012-01-02 20:20:31 +01:00 |
|
Max-Wilhelm Bruker
|
4634787b00
|
converted some Player commands to command lists; added db type checks in server
|
2012-01-02 19:41:37 +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
|
eabe3511cb
|
compile fix
|
2012-01-01 20:07:54 +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
|
ca9122b9fb
|
added responses + events
|
2011-12-29 19:40:41 +01:00 |
|
Daenyth
|
1dd7695e9a
|
Make games created reg-only by default.
|
2011-12-28 23:47:30 -05:00 |
|
Daenyth
|
edde8bec07
|
Add Planeswalker loyalty to CardInfoWidget
CIW will also dynamically hide/show power/toughness as well as loyalty.
|
2011-12-28 23:47:29 -05:00 |
|
Daenyth
|
0c1b6dd9c3
|
Merge remote-tracking branch 'upstream/master' into show-unjoinable-checkbox
|
2011-12-20 21:48:30 -05: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 |
|
Daenyth
|
6b7da3223a
|
Fix NPE in GameSelector::GameSelector when called from UserList::gamesOfUserReceived
|
2011-12-07 23:37:04 -05:00 |
|
Daenyth
|
fdded2e8c2
|
More Gàighlig translations
|
2011-12-07 20:31:43 -05:00 |
|
Daenyth
|
c140327c1b
|
More Gàidhlig translations
|
2011-12-07 19:35:00 -05:00 |
|
Daenyth
|
ab24ff44e5
|
Add partial Scottish Gaelic (gd) translation
|
2011-12-07 01:40:08 -05:00 |
|
Daenyth
|
86ae8a47a8
|
Rename 'unjoinable' games to 'unavailable'
|
2011-12-04 12:25:51 -05:00 |
|
Daenyth
|
edd429d874
|
Filter registered-only games as unavailable when user isn't regged
|
2011-12-04 12:16:19 -05: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
|
1455c093cc
|
store sessions in database
|
2011-12-04 13:36:53 +01:00 |
|
Daenyth
|
eebc615c1c
|
Change "Show full" "Show running" checkboxes to a single box
IMO these should not have been split
|
2011-12-03 23:13:27 -05:00 |
|
Daenyth
|
a7f3ce4050
|
Add code support for planeswalker loyalty.
Added to CardInfo object and to the oracle importer. Next step is the
card info widget.
|
2011-12-03 17:15:33 -05:00 |
|
Max-Wilhelm Bruker
|
e3c1ad2da6
|
Qt 4.6 compile fix
|
2011-11-26 15:45:29 +01:00 |
|
Max-Wilhelm Bruker
|
cef4fb11f3
|
maximize card pics in card info
|
2011-11-26 14:57:31 +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 |
|
brukie
|
fb3d74c139
|
mac fixes
|
2011-11-17 11:09:44 -09:00 |
|
Max-Wilhelm Bruker
|
7806024c2b
|
excluded unfinished translations from release
|
2011-11-13 14:00:45 +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 |
|
a b
|
9fe8f6fc03
|
mac fix
|
2011-10-27 22:06:52 +02: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
|
683c57bb88
|
linux compile fix
|
2011-10-14 14:24:02 +02:00 |
|