gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,409 Commits 53 Branches 176 Tags
41c7ce8022f5714628095524b68d660fcfdfc262
Commit Graph
54 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 377433b5cc CPack generator; removed old prepareMacRelease.sh 
By now tested on OSX only
 2014-06-22 23:41:15 +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
Fabio Bas 40f9536224 Rewrite oracle as a wizard 2014-06-19 16:49:38 +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 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
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
Fabio Bas a35b62509a Handle correctly user-defined CMAKE_BUILD_TYPE 2014-06-14 10:35:18 +02:00
Fabio Bas a4fbf8b677 Force linking with pthread under unix 
Protobuf depends on pthread under unix, but cmake’s FindProtobuf
doesn’t add -lpthread to link flags
 2014-06-13 19:09:33 +02:00
Fabio Bas dd768ba7bd OSX: Move translations inside app bundle 
Additional: remove duplicate if(linux) and merge rules together
 2014-06-12 23:42:20 +02:00
Fabio Bas 660ff349ab Add a proper, top-level project name 2014-06-12 23:32:12 +02:00
Fabio Bas ddec7e6561 Create CMake options for components 2014-06-12 23:31:30 +02:00
Fabio Bas eca318c34d Make install paths relative to prepare for CPack 2014-06-12 23:29:42 +02:00
Fabio Bas dfdfe60202 Properly install sounds and zonebg files 2014-06-11 18:20:48 +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 ed0311d59e Added comments for comment's CMakeLists.txt 2014-06-11 01:26:54 +02:00
Fabio Bas 4fd8c94df0 Overhaul common's CMakeLists.txt 
* Use automoc instead of a manual list of headers
* Remove Qt4 detection
* Created missing .cpp for .h files (for automoc detection)
* Remove pthread linking
* Forcing -lprotobuf is not needed for mingw; msvc only?
 2014-06-11 01:24:34 +02:00
Fabio Bas 62f756e698 Remove pthread detection and linking: it's unused 2014-06-11 01:20:19 +02:00
Fabio Bas 5cd363e590 Removed duplicate FindQt4 2014-06-11 01:15:14 +02:00
Fabio Bas b2ead4ffd2 Ignore multiple build directories (used when cross compiling) 2014-06-11 01:14:43 +02:00
Fabio Bas 4b49458eeb servatrice'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:34:01 +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 0dd6567583 cockatrice'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:32:52 +02:00
Fabio Bas 4c1687264d main CMakeLists.txt: major overhaul 
* define CMAKE_INSTALL_PREFIX
* define compilation flags
* find needed libraries
* enable Qt4’s automoc
* Added comments
 2014-06-10 23:29:24 +02:00
Fabio Bas c9f10554c6 comment in sounds and zonebg's CMakeLists.txt 2014-06-10 23:26:37 +02:00
Fabio Bas 84503483eb Added missing ifdefs around keysignals.h 2014-06-10 23:25:59 +02:00
Fabio Bas 39e2bf06f5 Merge branch 'master' into cmake-overhaul 2014-06-10 23:11:31 +02:00
Fabio Bas 20b9a538fa Split PendingCommand 's implementation to its own cpp to permit automoc 2014-06-10 22:33:21 +02:00
ctrlaltca e2d17e983f Restored whitespaces in CMakeLists.txt 2014-06-10 20:05:24 +02:00
Fabio Bas 79c805b835 Create sounds/zonebg CMakeLists.txt 2014-06-10 14:11:16 +02:00
Fabio Bas 4fc6831784 Avoid using gcc-specific flags on not-gnu compilers 2014-06-10 11:42:41 +02:00