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

1652 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 552a8e0c23, reversing
changes made to d0f3ae6c80.
 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
Mark Morschhäuser
f042b80e0f Updated Usermanual.pdf 2014-06-15 10:43:04 +02:00
Mark Morschhäuser
06f25ff546 Removed pthread information due to fixes in the buildsystem. 2014-06-15 10:41:23 +02:00
Mark Morschhäuser
901b0d51d5 Slightly changed two captions. 2014-06-15 10:40:12 +02:00
Daenyth
6913f2bb4e Merge branch 'master' into musty 
Conflicts:
	common/server_cardzone.cpp
 2014-06-14 19:06:49 -04:00
Fabio Bas
0d3ec71e8f Merge splitter cards into a single card 2014-06-14 16:47:36 +02:00
Fabio Bas
0aa647e205 Merge branch 'mtgjson-importer' of https://github.com/ctrlaltca/Cockatrice into mtgjson-importer 2014-06-14 16:37:50 +02:00
Fabio Bas
62cfa74d08 Keep gatherer as image source; mtgimage as a hq alternative 2014-06-14 16:17:17 +02:00
Fabio Bas
f562f3ef06 Use mtgimage.com for card images 2014-06-14 16:17:17 +02:00
Fabio Bas
4ff225cc3b Fix import of P/T; misc optimizations 2014-06-14 16:17:17 +02:00
Fabio Bas
f8a6f74211 Corrections to sets.xml for mtgjson.com 
* Used http://www.woogerworks.com/files/sets.xml as a base
 * update version
 * use mtgjson.com as source
 * adapted some sets name (es: 6E => 6ED)
Caveats:
 * Not all previous sets are present (e.g.: WOTC, WMCQ, WRL); they were
not present in woogerworks’s sets.xml anyway
 2014-06-14 16:17:17 +02:00
Fabio Bas
dfbcace05b OracleImporter: use json to parse cards in sets 
Problem: Split card are imported as 2 different cards; need to find
some way to join them
 2014-06-14 16:17:17 +02:00
Fabio Bas
89ab257d0b Oracle: build with qtjson 2014-06-14 16:17:17 +02:00
Gavin Bisesi
f7e5a2491f Merge pull request #83 from ctrlaltca/cmake-overhaul 
Cmake overhaul
 2014-06-14 09:19:54 -04:00
Fabio Bas
827f448cde Keep gatherer as image source; mtgimage as a hq alternative 2014-06-14 12:11:03 +02:00
Fabio Bas
2b1d7c4f74 Use mtgimage.com for card images 2014-06-14 12:02:34 +02:00
Fabio Bas
d58615df1a Fix import of P/T; misc optimizations 2014-06-14 11:52:55 +02:00
Fabio Bas
6f8b2baad8 Corrections to sets.xml for mtgjson.com 
* Used http://www.woogerworks.com/files/sets.xml as a base
 * update version
 * use mtgjson.com as source
 * adapted some sets name (es: 6E => 6ED)
Caveats:
 * Not all previous sets are present (e.g.: WOTC, WMCQ, WRL); they were
not present in woogerworks’s sets.xml anyway
 2014-06-14 11:34:52 +02:00
Fabio Bas
dbac97ee89 OracleImporter: use json to parse cards in sets 
Problem: Split card are imported as 2 different cards; need to find
some way to join them
 2014-06-14 11:34:06 +02:00
Fabio Bas
94419b1e38 Oracle: build with qtjson 2014-06-14 11:29:00 +02:00