aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
540 commits 1 branch 0 tags 51 MiB
Commit graph

440 commits

Author SHA1 Message Date
Max-Wilhelm Bruker
4d0c9962f4 phase toolbar fixed 2010-09-07 02:03:54 +02:00
Max-Wilhelm Bruker
0b98d90337 search function couldn't find colorless cards: fixed 2010-08-27 22:48:35 +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
58e803c3e7 new files 2010-08-04 13:57:13 +02:00
Max-Wilhelm Bruker
7921b5f82d initial commit of local server code 2010-08-04 13:56:51 +02:00
Max-Wilhelm Bruker
cbfbc542e7 disallow dropping a card onto another 2010-07-17 23:37:22 +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
9a44413e16 Merge branch 'foo' 2010-06-19 18:20:16 +02:00
Max-Wilhelm Bruker
4f13c01e12 mac patches 2010-06-19 18:18:04 +02:00
Max-Wilhelm Bruker
50ae101fd7 crash fix 2010-06-19 14:34:25 +02:00
Max-Wilhelm Bruker
ae41194e4b forgot to add some files :) 2010-06-18 21:15:19 +02:00
Max-Wilhelm Bruker
df4af668a5 translation 2010-06-18 21:11:36 +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
9f79bd2c8e nicer looking counters on cards 2010-06-17 21:54:05 +02:00
Max-Wilhelm Bruker
f33abf14ca proper pixmap caching for hand counter 2010-06-17 20:24:11 +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
579628b4c4 save deck to clipboard 2010-06-06 16:06:38 +02:00
Max-Wilhelm Bruker
37de620e93 deck view lock bug fix 2010-06-05 15:26:26 +02:00
Max-Wilhelm Bruker
0d16b3fa95 start game bugfix 2010-06-05 01:37:14 +02:00
Max-Wilhelm Bruker
7c5d18e219 translation update 2010-06-03 17:49:57 +02:00
Max-Wilhelm Bruker
e0c1932373 close feature request 0000018 2010-06-03 17:46:27 +02:00
Max-Wilhelm Bruker
41c4603fe9 This closes feature request 0000020. Attention, this breaks protocol compatibility. 2010-06-03 02:29:48 +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
ac15d1b5e8 spectator leave bugfix 2010-05-28 16:47:08 +02:00
Max-Wilhelm Bruker
ca12aeb5a7 load deck from clipboard; closing feature request 0000019 2010-05-28 16:41:59 +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
0d63bb7316 changed some phase button icons 2010-05-10 18:05:04 +02:00
Max-Wilhelm Bruker
93e31aeab8 translation update; windows installer code 2010-05-08 23:50:58 +02:00
Max-Wilhelm Bruker
40fc77c646 oracle importer changes 2010-05-08 23:24:35 +02:00
Max-Wilhelm Bruker
03132e2edd app icons for mac and windows 2010-05-08 17:15:40 +02:00
Max-Wilhelm Bruker
bda9768b1d qt 4.5 compile fix 2010-04-21 22:41:52 +02:00
Max-Wilhelm Bruker
cb045907cb minor fixes; ROE set added 2010-04-16 16:15:27 +02:00
Max-Wilhelm Bruker
57aa30ffb5 Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice 2010-04-08 17:18:24 +02:00
Max-Wilhelm Bruker
91a74abca8 rewrote picture downloader 2010-04-08 17:18:13 +02:00
Max-Wilhelm Bruker
e3021d2c5c minor qt 4.5 fix 2010-04-04 13:25:19 +02:00
Max-Wilhelm Bruker
7afb866961 confirmation dialog when closing main window with open games 2010-04-01 15:54:51 +02:00
Max-Wilhelm Bruker
266e7376db minor arrow fix 2010-03-10 16:42:49 +01:00
Max-Wilhelm Bruker
cb74c734f2 cleanup 2010-03-09 17:53:34 +01:00
Max-Wilhelm Bruker
929f4f9b4d cleanup 2010-03-09 14:43:06 +01:00
Max-Wilhelm Bruker
15aa6a600a crash fix 2010-03-09 14:12:15 +01:00
Max-Wilhelm Bruker
f06af8be43 new icon 2010-03-08 21:24:41 +01:00
Max-Wilhelm Bruker
4bf4bbea6a some fixes 2010-03-08 20:17:48 +01:00
Max-Wilhelm Bruker
d1a8b6602b arrow fix 2010-03-08 16:36:00 +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
2c9a8c2b57 minor cleanups and optimizations 2010-03-06 22:10:50 +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
30df81c518 bla 2010-03-05 17:48:36 +01:00
Max-Wilhelm Bruker
1232136730 Merge branch 'testing' of ssh://cockatrice.de/home/cockgit/cockatrice into testing 2010-03-04 19:16:04 +01:00
Max-Wilhelm Bruker
aab16cbd96 added icon 2010-03-04 19:15:45 +01:00
Max-Wilhelm Bruker
0db3ff6819 updated icon; small bugfix 2010-03-04 17:39:38 +01:00
Max-Wilhelm Bruker
5fa63e553d added icons 2010-03-04 16:55:48 +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
388e9255c7 cipt code 2010-03-01 21:19:20 +01:00
Max-Wilhelm Bruker
888a64b0fd new protocol code 2010-02-26 17:28:02 +01:00
Max-Wilhelm Bruker
ba8d40211c Almost full Qt 4.6 compatibility. Sorry it took so long. 2010-02-24 18:21:48 +01:00
Max-Wilhelm Bruker
89fe7d2d69 more beautiful arrows; fixed server bug regarding facedown cards 2010-02-24 14:43:18 +01:00
Max-Wilhelm Bruker
2d57715a6e minor improvement 2010-02-05 16:33:12 +01:00
Max-Wilhelm Bruker
70594387de tab modified indicator 2010-02-05 13:36:00 +01:00
Max-Wilhelm Bruker
5d6652f5de translation fix 2010-02-04 17:35:19 +01:00
Max-Wilhelm Bruker
c6596aab19 translation fix 2010-02-04 16:33:36 +01:00
Max-Wilhelm Bruker
3d5ba34aaf translation fix; minor improvement 2010-02-04 16:25:38 +01:00
Max-Wilhelm Bruker
9c4264b491 fixed server crash bug 2010-01-18 13:11:18 +01:00
Max-Wilhelm Bruker
ddd58d6736 crash fix 2009-12-21 15:23:22 +01:00
Max-Wilhelm Bruker
405a247c2c updated german translation 2009-12-20 16:55:19 +01:00
Max-Wilhelm Bruker
b4f80a80ef added icons 2009-12-20 16:44:10 +01:00
Max-Wilhelm Bruker
42531d90e9 initial commit for card search dialog 2009-12-20 16:39:26 +01:00
Max-Wilhelm Bruker
324be6b40c reverted card search to initial behaviour 2009-12-20 15:17:45 +01:00
Max-Wilhelm Bruker
ffe85962b8 reverted deck editor column resizing 2009-12-20 14:24:52 +01:00
Max-Wilhelm Bruker
06de6b1a6c some minor bug fixes; disallow deck storage commands to unauthenticated users 2009-12-19 22:40:34 +01:00
Max-Wilhelm Bruker
3776b24006 updated icon 2009-12-19 20:51:22 +01:00
Max-Wilhelm Bruker
e0c7df1694 deck list editing in deck storage tab; mouse hover event for deck view 2009-12-19 20:34:33 +01:00
Max-Wilhelm Bruker
d23ece59ea crash fixes; move_card fixes 2009-12-18 19:03:02 +01:00
Max-Wilhelm Bruker
2aa5c7eb3c bugfix 2009-12-15 17:19:49 +01:00
Max-Wilhelm Bruker
564ae4db84 some cleanups and fixes 2009-12-15 16:48:14 +01:00
Max-Wilhelm Bruker
6ba2e98315 game view should not get keyboard focus 2009-12-09 16:17:53 +01:00
Max-Wilhelm Bruker
86cd3ec5be eventMoveCard related bug fix 2009-12-08 01:03:10 +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
bf92ef87da new server deck folder display 2009-12-03 18:43:43 +01:00
Max-Wilhelm Bruker
fb61b442ca some (but not all) compatibility changes for qt 4.6 2009-12-02 22:48:19 +01:00
Max-Wilhelm Bruker
78c1851c52 implemented conceding 2009-12-01 17:26:42 +01:00
Max-Wilhelm Bruker
207d10d3e2 XML fix 2009-12-01 10:43:46 +01:00
Max-Wilhelm Bruker
59e9416f57 blah 2009-11-30 19:33:45 +01:00
Max-Wilhelm Bruker
55482246dd zone view works 2009-11-29 03:35:55 +01:00
Max-Wilhelm Bruker
694070724c restructured protocol code 2009-11-29 03:07:28 +01:00
Max-Wilhelm Bruker
122f8ea916 game menu 2009-11-28 18:35:48 +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
6c93b1e9b7 ping time display is working again 2009-11-22 14:41:02 +01:00
Max-Wilhelm Bruker
4fac0e5b5a remote deck loading finished 2009-11-22 14:24:01 +01:00
Max-Wilhelm Bruker
cf21528a69 almost finished pre-game deck loading 2009-11-22 01:30:16 +01:00
Max-Wilhelm Bruker
8dcf81654e decklist transfer code 2009-11-22 00:34:31 +01:00
Max-Wilhelm Bruker
63f9206eb4 fixed icon 2009-11-20 21:15:50 +01:00
Max-Wilhelm Bruker
c1d295a98b visual improvements 2009-11-20 15:53:56 +01:00
Max-Wilhelm Bruker
ef46d6e863 deck list storage completed 2009-11-20 15:22:56 +01:00
Max-Wilhelm Bruker
f31405743e initial commit for deck repository tab 2009-11-19 17:12:44 +01:00
Max-Wilhelm Bruker
d3114fafbf decklist transfer code 2009-11-18 19:59:03 +01:00
Max-Wilhelm Bruker
c5bf72b1bf decklist moved to common 2009-11-18 18:15:16 +01:00
Max-Wilhelm Bruker
fdf921e718 initial commit for improved deck list submission 2009-11-17 17:11:50 +01:00
Max-Wilhelm Bruker
34d2649f65 prepared deck list code to be moved out to common 2009-11-16 23:58:07 +01:00
Max-Wilhelm Bruker
77f5ec29eb some gui code 2009-11-16 17:18:13 +01:00
Max-Wilhelm Bruker
ace4c37726 removed some old code 2009-11-13 18:31:27 +01:00
Max-Wilhelm Bruker
64aa68cd26 Chat works! 2009-11-13 18:27:06 +01:00
Max-Wilhelm Bruker
1baa188067 more 2009-11-12 17:32:20 +01:00
Max-Wilhelm Bruker
c46ef255a1 some client code 2009-11-12 17:04:06 +01:00
Max-Wilhelm Bruker
cb0e4d07e4 everything compiles again; enough for today 2009-11-12 00:09:24 +01:00
Max-Wilhelm Bruker
1d6923f2a2 game events 2009-10-26 18:13:30 +01:00
Max-Wilhelm Bruker
3d1052f54c path fix 2009-10-22 18:25:07 +02:00
Max-Wilhelm Bruker
8a919e572f ctrl+r: remove all local arrows 2009-10-21 11:10:21 +02: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
Max-Wilhelm Bruker
43d516672a fix typo; don't point from an item to itself 2009-10-19 21:30:58 +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
30079a71ff card picture fix 2009-10-18 00:57:51 +02:00
Max-Wilhelm Bruker
af3b951faf translation 2009-10-18 00:03:48 +02:00
Max-Wilhelm Bruker
867a27ecd4 Arrows 2009-10-17 23:55:31 +02:00
Max-Wilhelm Bruker
fd4b388975 prettier ping widget 2009-10-17 20:59:34 +02:00
Max-Wilhelm Bruker
b8690627c8 raised server timeout, added ping widget 2009-10-17 18:29:30 +02:00
Max-Wilhelm Bruker
3c8f2b878b improved importer 2009-10-17 17:13:55 +02:00
Max-Wilhelm Bruker
aae2c437d6 better keyboard editing in deck editor 2009-10-14 11:16:39 +02:00
Max-Wilhelm Bruker
603555af4a prettier tool buttons 2009-10-14 10:56:13 +02:00
marcus
381bd4dfce icons bla... 2009-10-13 22:39:19 +02:00
marcus
6e5c859b3b Deckeditor icon colorfix 2009-10-13 22:32:07 +02:00
marcus
0c16a90fa2 new Icons for Deckeditor 2009-10-13 21:47:44 +02:00
marcus
8a9726482f qrc file updated 2009-10-13 21:24:23 +02:00
marcus
84fc11f69a Deckeditor Icons added 2009-10-13 20:58:56 +02:00
Max-Wilhelm Bruker
df8c01992b fixed card picture download 2009-10-13 14:31:32 +02:00
Max-Wilhelm Bruker
ae6803f9f2 rewrote oracle importer 2009-10-13 01:06:48 +02:00
Max-Wilhelm Bruker
841b91bc89 deck editor improvement 2009-10-12 15:46:45 +02:00
Max-Wilhelm Bruker
9f35340188 bugfix 2009-10-03 02:47:17 +02:00