Commit graph

319 commits

Author SHA1 Message Date
Matt Lowe
a80ccd882c Tokens use PT levels from cards.xml if available
I added a check to see if the event PT is empty, if it is, we try and
use the PT from the cards.xml. In resp to issue #330.
2014-10-01 00:57:07 +02:00
Jan Martin
6f97e59c03 Change default scry to 1. 2014-09-19 21:41:57 +10:00
Waleed Khan
309494111c Fix #248: the token dialog generates cards irrespective of their case and punctation. 2014-08-02 19:32:24 -04:00
Fabio Bas
6dbdaafb33 Ported cockatrice 2014-06-24 19:13:47 +02:00
Mark Morschhäuser
49227ad44c Fixed VC "'*/' found outside of comment" warning. 2014-03-11 15:04:26 +01:00
Matt Kelly
a171df744d Convert to 4-space indents 2014-02-11 10:47:51 -05:00
Matt Kelly
96ec49936e Resolve all compiler warnings 2014-02-11 01:52:06 -05:00
skoh-fley
03852f0409 To-be permanents on the stack now enter the battlefield when double-clicked 2013-04-17 08:23:31 -07:00
skoh-fley
2727781c0e Added a UI option to always play nonlands onto the stack
Previously this behavior only occured for instants and sorceries

Woops, missed a file

