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

364 commits

Author SHA1 Message Date
Fabio Bas
b10331fe66 Hide unused parameters in oracle/ to avoid warnings 2014-07-24 18:40:56 +02:00
Waleed Khan
40e97140d6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	cockatrice/src/carddatabase.cpp
 2014-07-23 00:49:13 -04:00
Waleed Khan
e5be082714 Merge remote-tracking branch 'upstream/master' into case-insensitive-card-tag 2014-07-20 15:06:51 -04:00
Waleed Khan
359882917a Merge remote-tracking branch 'upstream/master' 
Some tabs to spaces, and maybe fixed to work with Qt 5.

Conflicts:
	cockatrice/src/deckstats_interface.cpp
	common/decklist.cpp
	common/decklist.h
	oracle/src/oracleimporter.cpp
 2014-07-20 14:40:18 -04:00
arxanas
810029ce15 Fix #117: Card tags now match disregarding case and punctuation. 2014-07-06 20:04:09 -04:00
Fabio Bas
e9895d643f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-07-03 16:40:04 +02:00
arxanas
f730dca14c Fix #155: Vanguard card names no longer conflict with regular card names. 2014-07-01 02:29:25 -04:00
arxanas
7cbe410172 Fix #45: don't send tokens to deckstats. 2014-06-30 03:08:55 -04:00
Daenyth
09d6d26fb2 Merge branch 'master' into cmake_qt5 
Conflicts:
	cockatrice/src/main.cpp
 2014-06-28 09:13:10 -04:00
Daenyth
6d3fe428e7 Fix some warnings 
Ref #127
 2014-06-27 22:19:23 -04:00
Fabio Bas
096f200eb9 Install libraries and plugins automatically under windows 
You won’t have to copy manually all the dlls in the release directory
anymore
 2014-06-27 17:40:29 +02:00
Fabio Bas
34772cccab Compilation fix for MSVC+Qt5 2014-06-27 17:09:09 +02:00
Fabio Bas
62ca6130d1 #include <QtConcurrent> only for qt5, qt4 has this in QtCore 2014-06-25 19:28:03 +02:00
Fabio Bas
c4458b16b2 Qt5: fix plugin installation 2014-06-25 15:53:25 +02:00
Fabio Bas
809f390e2f Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-25 15:46:50 +02:00
Fabio Bas
80f68306b5 Ported oracle to Qt5 2014-06-24 18:28:09 +02:00
Fabio Bas
5c13c06982 Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-24 18:13:26 +02:00
Fabio Bas
2eebddea9a Port "make package" fix to oracle and servatrice 2014-06-22 23:41:15 +02:00
Fabio Bas
b44365b73c This finally fixes both make install and make package 2014-06-22 23:41:15 +02:00
Fabio Bas
6d1de0c617 Partially revert previous commits; ensure the bundle is fixed up correctly 2014-06-22 23:41:15 +02:00
Fabio Bas
41c7ce8022 Fix qt.conf file creation for "make package" 2014-06-22 23:41:15 +02:00
Fabio Bas
99f3519da5 Workaround permission problem in ixup_bundle 
Without this change, make install and make package would require “sudo”
under osx
 2014-06-22 23:41:15 +02: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
26f1db5dda Merge remote-tracking branch 'upstream/master' into mtgjson-importer 2014-06-21 10:50:23 +02:00
Mark Morschhäuser
0721f5b416 Qt5: QtWidgets as a Separate Module 2014-06-20 16:56:15 +02:00
Mark Morschhäuser
a903c231f2 Qt5: QDesktopServices::storageLocation deprecated 2014-06-20 16:54:46 +02:00
Fabio Bas
40f9536224 Rewrite oracle as a wizard 2014-06-19 16:49:38 +02:00
Mark Morschhäuser
391e480d7a Restored MSVC linkflags after cmake update. 2014-06-18 12:11:58 +02: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
Fabio Bas
0d3ec71e8f Merge splitter cards into a single card 2014-06-14 16:47:36 +02:00
Fabio Bas
4ff225cc3b Fix import of P/T; misc optimizations 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
Fabio Bas
eca318c34d Make install paths relative to prepare for CPack 2014-06-12 23:29:42 +02:00
Fabio Bas
84fe5f464c Removed unnecessary comments in previous commit 2014-06-11 18:20:34 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
5cd363e590 Removed duplicate FindQt4 2014-06-11 01:15:14 +02:00
Fabio Bas
0f02c6b0a2 oracle's CMakeLists.txt: major overhaul 
* Remove cockatrice_HEADERS (obsoleted by automoc)
* Remove compilation flags definition and Qt4 finding calls
* Make use of CMAKE_INSTALL_PREFIX
* use INSTALL(TARGETS) in place of INSTALL(PROGRAM)
* Osx: create a proper application bundle
* Added comments
 2014-06-10 23:33:33 +02:00
