Gavin Bisesi
6f319c8b63
Merge pull request #286 from jturner/fix-build
...
Remove invalid character
2014-08-19 20:31:41 -04:00
James Turner
f06d2123fc
Remove invalid character
2014-08-19 17:39:05 -04:00
Gavin Bisesi
59b8d7044a
Merge pull request #285 from pliu037/fix-oracle-save
...
Fixed Oracle save bug
2014-08-15 09:24:22 -04:00
Peng Liu
9a934f3a43
Fixed a bug that caused Oracle to be stuck in an infinite loop if the default path checkbox was checked but failed to write.
2014-08-15 01:09:21 -04:00
Peng Liu
a83e6cdf48
Removed unused variable, bool stripped, from classes and functions.
2014-08-11 13:47:47 -04:00
Gavin Bisesi
0bb0530a31
Merge pull request #245 from pliu037/oracle-cards-path
...
Oracle cards.xml path
2014-08-11 10:13:38 -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
woogerboy21
6b8ca1e8a2
Cleaned up potential memory leak
2014-08-10 15:48:15 -04: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
Gavin Bisesi
4e3d6a141c
Merge pull request #274 from ctrlaltca/serva_memleaks
...
Removed a servatrice memleak
2014-08-08 12:22:44 -04:00
Gavin Bisesi
57efffcd2e
Merge pull request #273 from ctrlaltca/picurl_handling
...
Fix #259
2014-08-08 08:59:41 -04:00
Mawu3n4
d55f6fdec1
fix: show card only found once by prefix
2014-08-08 14:24:29 +02:00
Fabio Bas
6e3c7d33da
Make protobuf cleanup its resourced when servatrice ends
...
Should help make valgrind’s log a bit cleaner
2014-08-08 13:43:50 +02:00
Fabio Bas
0a5106b8ef
Don't leak a QSettings object at every logged message
2014-08-08 09:57:07 +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
Gavin Bisesi
e12d66df4f
Merge pull request #271 from ctrlaltca/picurl_handling
...
Picurl handling
2014-08-07 17:25:38 -04: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
Gavin Bisesi
0de0658acd
Merge pull request #269 from arxanas/style-guide-memory-management
...
Added section on memory management to CONTRIBUTING.md.
2014-08-07 15:51:51 -04:00
Waleed Khan
bee1ff39f5
Added section on memory management to CONTRIBUTING.md.
2014-08-07 15:37:40 -04:00
Gavin Bisesi
fe3dc02513
Merge pull request #266 from arxanas/token-dashes
...
Fix #258 : Dashes to spaces.
2014-08-07 15:34:47 -04: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
Peng Liu
3375d45571
Logically inverted the if... else statement by removing the logical not (!). Cleaned up a ;;.
2014-08-07 12:58:03 -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
Gavin Bisesi
ab7d70a9c8
Merge pull request #263 from ctrlaltca/oracle_icon
...
Add icon to oracle
2014-08-07 12:00:46 -04:00
Gavin Bisesi
1a4abc3d63
Merge pull request #264 from arxanas/style-guide
...
Added style guide.
2014-08-07 11:58:37 -04:00
Waleed Khan
da9592f0d8
Added style guide.
2014-08-07 11:52:40 -04:00
Mawu3n4
10ab53c4ac
fix: find by prefix if card not found only
2014-08-07 17:43:14 +02:00
Fabio Bas
40e9735678
Add icon to oracle
2014-08-07 17:27:15 +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
Gavin Bisesi
af4d662c54
Merge pull request #262 from ctrlaltca/fix_134
...
add success notification to oracle; fixes #134
2014-08-07 10:39:13 -04:00
Fabio Bas
2e051c3fd7
add success notification to oracle
2014-08-07 16:10:57 +02: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
Peng Liu
8b588c6fd3
Merge branch 'ctrlaltca-pr256' into handle-PNGs-2
2014-08-06 04:55:27 -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
605479694d
Removed some redundant code. Factored out translations.
2014-08-05 08:50:42 -04:00
