6dbdaafb33
Ported cockatrice
2014-06-24 19:13:47 +02:00
bab340f7b7
Reworked a bit message handling from previous commit
2014-06-24 18:52:04 +02:00
2953c6ba2a
Ported servatrice
2014-06-24 18:42:46 +02:00
80f68306b5
Ported oracle to Qt5
2014-06-24 18:28:09 +02:00
5c13c06982
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-06-24 18:13:26 +02:00
e5d9692d78
Fall back to plain text load when xml load fails
2014-06-24 00:14:59 -04:00
0420f4f7af
Log download failures
2014-06-23 23:44:13 -04:00
632e7f487c
Add debugging to file for windows
2014-06-23 23:15:53 -04:00
e925403bc5
Log cardname when downloading
2014-06-23 22:18:40 -04:00
ea08fe168c
Fix Q_INTERFACES warnings
...
Fix #88
2014-06-22 22:32:53 -04:00
4574df0a2e
Remove testclient cmake option.
...
This has been obsolete a long time
2014-06-22 21:25:57 -04:00
e5d15e8dbc
Notify deck editor when price feature setting is changed
...
Ref #112
2014-06-22 21:20:14 -04:00
951f08dd11
Update CentOS doc in user manual
...
Ref #109
2014-06-22 20:50:49 -04:00
1260ccc531
Merge pull request #111 from Daenyth/better-invalid-db-ux
...
Don't be a jerk when card database isn't usable.
2014-06-22 15:28:45 -04:00
68c0932a2f
Don't have decklist sort behavior rely on column order
2014-06-22 08:36:35 -04:00
e99c1bbe6d
Merge remote-tracking branch 'origin/master' into editor-sorting-v5
2014-06-22 08:10:22 -04:00
ab3b3f3bae
Merge pull request #106 from VanNostrand/doc
...
Added Mac OS X build instructions.
2014-06-22 07:53:58 -04:00
27847e1551
Don't be a jerk when card database isn't usable.
...
Better error message and allow the user to still connect
Ref: #102
2014-06-21 15:53:13 -04:00
3a82669b61
Added Mac OS X build instructions.
2014-06-21 19:24:13 +02:00
38b83acae0
Fix #105 - remove emdash from card type when getting main type
2014-06-21 12:42:46 -04:00
c3ad6b1f69
Merge pull request #85 from ctrlaltca/mtgjson-importer
...
Mtgjson importer (fixes #84 )
2014-06-21 08:13:11 -04:00
d7a962c055
CMake: support fir linking against qt5
2014-06-21 14:12:55 +02:00
0ec5842c3f
Add an unexposed config value for the AllSets.json file url
...
It will be saved only if:
* it’s different than the default (the user used a custom url);
* the download actually worked
2014-06-21 12:10:04 +02:00
17f7fe7ad9
Don't lock the UI if the loaded file was not readable
2014-06-21 11:41:31 +02:00
1edc34f086
Add an option to force selection of save path
...
By default oracle saves cards.xml to the correct path, where cockatrice
will be able to pick it up;
if oracle is not able to determine the path or the user unchecks the
option, oracle will ask for a save path
2014-06-21 11:37:46 +02:00
bb9a79f83b
Rename the finish/done button as "Save"
2014-06-21 11:25:24 +02:00
c6078c384c
Strip { } around mana cost
2014-06-21 11:18:41 +02:00
075c743a17
Sets: case insensitive sorting
2014-06-21 11:11:49 +02:00
53de2db89c
Clean up code leftovers
2014-06-21 11:04:52 +02:00
8d283a5a98
Merge branch 'Daenyth-mtgjson-importer' into mtgjson-importer
2014-06-21 10:57:24 +02:00
3ff19b4968
Merge branch 'mtgjson-importer' of https://github.com/Daenyth/Cockatrice into Daenyth-mtgjson-importer
2014-06-21 10:56:59 +02:00
26f1db5dda
Merge remote-tracking branch 'upstream/master' into mtgjson-importer
2014-06-21 10:50:23 +02:00
53d2b82e61
Use picUrl templates to download cards.
...
Add HQ card option
2014-06-21 01:12:47 -04:00
8281f63134
Add settings fields for pic urls
2014-06-20 22:10:26 -04:00
fa52ed00a3
Merge branch 'master' into mtgjson-importer
2014-06-20 20:43:19 -04:00
05f46011eb
Fix toLatin1() changes from 6fa94dd to toUtf8().
2014-06-20 18:16:46 +02:00
0721f5b416
Qt5: QtWidgets as a Separate Module
2014-06-20 16:56:15 +02:00
6fa94dd475
Qt5: toAscii() and fromAscii() Methods are deprecated
2014-06-20 16:55:26 +02:00
a903c231f2
Qt5: QDesktopServices::storageLocation deprecated
2014-06-20 16:54:46 +02:00
648a6a3884
Qt5: QUrl addQueryItem moved to QUrlQuery
2014-06-20 16:53:45 +02:00
032c41f3d5
Merge pull request #93 from VanNostrand/doc
...
Updated Windows build howto.
2014-06-20 07:53:12 -04:00
3863a05f49
Updated Windows build howto.
2014-06-20 09:59:45 +02:00
da4c25597e
Merge pull request #61 from VanNostrand/win32
...
Windows MSVC support
2014-06-19 22:56:18 -04:00
3401098e63
Revert "Merge pull request #89 from dylan/master"
...
This reverts commit 552a8e0c23d0f3ae6c80
2014-06-19 22:11:20 -04:00
40f9536224
Rewrite oracle as a wizard
2014-06-19 16:49:38 +02:00
a22a703fe8
Merge branch 'win32' of https://github.com/VanNostrand/Cockatrice into win32
2014-06-18 13:44:37 +02:00
0497239cef
Added MSVC compiler flags to cmake file.
2014-06-18 13:42:14 +02:00
391e480d7a
Restored MSVC linkflags after cmake update.
2014-06-18 12:11:58 +02:00
929bcb55da
Fixed bug in filtertree.cpp
2014-06-18 12:10:15 +02:00
8708c96695
Merge remote-tracking branch 'origin/master' into win32
...
Conflicts:
cockatrice/CMakeLists.txt
oracle/CMakeLists.txt
2014-06-18 12:09:32 +02:00
Fabio Bas