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

1235 commits

Author SHA1 Message Date
Matt Lowe
2193d247d0 Improved card animation performance 
+ Cards now animate smoother and faster
+ removed redundant computations performed each frame
 2014-10-16 18:06:30 +02:00
Matt Lowe
dc58d1a61e Shortened animation time between phases 
+ changed from 50ms to 25ms between update calls.
 2014-10-16 18:05:49 +02:00
Matt Lowe
03f79887c4 Updated Hand image 
Looking at the client I saw the cockatrice was still on the card back. I
have now removed it.
 2014-10-14 22:43:14 +02:00
Fabio Bas
e0d76b60d0 Change button label and made it translatable 2014-10-14 22:02:42 +02:00
Fabio Bas
82a3deec30 Add a button in the sounds settings to play a test sound 2014-10-14 21:13:16 +02:00
Fabio Bas
9ef4d79c33 Install the audio/* plugins under windows and osx 2014-10-14 21:13:04 +02:00
Gavin Bisesi
8dbb2d8e6f Merge pull request #364 from ctrlaltca/win32_openssl_cmake 
Deploy openssl libraries under win32
 2014-10-14 14:03:32 -04:00
Gavin Bisesi
a26d4078cc Revert "Find cards by prefix" 2014-10-14 11:28:30 -04:00
Zack
2c74524f59 fix: missing message closing tag 2014-10-12 16:43:35 +02:00
Matt Lowe
299283aa2e Resource cleanup 
Removed some unused resource files.
 2014-10-10 23:00:05 +02:00
Fabio Bas
dfb8be79cf Fix installation of libeay32.dll, ssleay32.dll while compiling the PACKAGE target 2014-10-10 17:22:29 +02:00
Zack
9169d3a804 fix: conflicts && add: new translation 2014-10-10 14:56:05 +02:00
Fabio Bas
6f25e09132 Deploy openssl libraries under win32 
They are needed to fetch prices from deckbrew and possibly, in the
future, for ssl server connections
 2014-10-10 14:12:30 +02:00
Gavin Bisesi
6810ae46d6 Merge pull request #260 from Mawu3n4/master 
Find cards by prefix
 2014-10-09 11:29:02 -04:00
Gavin Bisesi
4070ba8e26 Merge pull request #352 from poixen/image-refresh 
Image refresh
 2014-10-09 11:27:47 -04:00
Gavin Bisesi
006451f402 Merge pull request #238 from arxanas/no-overwrite-tokens-xml 
Fix #231: tokens.xml no longer overwritten by cards.xml.
 2014-10-06 11:34:58 -04:00
Matt Lowe
e240e47d2f Fixed svg for icon 
For some reason there was an issue with making the creature image white,
i found a workaround. Icon should now display correctly.
 2014-10-03 19:02:40 +02:00
Matt Lowe
7cdd2a26f6 Icon changes 
+ added updated mac icon that was missing
~ resized cockatrice.png
 2014-10-03 19:02:27 +02:00
Matt Lowe
294edb3295 Logo and card back refresh 
~ Updated the back of the card, cleaner lines, slightly more modern.
~ Updated game icon/logo
 2014-10-03 19:02:12 +02:00
Gavin Bisesi
277aba79dc Merge pull request #336 from poixen/master 
Tokens use PT levels from cards.xml if available
 2014-10-02 15:00:17 -04:00
Antony Woods
1f58f7d848 Changed 'value' to 'setValue' on line 275 2014-10-02 08:48:04 +01:00
Gavin Bisesi
b32aeb2211 Merge pull request #280 from pliu037/remove-.full-req 
Support images without .full suffix
 2014-10-01 13:50:02 -04: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
Gavin Bisesi
7eed007f14 Merge pull request #281 from ctrlaltca/fix_202 
Fix crash #202
 2014-09-30 20:35:11 -04: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
Fabio Bas
eaad8de8d0 Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers 2014-09-29 18:25:10 +02:00
Gavin Bisesi
b5de708756 Merge pull request #289 from acron0/auto-connect 
Added 'auto connect' checkbox to connect dialog.
 2014-09-29 10:24:06 -04:00
Jan Martin
6f97e59c03 Change default scry to 1. 2014-09-19 21:41:57 +10:00
Zack Dibe
8928a699f9 fix: grammar in french translation 2014-09-11 23:44:52 +02:00
Mawu3n4
54e3867c72 finish fr translation 2014-09-11 15:18:40 +02:00
Mawu3n4
466f5ae5e1 add: FR translations and fix bad grammar 2014-09-11 15:17:35 +02:00
Yuki Izumi
fefb6fc612 Add sideboard helpers. 2014-09-11 12:56:27 +10:00
Antony Woods
f1b012c83d Adding modified translation files 2014-09-09 17:30:37 +01:00
Antony Woods
dbe46084ac Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect 2014-09-09 17:22:55 +01:00
Fabio Bas
d6b97976f9 Refreshed all translation files 2014-09-06 10:40:23 +02:00
Fabio Bas
a0b35ee60b Cockatrice - CMake: Include all existing translation files using a glob 2014-09-06 10:38:59 +02:00
Fabio Bas
e5eda9f172 Add a UPDATE_TRANSLATIONS options that actually updates translations! 2014-09-04 16:15:01 +02:00
Antony Woods
ab83d6185a Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog 2014-08-29 16:53:30 +01:00
Antony Woods
b381298981 Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point. 2014-08-27 21:25:11 +01:00
James Turner
f06d2123fc Remove invalid character 2014-08-19 17:39:05 -04:00
Peng Liu
a83e6cdf48 Removed unused variable, bool stripped, from classes and functions. 2014-08-11 13:47:47 -04:00
Gavin Bisesi
134810b979 Merge pull request #279 from ctrlaltca/valgrind_unified 
Fixed Valgrind warnings
 2014-08-11 09:11:12 -04:00
Fabio Bas
23a3b8364c Merge remote-tracking branch 'upstream/master' into fix_202 2014-08-11 15:07:43 +02:00
Gavin Bisesi
5c46cfc169 Merge pull request #179 from woogerboy21/registered-user-only-server 
Registered Only Server
 2014-08-11 09:03:57 -04:00
Fabio Bas
484a6e8bdc Fix crash #202 2014-08-11 10:50:55 +02:00
Peng Liu
781460d6ac Cockatrice can now load images both with and without .full. Will need to clean-up bool stripped (used to determine .full suffix inclusion). 2014-08-11 04:37:00 -04:00
Fabio Bas
1da2e7154c Fixed Valgrind warnings 
Running cockatrice in valgrind i didn't found any bad memory leak
(good!), but only a few jumps depending on uninitialized variables.
Even if the possibility of crashes are remote, it's nice to sort them
out.
 2014-08-11 10:08:33 +02:00
Gavin Bisesi
8b32a1010a Merge pull request #265 from pliu037/clear-downloaded-pics 
Clear downloaded images from settings
 2014-08-10 13:34:14 -04:00
Mawu3n4
d55f6fdec1 fix: show card only found once by prefix 2014-08-08 14:24:29 +02:00
Daenyth
765e865aa2 Continue downloading card images after failing url on one. 
I should probably bust this out to a method.
 2014-08-08 09:33:38 +02:00
Daenyth
42f1c6938f Merged: First draft of better pic url error handling 
Cherry-picked b9cb61abd05f83c67740aafa5e1e6939143547e4
 2014-08-08 09:33:35 +02:00
Fabio Bas
bba8184d37 Fix off by one 2014-08-07 23:14:57 +02:00
Fabio Bas
88dfea8ece Don't save card pictures if we don't have a proper set name for it 2014-08-07 23:14:50 +02:00
Fabio Bas
3bce98e3a9 Fix crashes trying to load the picture of a card with no <set> 2014-08-07 23:14:41 +02:00
Peng Liu
d3459aabf9 Moved the button from the paths section to be below the "Download high-quality card pictures" checkbox. Button now reads "Reset/Clear Downloaded Pictures". Removed "Path to"s from card/token database, hand/stack/table/player info background, and card back labels. 2014-08-07 14:35:18 -04:00
Peng Liu
ae80752497 Added notification messages informing users of the success or failure of clearing downloaded images. 2014-08-07 14:00:59 -04:00
Waleed Khan
ffc5b59fec Fix #258: Dashes to spaces. 2014-08-07 12:29:20 -04:00
Peng Liu
674005383b Added a button and the functionality to clear all downloaded images (all images within subfolders at picsPath/downloadedPics) under Settings. 2014-08-07 12:09:42 -04:00
Mawu3n4
10ab53c4ac fix: find by prefix if card not found only 2014-08-07 17:43:14 +02:00
Waleed Khan
c0d4669088 Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml 
Conflicts:
	cockatrice/src/carddatabase.cpp
 2014-08-07 11:06:41 -04:00
Dibe Zackaria
9092f2298b fix: remove auto 2014-08-06 20:27:04 +02:00
Dibe Zackaria
e8abd6eb63 fix: typo 2014-08-06 20:13:59 +02:00
Mawu3n4
7d190ddaf7 fix: pushed old version 2014-08-06 18:01:47 +02:00
Mawu3n4
621a47de9c add: find token cards by prefix 2014-08-06 17:54:47 +02:00
Gavin Bisesi
ef1fbc0db9 Merge pull request #256 from pliu037/handle-PNGs-2 
Handle PNGs (and other image formats)
 2014-08-06 10:42:15 -04:00
Fabio Bas
6502a182e8 Support loading of files with wrong extension 
Like M15’s .png that cockatrice wrongly saved as .jpg
Additionally, move the QImageReader declaration outside of the inner
loop
 2014-08-06 09:31:22 +02:00
Peng Liu
4bb1d28ae7 Removed the QLists for determining image format. Instead, using QImageReader, both when downloading/saving and when loading, to determine the correct format (Cockatrice now supports all QImageReader-supported formats). 
Image loading still uses one for loop to iterate through the QList of paths to folders in which to search for images.
 2014-08-05 14:54:40 -04:00
Peng Liu
8587b8c349 Refactored the magic bytes into two QLists: one containing a list of QStrings representing the supported extensions, the other containing a list of QByteArrays representing the magic bytes in hex. 
Refactored the image loading loop to be two nested for loops: the outer loop iterating through the QList of paths to folders in which to search for images and the inner loop iterating through the QList of supported extensions.
 2014-08-05 03:48:30 -04:00
Peng Liu
75122c3c9d Switched back to using QFile instead of QImage for saving as QImage's save function adds overhead to the file size, leaving me unsure whether the original image is affected. 2014-08-04 17:01:58 -04:00
Peng Liu
387086cb4c Added support for PNG images (both for downloading/saving and loading). 2014-08-04 16:43:57 -04:00
Fabio Bas
3667ab504c Fix compilation warning introduced in #246 
/cockatrice/src/main.cpp:162:16: warning: format string is not a string
literal (potentially insecure) [-Wformat-security]
        qDebug("Could not create " +
settingsCache->getPicsPath().toUtf8() + "/CUSTOM. Will fall back on
default card images.");
 2014-08-04 20:09:53 +02:00
Gavin Bisesi
8d482245ff Merge pull request #251 from arxanas/case-insensitive-tokens 
Fix #248: the token dialog generates cards irrespective of their case and punctuation
 2014-08-04 10:50:25 -04:00
Peng Liu
a9eaf65a82 Changed .toLatin1() to .toUtf8(). 2014-08-02 23:44:31 -04: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
Peng Liu
b3fa99ef36 I was too hasty and forgot a + and to toLatin1() a QString in the qDebug arg. 2014-07-31 23:24:25 -04:00
Peng Liu
077d9f2745 Checks if CUSTOM folder was successfully created. If not, prints qDebug message and proceeds as normal except uses default card images instead of custom ones. 2014-07-31 22:42:13 -04:00
Gavin Bisesi
ffed0e00fe Merge pull request #214 from pliu037/master 
Added better support for custom card images
 2014-07-31 13:42:57 -04:00
Gavin Bisesi
ca6bd669ce Merge pull request #233 from ctrlaltca/regression_card_picurl 
Add back support for custom picture urls in cards.xml
 2014-07-31 11:30:26 -04:00
Gavin Bisesi
7d5ce6f0ef Merge pull request #235 from ctrlaltca/offline_users_menu 
Disable some usercontextmenu actions if the user is offline; fix #234
 2014-07-30 15:49:43 -04:00
Gavin Bisesi
1e5a00d100 Merge pull request #228 from ctrlaltca/error_suppression 
Fix building with debug
 2014-07-30 15:44:08 -04:00
Waleed Khan
9ba5d7968e Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml. 2014-07-29 23:46:04 -04:00
Waleed Khan
8df7e9f164 Fix #231: tokens.xml no longer overwritten by cards.xml. 2014-07-27 20:55:47 -04:00
Fabio Bas
9e12c5b2d4 Use custom picUrl if picUrlHq is not defined 2014-07-27 22:06:35 +02:00
Fabio Bas
6b9daf3d15 Enable Show this user's games" for offline users 2014-07-27 21:29:27 +02:00
pliu037
c3a68fcbd3 Cleaned up some lines of code 2014-07-27 12:47:05 -04:00
Waleed Khan
689acc1e32 Fix #110: Price column is removed when the setting is disabled. 2014-07-26 21:13:30 -04:00
Fabio Bas
fe12f71b93 Disable some usercontextmenu actions if the user is offline; fix #234 2014-07-27 00:29:23 +02:00
Fabio Bas
aa225f8df7 Add back support for custom picture urls in cards.xml 2014-07-26 23:36:51 +02:00
Waleed Khan
fe9f7a22b1 Fix issue mentioned in #152: price updater loads all cards now. 2014-07-24 19:53:05 -04:00
Fabio Bas
3fda31073f Declare useless virtual dtor for polymorphic classes 2014-07-24 18:54:45 +02:00
Fabio Bas
0f501762e0 Reorder items initialization to match the order in class declaration 2014-07-24 18:44:19 +02:00
Fabio Bas
bd97d7b933 Fix signed/unsigned comparision 2014-07-24 18:40:25 +02:00
Fabio Bas
d9577f0d6c Hide unused parameters in cockatrice/ to avoid warnings 2014-07-24 18:27:02 +02:00
Fabio Bas
f32a999b4e Remove unused variable 2014-07-24 15:38:36 +02:00
Gavin Bisesi
abdaa610ee Merge pull request #152 from ctrlaltca/master_feature_prices 
Add pricing from deckbrew.com (refs #147)
 2014-07-24 07:45:37 -04:00
Fabio Bas
49b3568b53 small fix: moving the url length check in the inner loop 2014-07-23 23:10:48 +02:00
Fabio Bas
b40abfa1ad Split price retrieval on multiple request 2014-07-23 23:00:58 +02:00
Fabio Bas
bf92e67002 Ensure the whole table gets refreshed when updating prices 2014-07-23 22:11:26 +02:00
Gavin Bisesi
a8031321c6 Merge pull request #226 from arxanas/deckstats-multiple-cards 
Fix #225: Multiples of cards are now sent to deckstats.
 2014-07-23 15:38:09 -04:00
Fabio Bas
b0ee2e6d4b Merge branch 'master' into master_feature_prices 2014-07-23 21:37:37 +02:00
Waleed Khan
68ac8d1a33 Fix #225: Multiples of cards are now sent to deckstats. 2014-07-23 15:21:46 -04:00
Gavin Bisesi
a50e7ba936 Merge pull request #156 from arxanas/master 
Fix #45: don't send tokens to deckstats.
 2014-07-23 08:41:15 -04:00
Waleed Khan
40e97140d6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	cockatrice/src/carddatabase.cpp
 2014-07-23 00:49:13 -04:00
Waleed Khan
2a5aa06881 Æ now actually works with the case-insensitive tags. 2014-07-22 20:58:38 -04:00
Waleed Khan
aff32e0f56 Ignore diacritics as well. 
So [card]jotun grunt[/card] works as well as [card]Jötun Grunt[/card].
Also I removed some debugging information I accidentally left in.
 2014-07-20 21:20:50 -04:00
Waleed Khan
e5be082714 Merge remote-tracking branch 'upstream/master' into case-insensitive-card-tag 2014-07-20 15:06:51 -04:00
Waleed Khan
359882917a Merge remote-tracking branch 'upstream/master' 
Some tabs to spaces, and maybe fixed to work with Qt 5.

Conflicts:
	cockatrice/src/deckstats_interface.cpp
	common/decklist.cpp
	common/decklist.h
	oracle/src/oracleimporter.cpp
 2014-07-20 14:40:18 -04:00
woogerboy21
021f0911c4 Merge remote-tracking branch 'upstream/master' into registered-user-only-server 
Conflicts:
	common/server.cpp
	common/server_protocolhandler.cpp
	servatrice/src/servatrice.cpp
 2014-07-18 23:46:56 -04:00
Fabio Bas
534b223545 Merge remote-tracking branch 'upstream/master' into master_regression_180_tab 2014-07-10 19:50:38 +02:00
Fabio Bas
b5d8e7da10 Merge remote-tracking branch 'upstream/master' into master_feature_prices 2014-07-10 19:48:50 +02:00
Gavin Bisesi
f83d58309b Merge pull request #126 from ctrlaltca/cmake_qt5 
Qt5 support
 2014-07-10 13:13:51 -04:00
Gavin Bisesi
86fa8f304d Change client send-ping timer back to 1sec 
9sec was causing too many timeout issues.

Timeout from both client and server perspective needs to be revisited
 2014-07-09 19:06:31 -04:00
Fabio Bas
ea8c55b2c9 Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-07-09 17:44:21 +02:00
Fabio Bas
a6f299b247 fix #203 2014-07-09 17:42:35 +02:00
Fabio Bas
106e9d1538 Updated for new API 
* Use the new, shortest API m=
 * for a card, grab prices for all sets
 * use the lower price for a card from all sets, but avoid prices=0
(e.g.: some M15 cards have no price yet)
 2014-07-09 09:43:35 +02:00
pliu037
1a601d9509 Added better support for custom card images by prioritizing a check for card images in <Pictures path>/<CUSTOM> before all other checks. 2014-07-08 16:24:51 -04:00
Gavin Bisesi
73e5e12c24 Merge pull request #199 from arxanas/remember-game-filter-preferences 
Fix #137: Game filter preferences are saved.
 2014-07-08 12:49:45 -04:00
arxanas
1217689ed6 Hash the game type. 2014-07-07 19:04:01 -04:00
arxanas
8141901679 Fix #137: Game filter preferences are saved. 2014-07-07 17:41:16 -04:00
arxanas
810029ce15 Fix #117: Card tags now match disregarding case and punctuation. 2014-07-06 20:04:09 -04:00
Fabio Bas
aead0843af Room and Message tabs: focus input line when convenient; Fix #180 
As suggest by Daenyth in #185
 2014-07-06 14:28:48 +02:00
Fabio Bas
e9895d643f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-07-03 16:40:04 +02:00
Gavin Bisesi
7f77082466 Merge pull request #151 from ctrlaltca/master_input_focus 
Focus the Input line in chat when convenient (fixes #113)
 2014-07-03 10:34:21 -04:00
Fabio Bas
6f18e3692d Chat room: ensure the line input has focus when the window gets created 2014-07-03 15:57:40 +02:00
woogerboy21
00ec84db2a Stale Comment Removal 
Removed stale commented lines from about window code.
 2014-07-02 23:30:12 -04:00
woogerboy21
0a1fe7f5a8 Requested Cleanup 
Corrected tab to 4 space (per request)
Moved regonly option under authentication ini location (per request)
 2014-07-02 22:27:05 -04:00
woogerboy21
d246fa39fe Registered Only Server 
Implemented the ability to set the server to only allow registered
users.  Also updated client to reflect the log-in rejection as well as
put a check in place for the server to not start if db connection is not
available yet registration is required.
 2014-07-02 20:52:22 -04:00
Fabio Bas
06def7f46a Ensure all card prices are retrieved correctly 
Query card database to get a multiverseis for a card.
Get card price using that id instead of card name.
Tested Aether, split cards, question elemental?, _____
 2014-07-02 21:42:29 +02:00
Fabio Bas
d102733826 Added default cases to switch 2014-07-02 21:42:17 +02:00
Fabio Bas
9ca5908de5 Create an enum for price sources 
Probably settingscache would have been the correct place for the enum,
but keeping it in the same class/file where price sources are defined
sounds cleaner to me
 2014-07-02 21:42:04 +02:00
Fabio Bas
a9ffbf5d2d use a signal instead of calling QMetaObject::invokeMethod 2014-07-02 21:41:52 +02:00
Gavin Bisesi
fb4a7b3274 Give more friendly login error message 2014-07-01 12:04:33 -04:00
arxanas
7cbe410172 Fix #45: don't send tokens to deckstats. 2014-06-30 03:08:55 -04:00
Fabio Bas
922e98af67 Add pricing from deckbrew.com 
* the previous PriceUpdater class has become abstract
* BLPPriceUpdater inherits the old code for blacklotusproject.com
* DBPriceUpdater is a new implementation for deckbrew.com
* add a setting to choose between the two
 2014-06-29 23:33:03 +02:00
Daenyth
4d6f46b06e Change client ping send interval to 9 sec 2014-06-29 14:46:06 -04:00
Fabio Bas
d86fa410df Chat room: ensure focus on the input line 2014-06-29 19:32:03 +02:00
Fabio Bas
27bd00bec8 Direct chat: ensure focus is on the input line; fixes #113 2014-06-29 19:29:45 +02:00
Fabio Bas
fc24ffdec2 Cmake reorganization 
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
 2014-06-28 19:39:26 +02:00
Daenyth
09d6d26fb2 Merge branch 'master' into cmake_qt5 
Conflicts:
	cockatrice/src/main.cpp
 2014-06-28 09:13:10 -04:00
Daenyth
8d31fe6cbc Clean up deck load chat message 2014-06-28 09:04:45 -04:00
Daenyth
4c2a553f03 Have servatrice inform players of sideboard size 
Ref #142
 2014-06-28 00:36:43 -04:00
Daenyth
6d3fe428e7 Fix some warnings 
Ref #127
 2014-06-27 22:19:23 -04:00
Daenyth
1d02e0d5ec Clarify comment about typedef for OSX compiling 2014-06-27 20:00:29 -04:00
Fabio Bas
096f200eb9 Install libraries and plugins automatically under windows 
You won’t have to copy manually all the dlls in the release directory
anymore
 2014-06-27 17:40:29 +02:00
Fabio Bas
34772cccab Compilation fix for MSVC+Qt5 2014-06-27 17:09:09 +02:00
Fabio Bas
54805fb14e Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-27 15:21:01 +02:00
arxanas
080fd326ed Fixed #131: Compiles on OS X now. 2014-06-26 16:57:47 -04:00
Daenyth
144bb7fa89 Merge remote-tracking branch 'origin/invalid-windows-paths' 2014-06-25 20:26:46 -04:00
Gavin Bisesi
fcc62a1e1f Use defined(Q_OS_WIN) in #elif to satisfy MSVC 
It's always windows.
 2014-06-25 17:09:17 -04:00
Fabio Bas
2354ed6909 Require Qt4 >=4.8.0; remove some ifdefs on qt version 2014-06-25 16:00:48 +02:00