Commit graph

  • 99f3519da5 Workaround permission problem in ixup_bundle Fabio Bas 2014-06-21 16:59:31 +02:00
  • 377433b5cc CPack generator; removed old prepareMacRelease.sh Fabio Bas 2014-06-12 23:47:01 +02:00
  • fef005d042 OSX: Handle sounds for first time installations Fabio Bas 2014-06-22 23:29:42 +02:00
  • d396b3dfac Zonebg: avoid installing the CMakeLists.txt file Fabio Bas 2014-06-22 23:24:44 +02:00
  • 45c71c09cd OSX: Handle zonebg for first time installations Fabio Bas 2014-06-22 23:21:29 +02:00
  • 1260ccc531 Merge pull request #111 from Daenyth/better-invalid-db-ux Gavin Bisesi 2014-06-22 15:28:45 -04:00
  • 2b371fd96b OSX: get translation path from qt.conf instead of hardcoding it Fabio Bas 2014-06-22 21:19:10 +02:00
  • 8305927fa2 Port "make package" fix to oracle and servatrice Fabio Bas 2014-06-22 21:11:39 +02:00
  • 77d41160b8 Merge remote-tracking branch 'upstream/master' into feature-cpack Fabio Bas 2014-06-22 20:01:24 +02:00
  • 68c0932a2f Don't have decklist sort behavior rely on column order Daenyth 2014-06-22 08:36:35 -04:00
  • e99c1bbe6d Merge remote-tracking branch 'origin/master' into editor-sorting-v5 Daenyth 2014-06-22 08:10:22 -04:00
  • ab3b3f3bae Merge pull request #106 from VanNostrand/doc Gavin Bisesi 2014-06-22 07:53:58 -04:00
  • bd3081d468 Merge cc2639b72a into 38b83acae0 Gavin Bisesi 2014-06-22 10:33:15 +00:00
  • 27847e1551 Don't be a jerk when card database isn't usable. Daenyth 2014-06-21 15:51:47 -04:00
  • 7314ae34b5 Merge pull request #1 from ctrlaltca/cmake_qt5 VanNostrand 2014-06-21 19:30:58 +02:00
  • 3a82669b61 Added Mac OS X build instructions. Mark Morschhäuser 2014-06-21 19:24:13 +02:00
  • e39cfb7968 Osx: removed plugins path detection and fixed translation path detection Fabio Bas 2014-06-21 19:09:41 +02:00
  • f9554267d4 This finally fixes both make install and make package Fabio Bas 2014-06-21 19:04:42 +02:00
  • 38b83acae0 Fix #105 - remove emdash from card type when getting main type Daenyth 2014-06-21 12:42:46 -04:00
  • b743ba4e6e Partially revert previous commits; ensure the bundle is fixed up correctly Fabio Bas 2014-06-21 18:15:27 +02:00
  • d74703f7af osx: install sounds and zonebg as cockatrice's resources Fabio Bas 2014-06-21 17:28:58 +02:00
  • 87d4309aaa Fix qt.conf file creation for "make package" Fabio Bas 2014-06-21 17:28:27 +02:00
  • 501ef1306b Workaround permission problem in ixup_bundle Fabio Bas 2014-06-21 16:59:31 +02:00
  • 51b4eae8af Merge remote-tracking branch 'origin/master' into feature-cpack Gavin Bisesi 2014-06-21 10:09:03 -04:00
  • f6f6b5aa02 Merge remote-tracking branch 'upstream/master' into feature-cpack Fabio Bas 2014-06-21 16:08:33 +02:00
  • 9edd96c05c Merge remote-tracking branch 'upstream/master' into feature-cpack Fabio Bas 2014-06-21 15:14:30 +02:00
  • c3ad6b1f69 Merge pull request #85 from ctrlaltca/mtgjson-importer Gavin Bisesi 2014-06-21 08:13:11 -04:00
  • d7a962c055 CMake: support fir linking against qt5 Fabio Bas 2014-06-21 14:12:55 +02:00
  • 0ec5842c3f Add an unexposed config value for the AllSets.json file url Fabio Bas 2014-06-21 12:10:04 +02:00
  • 17f7fe7ad9 Don't lock the UI if the loaded file was not readable Fabio Bas 2014-06-21 11:41:31 +02:00
  • 1edc34f086 Add an option to force selection of save path Fabio Bas 2014-06-21 11:37:46 +02:00
  • bb9a79f83b Rename the finish/done button as "Save" Fabio Bas 2014-06-21 11:25:24 +02:00
  • c6078c384c Strip { } around mana cost Fabio Bas 2014-06-21 11:18:41 +02:00
  • 075c743a17 Sets: case insensitive sorting Fabio Bas 2014-06-21 11:11:49 +02:00
  • 53de2db89c Clean up code leftovers Fabio Bas 2014-06-21 11:04:52 +02:00
  • 8d283a5a98 Merge branch 'Daenyth-mtgjson-importer' into mtgjson-importer Fabio Bas 2014-06-21 10:57:24 +02:00
  • 3ff19b4968 Merge branch 'mtgjson-importer' of https://github.com/Daenyth/Cockatrice into Daenyth-mtgjson-importer Fabio Bas 2014-06-21 10:56:59 +02:00
  • 26f1db5dda Merge remote-tracking branch 'upstream/master' into mtgjson-importer Fabio Bas 2014-06-21 10:50:23 +02:00
  • 53d2b82e61 Use picUrl templates to download cards. Daenyth 2014-06-21 01:12:47 -04:00
  • 8281f63134 Add settings fields for pic urls Daenyth 2014-06-20 22:10:26 -04:00
  • fa52ed00a3 Merge branch 'master' into mtgjson-importer Daenyth 2014-06-20 20:43:19 -04:00
  • 34b3ab0be7 Merge 05f46011eb into 032c41f3d5 VanNostrand 2014-06-20 16:19:34 +00:00
  • 05f46011eb Fix toLatin1() changes from 6fa94dd to toUtf8(). Mark Morschhäuser 2014-06-20 18:16:46 +02:00
  • 0721f5b416 Qt5: QtWidgets as a Separate Module Mark Morschhäuser 2014-06-20 16:56:15 +02:00
  • 6fa94dd475 Qt5: toAscii() and fromAscii() Methods are deprecated Mark Morschhäuser 2014-06-20 16:55:26 +02:00
  • a903c231f2 Qt5: QDesktopServices::storageLocation deprecated Mark Morschhäuser 2014-06-20 16:54:46 +02:00
  • 648a6a3884 Qt5: QUrl addQueryItem moved to QUrlQuery Mark Morschhäuser 2014-06-20 16:53:45 +02:00
  • 032c41f3d5 Merge pull request #93 from VanNostrand/doc Gavin Bisesi 2014-06-20 07:53:12 -04:00
  • 3863a05f49 Updated Windows build howto. Mark Morschhäuser 2014-06-20 09:59:45 +02:00
  • da4c25597e Merge pull request #61 from VanNostrand/win32 Gavin Bisesi 2014-06-19 22:56:18 -04:00
  • 3401098e63 Revert "Merge pull request #89 from dylan/master" Daenyth 2014-06-19 22:11:20 -04:00
  • 40f9536224 Rewrite oracle as a wizard Fabio Bas 2014-06-19 16:49:38 +02:00
  • a22a703fe8 Merge branch 'win32' of https://github.com/VanNostrand/Cockatrice into win32 Mark Morschhäuser 2014-06-18 13:44:37 +02:00
  • 0497239cef Added MSVC compiler flags to cmake file. Mark Morschhäuser 2014-06-18 13:42:14 +02:00
  • 391e480d7a Restored MSVC linkflags after cmake update. Mark Morschhäuser 2014-06-18 12:11:58 +02:00
  • 929bcb55da Fixed bug in filtertree.cpp Mark Morschhäuser 2014-06-18 12:10:15 +02:00
  • 8708c96695 Merge remote-tracking branch 'origin/master' into win32 Mark Morschhäuser 2014-06-18 12:09:32 +02:00
  • cc2639b72a Apply new icon to build Daenyth 2014-06-18 02:13:27 -04:00
  • 552a8e0c23 Merge pull request #89 from dylan/master Gavin Bisesi 2014-06-17 19:48:12 -04:00
  • d0f3ae6c80 Merge pull request #87 from Daenyth/offline-buddy Gavin Bisesi 2014-06-17 15:17:53 -04:00
  • f3a57d5506 Import data from mtgjson's allsets.xml Fabio Bas 2014-06-16 00:27:33 +02:00
  • b749ddbc45 Add the ability to friend/ignore an offline user Daenyth 2014-06-15 14:59:54 -04:00
  • 74163dba5d Merge pull request #86 from VanNostrand/doc Gavin Bisesi 2014-06-15 08:11:02 -04:00
  • f042b80e0f Updated Usermanual.pdf Mark Morschhäuser 2014-06-15 10:43:04 +02:00
  • 06f25ff546 Removed pthread information due to fixes in the buildsystem. Mark Morschhäuser 2014-06-15 10:41:23 +02:00
  • 901b0d51d5 Slightly changed two captions. Mark Morschhäuser 2014-06-15 10:40:12 +02:00
  • 6913f2bb4e Merge branch 'master' into musty Daenyth 2014-06-14 19:06:49 -04:00
  • 0d3ec71e8f Merge splitter cards into a single card Fabio Bas 2014-06-14 16:47:36 +02:00
  • 0aa647e205 Merge branch 'mtgjson-importer' of https://github.com/ctrlaltca/Cockatrice into mtgjson-importer Fabio Bas 2014-06-14 16:37:50 +02:00
  • 62cfa74d08 Keep gatherer as image source; mtgimage as a hq alternative Fabio Bas 2014-06-14 12:11:03 +02:00
  • f562f3ef06 Use mtgimage.com for card images Fabio Bas 2014-06-14 12:02:34 +02:00
  • 4ff225cc3b Fix import of P/T; misc optimizations Fabio Bas 2014-06-14 11:52:55 +02:00
  • f8a6f74211 Corrections to sets.xml for mtgjson.com Fabio Bas 2014-06-14 11:34:52 +02:00
  • dfbcace05b OracleImporter: use json to parse cards in sets Fabio Bas 2014-06-14 11:34:06 +02:00
  • 89ab257d0b Oracle: build with qtjson Fabio Bas 2014-06-14 11:29:00 +02:00
  • f7e5a2491f Merge pull request #83 from ctrlaltca/cmake-overhaul Gavin Bisesi 2014-06-14 09:19:54 -04:00
  • 827f448cde Keep gatherer as image source; mtgimage as a hq alternative Fabio Bas 2014-06-14 12:11:03 +02:00
  • 2b1d7c4f74 Use mtgimage.com for card images Fabio Bas 2014-06-14 12:02:34 +02:00
  • d58615df1a Fix import of P/T; misc optimizations Fabio Bas 2014-06-14 11:52:55 +02:00
  • 6f8b2baad8 Corrections to sets.xml for mtgjson.com Fabio Bas 2014-06-14 11:34:52 +02:00
  • dbac97ee89 OracleImporter: use json to parse cards in sets Fabio Bas 2014-06-14 11:34:06 +02:00
  • 94419b1e38 Oracle: build with qtjson Fabio Bas 2014-06-14 11:29:00 +02:00
  • a35b62509a Handle correctly user-defined CMAKE_BUILD_TYPE Fabio Bas 2014-06-14 10:35:18 +02:00
  • a4fbf8b677 Force linking with pthread under unix Fabio Bas 2014-06-13 19:09:33 +02:00
  • 8fc08800a4 CPack generator; removed old prepareMacRelease.sh Fabio Bas 2014-06-12 23:47:01 +02:00
  • dd768ba7bd OSX: Move translations inside app bundle Fabio Bas 2014-06-12 23:42:20 +02:00
  • 660ff349ab Add a proper, top-level project name Fabio Bas 2014-06-12 23:32:12 +02:00
  • ddec7e6561 Create CMake options for components Fabio Bas 2014-06-12 23:31:30 +02:00
  • eca318c34d Make install paths relative to prepare for CPack Fabio Bas 2014-06-12 23:29:42 +02:00
  • dfdfe60202 Properly install sounds and zonebg files Fabio Bas 2014-06-11 18:20:48 +02:00
  • 84fe5f464c Removed unnecessary comments in previous commit Fabio Bas 2014-06-11 18:20:34 +02:00
  • 721cf6fe4f Re-indent CMakeLists.txt using spaces Fabio Bas 2014-06-11 18:08:30 +02:00
  • ed0311d59e Added comments for comment's CMakeLists.txt Fabio Bas 2014-06-11 01:26:54 +02:00
  • 4fd8c94df0 Overhaul common's CMakeLists.txt Fabio Bas 2014-06-11 01:24:34 +02:00
  • 62f756e698 Remove pthread detection and linking: it's unused Fabio Bas 2014-06-11 01:20:19 +02:00
  • 5cd363e590 Removed duplicate FindQt4 Fabio Bas 2014-06-11 01:15:14 +02:00
  • b2ead4ffd2 Ignore multiple build directories (used when cross compiling) Fabio Bas 2014-06-11 01:14:43 +02:00
  • 4b49458eeb servatrice's CMakeLists.txt: major overhaul Fabio Bas 2014-06-10 23:34:01 +02:00
  • 0f02c6b0a2 oracle's CMakeLists.txt: major overhaul Fabio Bas 2014-06-10 23:33:33 +02:00
  • 0dd6567583 cockatrice's CMakeLists.txt: major overhaul Fabio Bas 2014-06-10 23:32:52 +02:00