Fabio Bas
4fc6831784 Avoid using gcc-specific flags on not-gnu compilers 2014-06-10 11:42:41 +02:00
Chia-Wei Li
01277e9ad9 Repeatly download text spoiler until a valid XML document is received 2013-12-17 19:16:00 +08:00
Mark Morschhäuser
314db1f464 Changed sets.xml URL due to w32-qt ssl problem 2013-05-09 19:53:13 +02:00
Mark Morschhäuser
8bd247e681 Fixed spoiler list parsing, oracle works again. 2013-04-21 17:31:07 +02:00
Mark Morschhäuser
b179f446f5 Get sets.xml directly from github. 2013-04-21 17:30:08 +02:00
Mark Morschhäuser
bd861bbff1 Removed two unused variables. 2013-04-21 15:53:27 +02:00
Chris Hansen
422f73d4cd Fixed cmake error on mac install 2013-02-08 20:18:19 -08:00
Max-Wilhelm Bruker
de87bc6546 compile fixes by hasufell 2012-10-28 21:43:41 +01:00
Max-Wilhelm Bruker
f553fd7456 some token code 2012-04-05 11:48:13 +02:00
Max-Wilhelm Bruker
10d958c4ce Merge branch 'master' into devel 2012-03-23 12:18:16 +01:00
Max-Wilhelm Bruker
c92f3e4239 fix for issue #17: oracle: convert smart quotes to normal quotes in card names 2012-03-23 12:17:59 +01:00
Max-Wilhelm Bruker
e8844deeef added unix desktop icons and menu items to install target 2012-01-29 18:30:02 +01:00
Max-Wilhelm Bruker
848b52b287 removed setFixedSize in oracle 2012-01-29 16:00:12 +01:00
Max-Wilhelm Bruker
c9cd6f5d57 DKA added to sets 2012-01-27 14:22:25 +01:00
Max-Wilhelm Bruker
a64df4a0f5 Use QDesktopServices::StandardLocation for platform independent default paths that don't touch the application's own folder 2012-01-22 14:18:28 +01:00
Max-Wilhelm Bruker
068658995d added compiler flags 2012-01-21 22:24:20 +01:00
Max-Wilhelm Bruker
e202d659a0 moc weirdness workaround on Unix, added install target 2012-01-21 22:13:27 +01:00
Max-Wilhelm Bruker
3c24899de6 switched from qmake to cmake 2012-01-21 19:21:57 +01:00
Max-Wilhelm Bruker
6344b987de fixed pw loyalty in oracle, PB code working 2012-01-01 18:15:32 +01:00
Daenyth
a7f3ce4050 Add code support for planeswalker loyalty. 
Added to CardInfo object and to the oracle importer. Next step is the
card info widget.
 2011-12-03 17:15:33 -05:00
