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

319 commits

Author SHA1 Message Date
Fabio Bas
deec7cdc14 Avoid crash on dereferencing null pointer 2015-12-11 19:32:08 +01:00
marco
baa61d0571 Merge branch 'master' into Refactor-settings 
Conflicts:
	oracle/CMakeLists.txt
 2015-09-01 21:28:53 +02:00
Fabio Bas
5cfb034452 merged with master 2015-08-31 22:48:14 +02:00
marco
c8d59eec5e Refactred settings to use settingscache & ini files 2015-08-22 01:05:15 +02:00
marco
c6aba5a6d0 Renamed file + reduced window size + resfresh on change 2015-08-20 20:23:08 +02:00
marco
d3d6f70496 Removed 2nd arg from ShortcutsSettings::getShortcut 2015-08-16 21:53:59 +02:00
marco
beaa4e9383 Configurable shortcuts 2015-08-16 13:46:57 +02:00
marco
b0bf94e378 Shorcut read from settings 2015-08-09 12:16:52 +02:00
mildmongrel
ba50025e80 tablezone refactor and cleanup 2015-07-24 16:15:08 -07:00
Fabio Bas
68e176cc00 Add an option to annotate tokens from card text (default off); fix #241 2015-07-07 19:19:58 +02:00
Fizztastic
19bd6cc381 Adds Move To... Hand context menu for cards 2015-07-06 19:10:13 -04:00
Fabio Bas
f84d6fec1b Never send wrong row numbers 2015-06-25 15:39:03 +02:00
Fabio Bas
ed24b38add support <tablerow> for tokens; fix #232 2015-06-24 10:31:00 +02:00
Fabio Bas
6b8ebe54e9 Theme manager 
This is the first implementation of a theme manager. It’s a rebased and
revisited version of #792.
 2015-06-15 14:35:58 +02:00
Fabio Bas
8826908923 Automatically attach related cards to the original card 2015-06-13 15:40:59 +02:00
Fabio Bas
946598375f Expose related cards in card menu 2015-06-11 12:45:25 +02:00
ctrlaltca
25f444a5af Merge pull request #1051 from poixen/reveal_top_x 
Reveal top x cards
 2015-05-16 18:20:56 +02:00
Fabio Bas
2299fa1ac4 Add backward compatibility for new client on old servers 2015-05-15 18:18:25 +02:00
Matt Lowe
80e53b334e Connected die roll dlg to parent 
Die roll now has a logo as it is correctly connected to the parent.
 2015-05-08 20:36:31 +02:00
Matt Lowe
5dfef6215c Added punctuation mark 2015-05-06 14:19:01 +02:00
Matt Lowe
45d214aa19 Added deck size limit 
Updated to use the current deck size limit
 2015-05-04 16:21:59 +02:00
Matt Lowe
59c0834427 Reveal top x cards 
Updated reveal top card to reveal top x cards
Sometimes you want to reveal more than only the top 1 card.
 2015-05-04 10:49:49 +02:00
Fabio Bas
e649535211 Add "play top card face down" menu entry to library; fix #762 2015-04-27 23:02:45 +02:00
Matt Lowe
6fd5c4dd27 Only use local db if no pt is provided 
Addresses issue #1032

If a token is created with no p/t then the local db value will be passed
instead. If a value is provided then that will be used instead.
 2015-04-27 10:17:46 +02:00
Zach H
9be29641b0 apply QKeySequence & remove unnecessary tr 2015-04-14 17:17:01 -04:00
Matt Lowe
1b165bde4c Updated context menus 
+ added more separators
+ swapped some actions from lib menu (scry action now higher)
+ Added capital letters to words
 2015-04-12 22:36:48 +02:00
Matt Lowe
9689b8e56a Fixed token PT issue for #931 
The problem was that back when I added #336 I made it so that if YOU
didnt recive the PT of the token, then it would be fetched from your
tokens.xml, the issue is that we needed to send that value to the
server. The server sees it as a 0/0

This fix will send the PT from the tokens.xml if available.
 2015-04-10 13:26:38 +02:00
poixen
2356788289 Merge pull request #929 from poixen/reveal_top_card_shortcut 
Added shortcut to reveal top card or lib
 2015-04-10 10:33:04 +02:00
Matt Lowe
56cbae17ac added separator 
Felt like areas different to the current zone should be segregated.
 2015-04-09 14:44:29 +02:00
Matt Lowe
fbbeb12413 Added shortcut to reveal top card or lib 
+ Ctrl + N
 2015-04-08 13:09:00 +02:00
Matt Lowe
a082fbcfef Left hand justification 
Set to false by default, let me know if you think it should be true.

As all cards are played to the left of the screen this feels more
comfortable to use as you dont need to keep looking at different areas
of the screen.

Will auto rearrange when changed during game-play.
 2015-04-02 12:49:06 +02:00
Zach
5f05c0be91 Merge pull request #775 from Cockatrice/fix-331 
Cards played face down always go untapped to main row.
 2015-03-06 23:57:05 -05:00
Fabio Bas
a7b8934a1b Fix remaining issues 2015-02-22 20:02:58 +01:00
Gavin Bises
e423fb2a39 Readability tweak 2015-02-21 21:31:17 -05:00
Gavin Bises
779a400de4 Fix #331 2015-02-21 15:18:32 -05:00
Jeffrey Oliver
4bd161ab06 Put back the new action. 2015-02-11 20:31:00 -08:00
Jeffrey Oliver
5add56d850 Fixed up whitespace. 2015-02-11 20:25:34 -08:00
Jeffrey Oliver
cc32e8c86e Add a play face down context menu item when in the hand zone. 2015-02-10 22:58:32 -08:00
Jaeic Lee
bfc1bd04b5 Added separators 
Looks better imo.
 2015-01-27 09:54:11 +09:00
Jaeic Lee
c6800c48d2 More ellipsis 
Should be the last of them
 2015-01-27 03:32:58 +09:00
Jaeic Lee
46fb5f820e Tweaked some texts 
Per Daenyth’s request
 2015-01-27 03:14:52 +09:00
Jaeic Lee
cc14e3cfc6 Submenus for moving all cards in a zone to another 2015-01-25 11:34:51 +09:00
Zach
dac5726dab Merge pull request #504 from ctrlaltca/local_scry_and_move 
Specify the player when triggering a move on a revealed card
 2015-01-23 10:14:05 -05:00
Fabio Bas
0abd1fb299 Rework patch for "move to.." menu; fix "P/T"-related menus 2015-01-02 17:10:19 +01:00
Michael Callahan
142b42e095 Reset Always reveal top card when starting a new game. 2015-01-01 09:53:29 -07:00
Fabio Bas
ea1067189d Specify the player when triggering a move on a revealed card 
Fixes #72, #493
 2014-12-27 17:12:21 +01:00
Gavin Bisesi
19de7cbc03 Merge pull request #428 from woogerboy21/static_reveal_library 
Don't remove card images from revealed decks
 2014-11-25 08:41:08 -05:00
Matt Lowe
a2c4a1e537 Action: Move Bottom Card to Graveyard 
Created menu action to move card from the bottom of the library to the
graveyard. Qt accelerator key is "i". #125
 2014-11-15 16:35:30 +01:00
woogerboy21
6811819161 Don't remove card images from revealed decks 
Revealed library had write access, which meant that the user would see cards being removed from the zone as the other player drew cards. The cards were not the actual ones drawn, just the ones at the same index, so no information was leaked.

Fix #297
 2014-11-13 20:31:55 -05:00
Matt Lowe
e3a94ecca3 Token PT is now set to DB values if not defined in event. 2014-10-01 19:20:42 +02:00
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