Missed some parentheses
2013-04-17 08:23:12 -07:00
Max-Wilhelm Bruker
87584a3a76 updated Spanish; adjusted details for release 2012-06-24 16:40:05 +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
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
61f5cd478d Qt 4.8 crash fix 2012-04-27 00:03:08 +02:00
Max-Wilhelm Bruker
c7fa2fe985 fixed clone function, updated servatrice.ini.example to reflect changes in room creation syntax 2012-04-26 16:22:48 +02:00
Max-Wilhelm Bruker
81d7c08f08 use player menu as default menu for table zone, fixing issue #38 2012-04-22 12:28:23 +02:00
Max-Wilhelm Bruker
cc516823d7 deck editor is tab, replay viewer is tab, deck editor shown by default, cache window geometry between sessions, 'open this deck in deck editor' open in game 2012-04-22 12:23:33 +02:00
Max-Wilhelm Bruker
118b575e58 updated German translation, minor token fix 2012-04-06 15:34:00 +02:00
Max-Wilhelm Bruker
12b5e39440 improved token dialog w/ storage inside the deck list - now we need a reliable online source for token data (preferably with pictures) 2012-04-06 15:16:52 +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
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
d251078feb fixed user list bug in threaded client, fixed buddy list crash in server 2012-03-26 00:54:44 +02: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
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
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
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
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
d3b96b1a88 PB: server compiles again, standalone RemoteClient is able to log in 2011-12-30 21:50:25 +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
314f17091d protobuf client->server communication almost working 2011-12-18 18:35:14 +01:00
Max-Wilhelm Bruker
3211801e39 show hand context menu when hand counter is rightclicked 2011-10-16 11:51:06 +02:00
unknown
da467468d5 improved facedown moving 2011-09-15 14:19:29 +02:00
unknown
3ed26e11ae fix: don't show conceded players, fix: compute multicolumn layout correctly when dealing with odd number of players 2011-09-12 16:32:55 +02:00
Max-Wilhelm Bruker
0120d2a019 cardInfoPopup fix; chatView fix 2011-06-28 02:37:49 +02:00
Max-Wilhelm Bruker
4b84168bda client/server version bump; eventConnectionStateChanged 2011-06-25 17:50:28 +02:00
Max-Wilhelm Bruker
b7ab2d97bd support for women 2011-06-22 17:39:25 +02:00
unknown
1bc05562cc Mulligan crash fix, multi-column screen alignment for multiplayer, Server Win32 compile fix 2011-06-05 19:45:37 +02:00
Max-Wilhelm Bruker
808d2a3c01 Event context for mulligans, German translation 2011-05-21 23:48:46 +02:00
Max-Wilhelm Bruker
c4efa8f1aa performance improvement 2011-03-09 19:51:49 +01:00
Max-Wilhelm Bruker
ac46edd790 geometry update fix 2011-03-09 15:32:56 +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
7116382a96 added 'undo last draw' feature. protocol version bump (12) 2011-01-27 17:49:31 +01:00
Max-Wilhelm Bruker
7200b5be0e Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-01-26 14:34:34 +01:00
Max-Wilhelm Bruker
970559290b shortcut for viewing sideboard 2011-01-26 14:34:20 +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
f8bd3f8fd3 added server sponsor banner as resource (temporary); adjusted counter padding 2011-01-23 15:58:58 +01:00
Max-Wilhelm Bruker
2e90a85999 nicer looking counters 2011-01-21 21:20:24 +01:00
Max-Wilhelm Bruker
9c527fb5aa Click to hide revealed cards; MultiMove function 2011-01-15 21:39:24 +01:00
Max-Wilhelm Bruker
02f2fb9764 reworked in-game avatar display 2011-01-04 23:16:02 +01:00
Max-Wilhelm Bruker
76a13be3c3 always set DestroyOnZoneChange to true for cloned cards 2010-12-23 23:18:29 +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
d23315182a minor attach bug fix 2010-12-14 16:19:39 +01:00
Max-Wilhelm Bruker
5cdc3c68b7 Added 'move top card to bottom' 2010-12-10 13:08:38 +01:00
Max-Wilhelm Bruker
6e567d5b2f crash fix 2010-12-01 14:56:50 +01:00
Max-Wilhelm Bruker
f7963e713b hide horizontal hand of non-local players 2010-11-10 16:21:27 +01:00
Max-Wilhelm Bruker
c4cb0f6354 minor bug fix 2010-11-10 01:31:43 +01:00
Max-Wilhelm Bruker
2451c39ef2 fixed player area layout 2010-11-05 16:46:59 +01:00
Max-Wilhelm Bruker
315564f567 width calculation bug fix 2010-11-04 00:24:25 +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
a029994437 removed unnecessary repaint when destroying token 2010-10-27 19:54:48 +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
fbcb34db61 Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice 2010-10-11 17:46:00 +02:00
Max-Wilhelm Bruker
2f422f5a20 avatar changes 2010-10-11 17:45:52 +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
db2c2d1b15 card tap/untap animation; misc fixes 2010-10-07 17:18:15 +02:00
Max-Wilhelm Bruker
e597325ec3 implemented direct chat 2010-09-18 23:47:39 +02:00
Max-Wilhelm Bruker
adaa1d5323 fixed flipCard code 2010-09-17 22:59:13 +02:00
Max-Wilhelm Bruker
04d92048ff crash fix 2010-09-17 17:41:37 +02:00
Max-Wilhelm Bruker
42e806c57f attach bug fix 2010-09-15 18:51:18 +02:00
Max-Wilhelm Bruker
eff0c0cc24 arrow crash bug fix 2010-09-15 18:45:43 +02:00
Max-Wilhelm Bruker
d7b3764bba added feature: move top cards of library to grave/exile 2010-09-13 20:52:49 +02:00
Max-Wilhelm Bruker
62bf2572a9 Crash fixes (bug #0000006). Also cleaned up some includes to speed up compilation. 2010-09-08 22:52:04 +02:00
Max-Wilhelm Bruker
8fea71782d arrow crash fix. this fixes bug #0000001 2010-09-08 21:11:30 +02:00
Max-Wilhelm Bruker
c4c1723205 single player improvements 2010-09-07 03:51:48 +02:00
Max-Wilhelm Bruker
5ff099f4bc more code for local playing 2010-08-14 17:01:14 +02:00
Max-Wilhelm Bruker
168d184e8f local playing bugfixes 2010-08-11 04:23:12 +02:00
Max-Wilhelm Bruker
00077565ab minor table layout bugfix 2010-08-11 01:32:52 +02:00
Max-Wilhelm Bruker
7921b5f82d initial commit of local server code 2010-08-04 13:56:51 +02:00
Max-Wilhelm Bruker
1b286973dd crash fix; weird behaviour fix 2010-07-17 19:22:50 +02:00
Max-Wilhelm Bruker
614f106304 arrows can target players; card attachment works 2010-07-17 18:24:14 +02:00
Max-Wilhelm Bruker
61b82bd6f9 arrows can target players now 2010-06-27 17:56:09 +02:00
Max-Wilhelm Bruker
cbf201ed9b optionally destroy tokens on zone change; added multi arrows; card menu changes; arrow fixes; initial commit for attachCard code 2010-06-27 14:50:51 +02:00
Max-Wilhelm Bruker
49e3563386 improved token dialog 2010-06-18 21:04:28 +02:00
Max-Wilhelm Bruker
62a9003d3e server has to assign free table space for a new card so that there is no race condition 2010-06-18 19:57:06 +02:00
Max-Wilhelm Bruker
df7bcf179d set p/t, set annotation, multiple counters per card 2010-06-17 20:13:27 +02:00
Max-Wilhelm Bruker
7553251baf table width bugfix 2010-06-08 16:39:35 +02:00
Max-Wilhelm Bruker
e0c1932373 close feature request 0000018 2010-06-03 17:46:27 +02:00
Max-Wilhelm Bruker
cfd715cce9 nicer looking active player display 2010-05-29 18:36:59 +02:00
Max-Wilhelm Bruker
f2092b89e9 correct mirroring of players when spectating 2010-05-29 17:31:16 +02:00
Max-Wilhelm Bruker
e1a728328e Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice
Conflicts:
	cockatrice/cockatrice.pro
	cockatrice/src/player.cpp
2010-05-29 16:42:14 +02:00
Max-Wilhelm Bruker
aaf236d0b4 hand counter 2010-05-29 16:37:41 +02:00
Max-Wilhelm Bruker
e6e20cb048 optional setting for horizonal hand display 2010-05-27 17:22:18 +02:00
Max-Wilhelm Bruker
befafa28ae Fixed elevation of spectator rights; added some spectator options; closes bug 0000005 2010-05-26 21:36:54 +02:00
Max-Wilhelm Bruker
266e7376db minor arrow fix 2010-03-10 16:42:49 +01:00
Max-Wilhelm Bruker
929f4f9b4d cleanup 2010-03-09 14:43:06 +01:00
Max-Wilhelm Bruker
26a77d9e40 new zone view code 2010-03-08 15:55:35 +01:00
Max-Wilhelm Bruker
8295b49634 trying to get rid of ZoneViewLayout 2010-03-06 23:37:49 +01:00
Max-Wilhelm Bruker
e9a0203880 make more use of SettingsCache 2010-03-06 23:02:45 +01:00
Max-Wilhelm Bruker
b2f83541e7 Initial commit for sideboarding. It's supposed to be fully functional. 2010-03-06 17:17:54 +01:00
Max-Wilhelm Bruker
2ee4bb834d minor translation fix; new shortcut 2010-03-05 17:54:21 +01:00
Max-Wilhelm Bruker
0c508f63ec removed some useless game events in favor of event context classes; added some preliminary icons 2010-03-03 18:20:46 +01:00
Max-Wilhelm Bruker
888a64b0fd new protocol code 2010-02-26 17:28:02 +01:00
Max-Wilhelm Bruker
ddd58d6736 crash fix 2009-12-21 15:23:22 +01:00
Max-Wilhelm Bruker
d23ece59ea crash fixes; move_card fixes 2009-12-18 19:03:02 +01:00
Max-Wilhelm Bruker
564ae4db84 some cleanups and fixes 2009-12-15 16:48:14 +01:00
Max-Wilhelm Bruker
0603b3dafd sanity checks; server crash fix 2009-12-08 00:46:38 +01:00
Max-Wilhelm Bruker
a8e9501dad bug fix 2009-12-07 23:09:52 +01:00
Max-Wilhelm Bruker
bda7ec2186 card menu re-added 2009-12-06 17:23:41 +01:00
Max-Wilhelm Bruker
78c1851c52 implemented conceding 2009-12-01 17:26:42 +01:00
Max-Wilhelm Bruker
59e9416f57 blah 2009-11-30 19:33:45 +01:00
Max-Wilhelm Bruker
694070724c restructured protocol code 2009-11-29 03:07:28 +01:00
Max-Wilhelm Bruker
77015c9ebf event handling 2009-11-28 00:02:11 +01:00
Max-Wilhelm Bruker
e796af2b89 game is almost playable again 2009-11-26 18:52:53 +01:00
Max-Wilhelm Bruker
0d4717f40b new code 2009-11-25 22:58:20 +01:00
Max-Wilhelm Bruker
8dcf81654e decklist transfer code 2009-11-22 00:34:31 +01:00
Max-Wilhelm Bruker
77f5ec29eb some gui code 2009-11-16 17:18:13 +01:00
Max-Wilhelm Bruker
cb0e4d07e4 everything compiles again; enough for today 2009-11-12 00:09:24 +01:00
Max-Wilhelm Bruker
897dca2386 arrows: clean all arrows when changing phase; arrow color dependent on modifier keys; remove a single arrow by rightclicking 2009-10-21 11:02:02 +02:00
Max-Wilhelm Bruker
c57e138a78 prepareGeometryChange bugfix; more arrows code 2009-10-20 23:20:07 +02:00
Max-Wilhelm Bruker
4bc76600e8 addCounter bugfix 2009-10-20 01:43:53 +02:00
Max-Wilhelm Bruker
ae39dc7fa1 improved mulligans 2009-10-20 01:33:44 +02:00
marcus
c86a1ed4f6 fixed bug with mulligan and restart of game 2009-10-19 18:52:53 +02:00
marcus
6049a601fb bug fixed 2009-10-19 17:59:19 +02:00
marcus
5cf970f0f3 Mulligan added to Client 2009-10-19 17:52:42 +02:00
Max-Wilhelm Bruker
72324f355d fixed moving an entire zone to another 2009-09-29 17:26:30 +02:00
Max-Wilhelm Bruker
4186d73c88 crash fix 2009-09-28 11:06:15 +02:00
Max-Wilhelm Bruker
50ae90c148 small bugfix 2009-09-25 22:05:59 +02:00
Max-Wilhelm Bruker
85319ecc28 counters menu 2009-09-25 16:50:20 +02:00
Max-Wilhelm Bruker
29699418d2 removed some unneeded code, counter appearance changed 2009-09-25 12:56:11 +02:00
Max-Wilhelm Bruker
890740bcc9 protocol changes, menu cleanups, phase button speed improvement 2009-09-21 20:21:11 +02:00
Max-Wilhelm Bruker
117a77655b fixed compiler warnings 2009-09-09 17:23:41 +02:00
Max-Wilhelm Bruker
aa9ebd3179 fixed dynamic table resizing 2009-09-09 15:48:56 +02:00
Max-Wilhelm Bruker
00a2f49c94 some fixes 2009-09-08 22:45:48 +02:00
Max-Wilhelm Bruker
0d774b5d48 table grid improvement, unfinished 2009-09-08 17:56:20 +02:00
Max-Wilhelm Bruker
a5280946c2 language fix 2009-08-27 15:28:19 +02:00
Max-Wilhelm Bruker
120193fb0b fixed shuffling, more chat widget code 2009-08-22 21:57:03 +02:00
Max-Wilhelm Bruker
0d84de2384 moved carddraw from game to player; qt 4.4 compilation fix; minor behaviour change 2009-08-22 01:26:35 +02:00
Max-Wilhelm Bruker
cc8de80db8 zoneview improvement 2009-08-19 18:55:21 +02:00
Max-Wilhelm Bruker
5f110af562 active player is highlighted 2009-08-18 16:43:39 +02:00
Max-Wilhelm Bruker
cb90463530 phase toolbar 2009-08-18 14:51:26 +02:00
Max-Wilhelm Bruker
cd6c5108af small changes and initial commit for phases toolbar 2009-08-12 19:27:41 +02:00
Max-Wilhelm Bruker
536c77f760 move_card improvement, unfinished 2009-08-11 17:56:09 +02:00
Max-Wilhelm Bruker
2148005bd1 minor cleanups and log improvements 2009-08-05 16:50:16 +02:00
Max-Wilhelm Bruker
40d292c4ac really fixed zone view bug 2009-07-02 18:03:23 +02:00
Max-Wilhelm Bruker
9e044ffad0 more intuitive tapping behaviour 2009-06-30 20:50:16 +02:00
brukie
6a537979d0 added message shortcuts 2009-06-25 13:12:54 +02:00
Max-Wilhelm Bruker
c8a2ed9415 some changes 2009-06-20 13:26:36 +02:00
brukie
a246a8d561 double click on zones opens zone view 2009-06-17 18:05:17 +02:00
Max-Wilhelm Bruker
197bf0dc64 bla 2009-06-10 21:39:30 +02:00
Max-Wilhelm Bruker
7f659573bc unimportant changes 2009-06-10 21:17:24 +02:00
brukie
05e12636ea cleaned up log widget 2009-06-10 13:11:12 +02:00
Max-Wilhelm Bruker
13b6a360d2 minor fixes 2009-05-27 02:33:43 +02:00
Max-Wilhelm Bruker
175512a2ad nice ellipses :) 2009-05-23 01:58:11 +02:00
brukie
7e13352a95 minor cleanups 2009-05-22 22:32:05 +02:00
Max-Wilhelm Bruker
99ff7fd15f minor improvements 2009-04-14 19:18:46 +02:00
Max-Wilhelm Bruker
3388804e8f improved counters 2009-04-13 17:54:18 +02:00
Max-Wilhelm Bruker
a429a4a004 minor changes, implemented 'doesn't untap' and facedown cards 2009-04-07 21:37:57 +02:00
Max-Wilhelm Bruker
6e94221112 improved appearance 2009-03-25 17:02:44 +01:00
Max-Wilhelm Bruker
8782438fcc renamed playerzone to cardzone 2009-03-25 15:08:36 +01:00
Max-Wilhelm Bruker
a11f93df4d initial commit 2009-03-13 22:50:41 +01:00