brukie
fb3d74c139 mac fixes 2011-11-17 11:09:44 -09:00
Max-Wilhelm Bruker
7dc2563390 sets.xml updated; don't try to retrieve empty picture urls 2011-11-12 00:52:04 +01:00
a b
c4bd38dbdc Mac fixes 2011-09-27 22:33:45 +02:00
unknown
1ddc3d408f added ISD to sets 2011-09-23 15:06:33 +02:00
Max-Wilhelm Bruker
c8813bb2aa extra server logging, server memory leak fixed, m12 2011-07-11 23:01:59 +02:00
Max-Wilhelm Bruker
4777d18fe3 added error messages to oracle importer 2011-06-22 16:06:01 +02:00
Max-Wilhelm Bruker
8971a10c80 added mtg:commander to sets 2011-06-18 13:28:55 +02:00
Max-Wilhelm Bruker
ed719090af added NPH to sets, added Belarus to countries 2011-04-30 03:08:45 +02:00
Max-Wilhelm Bruker
75d78ca147 added duel decks + FTV to sets.xml (done by DrAg0n) 2011-03-19 21:40:21 +01:00
Max-Wilhelm Bruker
1151077c1e carddb thread fix; added VG, AE, PCH to sets 2011-02-21 18:18:08 +01:00
Max-Wilhelm Bruker
d05603f83b p/t changes 2011-02-16 18:34:46 +01:00
Max-Wilhelm Bruker
8ccde61492 new picture downloader finished 2011-02-11 18:20:17 +01:00
Max-Wilhelm Bruker
3a5fce9613 new autodownloader partially done 2011-02-11 16:05:43 +01:00
Max-Wilhelm Bruker
29e5773fb5 minor server fix, added mbs to sets.xml 2011-02-09 13:47:21 +01:00
Max-Wilhelm Bruker
b3f96f9490 changed picture download to multiverse id 2011-01-28 03:29:21 +01:00
Max-Wilhelm Bruker
2c186221a6 umlaut workaround in oracle 2011-01-08 14:48:39 +01:00
Max-Wilhelm Bruker
1ef865b18b oracle fix 2010-11-10 02:38:34 +01:00
Max-Wilhelm Bruker
7dcb26d488 updated table rows in oracle importer 2010-11-05 22:07:25 +01:00
Max-Wilhelm Bruker
b4436f2451 minor oracle improvement 2010-10-15 18:10:58 +02:00
Max-Wilhelm Bruker
63310dd931 SOM in sets.xml 2010-09-24 14:14:22 +02:00
Max-Wilhelm Bruker
8a2f7e94e2 sorted sets.xml correctly 2010-09-10 19:57:31 +02:00
Max-Wilhelm Bruker
f9b0b4b170 AE ligature fix 2010-08-27 18:35:08 +02:00
Max-Wilhelm Bruker
6253d92053 Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice 2010-07-17 18:24:37 +02:00
Max-Wilhelm Bruker
614f106304 arrows can target players; card attachment works 2010-07-17 18:24:14 +02:00
Max-Wilhelm Bruker
72c5b4eb27 minor oracle importer improvement 2010-06-24 12:34:57 +02:00
Max-Wilhelm Bruker
4f13c01e12 mac patches 2010-06-19 18:18:04 +02:00
Max-Wilhelm Bruker
6829e2edb2 oracle importer changes 2010-05-08 23:39:55 +02:00
Max-Wilhelm Bruker
40fc77c646 oracle importer changes 2010-05-08 23:24:35 +02:00
Max-Wilhelm Bruker
cb045907cb minor fixes; ROE set added 2010-04-16 16:15:27 +02:00
Max-Wilhelm Bruker
7bf3ff1ff4 cleanup 2010-03-09 16:40:45 +01:00
Max-Wilhelm Bruker
ad3f4ba9e8 oracle fix 2010-03-07 00:24:25 +01:00
Max-Wilhelm Bruker
888a64b0fd new protocol code 2010-02-26 17:28:02 +01:00
Max-Wilhelm Bruker
a9f590e905 Worldwake 2010-01-29 23:56:25 +01:00
Marcus Schütz
07f49f54ff oracle Æther <-> Aether URL Bug 2010-01-22 19:59:03 +01:00
Max-Wilhelm Bruker
da6a1a0dbd fixed typo in oracle importer 2009-10-23 12:23:20 +02:00
Max-Wilhelm Bruker
3d1052f54c path fix 2009-10-22 18:25:07 +02:00
Max-Wilhelm Bruker
3c8f2b878b improved importer 2009-10-17 17:13:55 +02:00
Max-Wilhelm Bruker
912c0bcdbf cleanup 2009-10-13 01:24:01 +02:00
Max-Wilhelm Bruker
ae6803f9f2 rewrote oracle importer 2009-10-13 01:06:48 +02:00
marcus
a57aa14fb9 Zendikar added to sets.xml 2009-10-10 23:22:58 +02:00
Max-Wilhelm Bruker
e64313bb4d save file before opening message box 2009-09-11 20:19:31 +02:00
Max-Wilhelm Bruker
d0c692902a readded sets.xml 2009-09-02 21:01:32 +02:00
Max-Wilhelm Bruker
a018819a37 oracle update 2009-09-02 20:59:25 +02:00
Max-Wilhelm Bruker
af605ab1f8 cleaned up oracle importer 2009-09-01 15:41:43 +02:00
marcus
7fb76895d2 oracle now reads sets from sets.xml 2009-08-11 13:06:46 +02:00
marcus
63614b4549 oracle now loads sets from extern file 2009-08-11 00:46:39 +02:00
marcus
aaa56acfd1 picURL added to oracleimporter and carddatabase 2009-08-10 23:47:27 +02:00
brukie
22607ad14d mana crypt fix 2009-08-03 15:52:49 +02:00
Max-Wilhelm Bruker
27d25d41ac new carddb generator 2009-08-02 14:55:00 +02:00