Daenyth
68c0932a2f
Don't have decklist sort behavior rely on column order
2014-06-22 08:36:35 -04:00
Daenyth
e99c1bbe6d
Merge remote-tracking branch 'origin/master' into editor-sorting-v5
2014-06-22 08:10:22 -04:00
Gavin Bisesi
ab3b3f3bae
Merge pull request #106 from VanNostrand/doc
...
Added Mac OS X build instructions.
2014-06-22 07:53:58 -04:00
Daenyth
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
Mark Morschhäuser
3a82669b61
Added Mac OS X build instructions.
2014-06-21 19:24:13 +02:00
Fabio Bas
e39cfb7968
Osx: removed plugins path detection and fixed translation path detection
2014-06-21 19:09:41 +02:00
Fabio Bas
f9554267d4
This finally fixes both make install and make package
2014-06-21 19:04:42 +02:00
Daenyth
38b83acae0
Fix #105 - remove emdash from card type when getting main type
2014-06-21 12:42:46 -04:00
Fabio Bas
b743ba4e6e
Partially revert previous commits; ensure the bundle is fixed up correctly
2014-06-21 18:15:27 +02:00
Fabio Bas
d74703f7af
osx: install sounds and zonebg as cockatrice's resources
2014-06-21 17:28:58 +02:00
Fabio Bas
87d4309aaa
Fix qt.conf file creation for "make package"
2014-06-21 17:28:27 +02:00
Fabio Bas
501ef1306b
Workaround permission problem in ixup_bundle
...
Without this change, make install and make package would require “sudo”
under osx
2014-06-21 16:59:31 +02:00
Gavin Bisesi
51b4eae8af
Merge remote-tracking branch 'origin/master' into feature-cpack
2014-06-21 10:09:03 -04:00
Fabio Bas
f6f6b5aa02
Merge remote-tracking branch 'upstream/master' into feature-cpack
2014-06-21 16:08:33 +02:00
Fabio Bas
9edd96c05c
Merge remote-tracking branch 'upstream/master' into feature-cpack
2014-06-21 15:14:30 +02:00
Gavin Bisesi
c3ad6b1f69
Merge pull request #85 from ctrlaltca/mtgjson-importer
...
Mtgjson importer (fixes #84 )
2014-06-21 08:13:11 -04:00
Fabio Bas
d7a962c055
CMake: support fir linking against qt5
2014-06-21 14:12:55 +02:00
Fabio Bas
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
Fabio Bas
17f7fe7ad9
Don't lock the UI if the loaded file was not readable
2014-06-21 11:41:31 +02:00
Fabio Bas
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
Fabio Bas
bb9a79f83b
Rename the finish/done button as "Save"
2014-06-21 11:25:24 +02:00
Fabio Bas
c6078c384c
Strip { } around mana cost
2014-06-21 11:18:41 +02:00
Fabio Bas
075c743a17
Sets: case insensitive sorting
2014-06-21 11:11:49 +02:00
Fabio Bas
53de2db89c
Clean up code leftovers
2014-06-21 11:04:52 +02:00
Fabio Bas
8d283a5a98
Merge branch 'Daenyth-mtgjson-importer' into mtgjson-importer
2014-06-21 10:57:24 +02:00
Fabio Bas
3ff19b4968
Merge branch 'mtgjson-importer' of https://github.com/Daenyth/Cockatrice into Daenyth-mtgjson-importer
2014-06-21 10:56:59 +02:00
Fabio Bas
26f1db5dda
Merge remote-tracking branch 'upstream/master' into mtgjson-importer
2014-06-21 10:50:23 +02:00
Daenyth
53d2b82e61
Use picUrl templates to download cards.
...
Add HQ card option
2014-06-21 01:12:47 -04:00
Daenyth
8281f63134
Add settings fields for pic urls
2014-06-20 22:10:26 -04:00
Daenyth
fa52ed00a3
Merge branch 'master' into mtgjson-importer
2014-06-20 20:43:19 -04:00
Mark Morschhäuser
05f46011eb
Fix toLatin1() changes from 6fa94dd to toUtf8().
2014-06-20 18:16:46 +02:00
Mark Morschhäuser
0721f5b416
Qt5: QtWidgets as a Separate Module
2014-06-20 16:56:15 +02:00
Mark Morschhäuser
6fa94dd475
Qt5: toAscii() and fromAscii() Methods are deprecated
2014-06-20 16:55:26 +02:00
Mark Morschhäuser
a903c231f2
Qt5: QDesktopServices::storageLocation deprecated
2014-06-20 16:54:46 +02:00
Mark Morschhäuser
648a6a3884
Qt5: QUrl addQueryItem moved to QUrlQuery
2014-06-20 16:53:45 +02:00
Gavin Bisesi
032c41f3d5
Merge pull request #93 from VanNostrand/doc
...
Updated Windows build howto.
2014-06-20 07:53:12 -04:00
Mark Morschhäuser
3863a05f49
Updated Windows build howto.
2014-06-20 09:59:45 +02:00
Gavin Bisesi
da4c25597e
Merge pull request #61 from VanNostrand/win32
...
Windows MSVC support
2014-06-19 22:56:18 -04:00
Daenyth
3401098e63
Revert "Merge pull request #89 from dylan/master"
...
This reverts commit 552a8e0c23d0f3ae6c80
2014-06-19 22:11:20 -04:00
Fabio Bas
40f9536224
Rewrite oracle as a wizard
2014-06-19 16:49:38 +02:00
Mark Morschhäuser
a22a703fe8
Merge branch 'win32' of https://github.com/VanNostrand/Cockatrice into win32
2014-06-18 13:44:37 +02:00
Mark Morschhäuser
0497239cef
Added MSVC compiler flags to cmake file.
2014-06-18 13:42:14 +02:00
Mark Morschhäuser
391e480d7a
Restored MSVC linkflags after cmake update.
2014-06-18 12:11:58 +02:00
Mark Morschhäuser
929bcb55da
Fixed bug in filtertree.cpp
2014-06-18 12:10:15 +02:00
Mark Morschhäuser
8708c96695
Merge remote-tracking branch 'origin/master' into win32
...
Conflicts:
cockatrice/CMakeLists.txt
oracle/CMakeLists.txt
2014-06-18 12:09:32 +02:00
Gavin Bisesi
552a8e0c23
Merge pull request #89 from dylan/master
...
Added new app icons, SVG icon not replaced however...
2014-06-17 19:48:12 -04:00
Gavin Bisesi
d0f3ae6c80
Merge pull request #87 from Daenyth/offline-buddy
...
Add the ability to friend/ignore an offline user
2014-06-17 15:17:53 -04:00
Fabio Bas
f3a57d5506
Import data from mtgjson's allsets.xml
...
* add multiverse id to cards.xml
* remove pictures urls from cards.xml
TBD:
* fix/clean oracle’s gui
* add support in cockatrice
2014-06-16 00:27:33 +02:00
Daenyth
b749ddbc45
Add the ability to friend/ignore an offline user
2014-06-15 14:59:54 -04:00
Gavin Bisesi
74163dba5d
Merge pull request #86 from VanNostrand/doc
...
Usermanual update
2014-06-15 08:11:02 -04:00
