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

286 commits

Author SHA1 Message Date
tooomm
cbd9d2c4fc better wording (#2674) 2017-04-29 22:15:43 -04:00
Zach H
12c9e4b81a allow placement below top X cards (#2666) 
Close #2666
 2017-04-27 20:32:24 -04:00
Zach H
7c1a18da5e Add "Random card from graveyard" (#2652) 2017-04-26 18:12:56 -04:00
Zach H
0da2bdd7aa additional null checks in player, gameselector, remoteclient, log (#2514) 2017-03-19 12:55:55 -04:00
Zach H
fb194db766 additional null checks & parsing (#2506) 
* additional null checks & parsing
 2017-03-18 18:48:23 -04:00
Zach H
bd850fa3ff create related token if you press the 'Token:' button (#2455) 
* create related token if you press the 'Token:' button

* function set
 2017-03-12 11:51:59 +01:00
Zach H
cf08d1d267 Revert "Condensed Card Counter Context Menu" (#2433) 2017-03-02 17:47:15 -05:00
Mark McDonald
b9cd942308 Add keybaord shortcut for creating related cards (#2426) 
* Extract createCard from actCreateRelatedCard

* Merge related cards and reverse related cards before handling

* Add "Create all related cards" action to a card

* Stop displaying all related tokens if only one token is available

* Add shortcut for Creating all tokens related to selected card

* Extract method for adding related card actions

* Prefer foreach to index based iteration

* Guard against null cards, card menus, or cardInfos

* Remove QRegExp dependency from commonly depended header
 2017-02-27 08:50:10 +01:00
poixen
2d216807c7 Condensed counter menu 2017-01-06 19:07:31 +01:00
Zach H
3d0600b516 Tokens in sub menu (#2320) 2016-12-17 13:05:29 -05:00
Fabio Bas
bb5292aa8d Drop Qt4, libgcrypt, qtmobility dependencies 2016-05-11 12:45:58 +02:00
Fabio Bas
1e3fb6c6e1 Rework "paths" settings loading and card database loading 
* main.cpp: removed path checking and db loading
 * card database: merge card loading methods into a single one
 * settings cache: take care of returning safe paths for decks,
replays, etc..
 * main window: if db loading fails (eg. first run), propose to run
oracle

NSIS: propose to run cockatrice instead of oracle

Rework card database loading

 * Move carddatabase-related method out of deckeditor tab
 * Load cards in another thread and render them progressively
 * Optimize database reload after enabled sets change

Fix deck editor column width

 * removed the noCard hack.
 * getCard() no more creates cards instead of just returning existing
ones
 * Fix the “edit tokens” dialog.
 * PictureLoader: avoid trying to download twice the same card
 * PictureLoader: correct return of card background
 * AbstractCardItem: avoid recalculating card color at every paint

Use a different file to save custom tokens

Misc required improvements

 * Use nullptr;
 * Refactor CardInfoWidget to use CardInfoPicture and CardInfoText
instead of duplicating code;
 * Added CardInfo::getColorChar()
 * Fixed some potential crashes
 * removed dead code related to CardInfoWidget
 * Don't require a restart after adding a new custom sets file
 * Bump CMake requirements to 3.1
 2016-03-15 22:27:55 +01:00
Zach H
e0a25e74ac fix merge issues 2015-12-30 11:54:30 -05:00
Zach H
f568a4e865 todo 2015-12-30 11:51:53 -05:00
Zach H
703ff7905c token coordinates 2015-12-29 23:43:03 -05:00
Zach H
da0e3292d3 Token PT shown in create related dialog 2015-12-29 18:28:41 -05:00
Fabio Bas
4b1c59424e Implement reverse-related tag for cards 2015-12-26 19:57:20 +01:00
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