Gavin Bisesi
67db347d12
Merge pull request #366 from poixen/removeoldimages
...
Resource cleanup
2014-11-05 15:31:17 -05:00
Gavin Bisesi
07cccda17b
Merge pull request #377 from poixen/newhandsvg
...
Updated hand.svg
2014-10-20 10:28:58 -04:00
Matt Lowe
80fd0fbcf3
Removed inline logic
...
Removed inline logic to static variable, slight performance increase.
2014-10-17 00:17:44 +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
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
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
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
