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

103 commits

Author SHA1 Message Date
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