aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commit graph

  • e5d9692d78 Fall back to plain text load when xml load fails Daenyth 2014-06-24 00:14:59 -0400
  • 0420f4f7af Log download failures Daenyth 2014-06-23 23:44:13 -0400
  • 02fb28eb9b Merge branch 'master' into windows-nsis-fix Daenyth 2014-06-23 23:16:20 -0400
  • 632e7f487c Add debugging to file for windows Daenyth 2014-06-23 23:15:53 -0400
  • e925403bc5 Log cardname when downloading Daenyth 2014-06-23 22:18:40 -0400
  • fc599972f3 Write to APPDATA/Cockatrice, not APPDATA Daenyth 2014-06-23 21:25:09 -0400
  • f1e6aebaba Set cockatrice path settings to use appdata instead of instdir Daenyth 2014-06-23 21:21:08 -0400
  • f7635f9e49 Don't recursive remove program files/cockatrice. Daenyth 2014-06-23 21:12:25 -0400
  • ec00bdebed verbose incrementation woogerboy21 2014-06-23 09:18:49 -0400
  • 46ceeadbbd updated code structure woogerboy21 2014-06-23 03:41:46 -0400
  • 36e4b84ba7 Merge pull request #2 from Daenyth/feature-cpack ctrlaltca 2014-06-23 08:43:07 +0200
  • 236e0a4197 added loglevel variable woogerboy21 2014-06-23 00:09:21 -0400
  • 5592346979 added server log filtering woogerboy21 2014-06-23 00:07:12 -0400
  • ea08fe168c Fix Q_INTERFACES warnings Daenyth 2014-06-22 22:32:53 -0400
  • 4574df0a2e Remove testclient cmake option. Daenyth 2014-06-22 21:25:57 -0400
  • e5d15e8dbc Notify deck editor when price feature setting is changed Daenyth 2014-06-22 21:19:53 -0400
  • 951f08dd11 Update CentOS doc in user manual Daenyth 2014-06-22 20:50:49 -0400
  • c54f7b9245 Log on failed path copy Daenyth 2014-06-22 20:14:22 -0400
  • 3e43429f13 Merge branch 'feature-cpack' of github.com:Daenyth/Cockatrice into feature-cpack Daenyth 2014-06-22 20:08:30 -0400
  • 2ca145f908 Merge branch 'feature-cpack' of https://github.com/ctrlaltca/Cockatrice into feature-cpack Fabio Bas 2014-06-22 23:44:04 +0200
  • 66c87a1ee6 OSX: Handle sounds for first time installations Fabio Bas 2014-06-22 23:29:42 +0200
  • d06d64537e Zonebg: avoid installing the CMakeLists.txt file Fabio Bas 2014-06-22 23:24:44 +0200
  • 0b4701c42f OSX: Handle zonebg for first time installations Fabio Bas 2014-06-22 23:21:29 +0200
  • 55c4c464e4 OSX: get translation path from qt.conf instead of hardcoding it Fabio Bas 2014-06-22 21:19:10 +0200
  • 2eebddea9a Port "make package" fix to oracle and servatrice Fabio Bas 2014-06-22 21:11:39 +0200
  • 2a5f6181aa Osx: removed plugins path detection and fixed translation path detection Fabio Bas 2014-06-21 19:09:41 +0200
  • b44365b73c This finally fixes both make install and make package Fabio Bas 2014-06-21 19:04:42 +0200
  • 6d1de0c617 Partially revert previous commits; ensure the bundle is fixed up correctly Fabio Bas 2014-06-21 18:15:27 +0200
  • 1b2c839ff0 osx: install sounds and zonebg as cockatrice's resources Fabio Bas 2014-06-21 17:28:58 +0200
  • 41c7ce8022 Fix qt.conf file creation for "make package" Fabio Bas 2014-06-21 17:28:27 +0200
  • 99f3519da5 Workaround permission problem in ixup_bundle Fabio Bas 2014-06-21 16:59:31 +0200
  • 377433b5cc CPack generator; removed old prepareMacRelease.sh Fabio Bas 2014-06-12 23:47:01 +0200
  • fef005d042 OSX: Handle sounds for first time installations Fabio Bas 2014-06-22 23:29:42 +0200
  • d396b3dfac Zonebg: avoid installing the CMakeLists.txt file Fabio Bas 2014-06-22 23:24:44 +0200
  • 45c71c09cd OSX: Handle zonebg for first time installations Fabio Bas 2014-06-22 23:21:29 +0200
  • 1260ccc531 Merge pull request #111 from Daenyth/better-invalid-db-ux Gavin Bisesi 2014-06-22 15:28:45 -0400
  • 2b371fd96b OSX: get translation path from qt.conf instead of hardcoding it Fabio Bas 2014-06-22 21:19:10 +0200
  • 8305927fa2 Port "make package" fix to oracle and servatrice Fabio Bas 2014-06-22 21:11:39 +0200
  • 77d41160b8 Merge remote-tracking branch 'upstream/master' into feature-cpack Fabio Bas 2014-06-22 20:01:24 +0200
  • 68c0932a2f Don't have decklist sort behavior rely on column order Daenyth 2014-06-22 08:36:35 -0400
  • e99c1bbe6d Merge remote-tracking branch 'origin/master' into editor-sorting-v5 Daenyth 2014-06-22 08:10:22 -0400
  • ab3b3f3bae Merge pull request #106 from VanNostrand/doc Gavin Bisesi 2014-06-22 07:53:58 -0400
  • 27847e1551 Don't be a jerk when card database isn't usable. Daenyth 2014-06-21 15:51:47 -0400
  • 3a82669b61 Added Mac OS X build instructions. Mark Morschhäuser 2014-06-21 19:24:13 +0200
  • e39cfb7968 Osx: removed plugins path detection and fixed translation path detection Fabio Bas 2014-06-21 19:09:41 +0200
  • f9554267d4 This finally fixes both make install and make package Fabio Bas 2014-06-21 19:04:42 +0200
  • 38b83acae0 Fix #105 - remove emdash from card type when getting main type Daenyth 2014-06-21 12:42:46 -0400
  • b743ba4e6e Partially revert previous commits; ensure the bundle is fixed up correctly Fabio Bas 2014-06-21 18:15:27 +0200
  • d74703f7af osx: install sounds and zonebg as cockatrice's resources Fabio Bas 2014-06-21 17:28:58 +0200
  • 87d4309aaa Fix qt.conf file creation for "make package" Fabio Bas 2014-06-21 17:28:27 +0200
  • 501ef1306b Workaround permission problem in ixup_bundle Fabio Bas 2014-06-21 16:59:31 +0200
  • 51b4eae8af Merge remote-tracking branch 'origin/master' into feature-cpack Gavin Bisesi 2014-06-21 10:09:03 -0400
  • f6f6b5aa02 Merge remote-tracking branch 'upstream/master' into feature-cpack Fabio Bas 2014-06-21 16:08:33 +0200
  • 9edd96c05c Merge remote-tracking branch 'upstream/master' into feature-cpack Fabio Bas 2014-06-21 15:14:30 +0200
  • c3ad6b1f69 Merge pull request #85 from ctrlaltca/mtgjson-importer Gavin Bisesi 2014-06-21 08:13:11 -0400
  • d7a962c055 CMake: support fir linking against qt5 Fabio Bas 2014-06-21 14:12:55 +0200
  • 0ec5842c3f Add an unexposed config value for the AllSets.json file url Fabio Bas 2014-06-21 12:10:04 +0200
  • 17f7fe7ad9 Don't lock the UI if the loaded file was not readable Fabio Bas 2014-06-21 11:41:31 +0200
  • 1edc34f086 Add an option to force selection of save path Fabio Bas 2014-06-21 11:37:46 +0200
  • bb9a79f83b Rename the finish/done button as "Save" Fabio Bas 2014-06-21 11:25:24 +0200
  • c6078c384c Strip { } around mana cost Fabio Bas 2014-06-21 11:18:41 +0200
  • 075c743a17 Sets: case insensitive sorting Fabio Bas 2014-06-21 11:11:49 +0200
  • 53de2db89c Clean up code leftovers Fabio Bas 2014-06-21 11:04:52 +0200
  • 8d283a5a98 Merge branch 'Daenyth-mtgjson-importer' into mtgjson-importer Fabio Bas 2014-06-21 10:57:24 +0200
  • 3ff19b4968 Merge branch 'mtgjson-importer' of https://github.com/Daenyth/Cockatrice into Daenyth-mtgjson-importer Fabio Bas 2014-06-21 10:56:59 +0200
  • 26f1db5dda Merge remote-tracking branch 'upstream/master' into mtgjson-importer Fabio Bas 2014-06-21 10:50:23 +0200
  • 53d2b82e61 Use picUrl templates to download cards. Daenyth 2014-06-21 01:12:47 -0400
  • 8281f63134 Add settings fields for pic urls Daenyth 2014-06-20 22:10:26 -0400
  • fa52ed00a3 Merge branch 'master' into mtgjson-importer Daenyth 2014-06-20 20:43:19 -0400
  • 05f46011eb Fix toLatin1() changes from 6fa94dd to toUtf8(). Mark Morschhäuser 2014-06-20 18:16:46 +0200
  • 0721f5b416 Qt5: QtWidgets as a Separate Module Mark Morschhäuser 2014-06-20 16:56:15 +0200
  • 6fa94dd475 Qt5: toAscii() and fromAscii() Methods are deprecated Mark Morschhäuser 2014-06-20 16:55:26 +0200
  • a903c231f2 Qt5: QDesktopServices::storageLocation deprecated Mark Morschhäuser 2014-06-20 16:54:46 +0200
  • 648a6a3884 Qt5: QUrl addQueryItem moved to QUrlQuery Mark Morschhäuser 2014-06-20 16:53:45 +0200
  • 032c41f3d5 Merge pull request #93 from VanNostrand/doc Gavin Bisesi 2014-06-20 07:53:12 -0400
  • 3863a05f49 Updated Windows build howto. Mark Morschhäuser 2014-06-20 09:59:45 +0200
  • da4c25597e Merge pull request #61 from VanNostrand/win32 Gavin Bisesi 2014-06-19 22:56:18 -0400
  • 3401098e63 Revert "Merge pull request #89 from dylan/master" Daenyth 2014-06-19 22:11:20 -0400
  • 40f9536224 Rewrite oracle as a wizard Fabio Bas 2014-06-19 16:49:38 +0200
  • a22a703fe8 Merge branch 'win32' of https://github.com/VanNostrand/Cockatrice into win32 Mark Morschhäuser 2014-06-18 13:44:37 +0200
  • 0497239cef Added MSVC compiler flags to cmake file. Mark Morschhäuser 2014-06-18 13:42:14 +0200
  • 391e480d7a Restored MSVC linkflags after cmake update. Mark Morschhäuser 2014-06-18 12:11:58 +0200
  • 929bcb55da Fixed bug in filtertree.cpp Mark Morschhäuser 2014-06-18 12:10:15 +0200
  • 8708c96695 Merge remote-tracking branch 'origin/master' into win32 Mark Morschhäuser 2014-06-18 12:09:32 +0200
  • 552a8e0c23 Merge pull request #89 from dylan/master Gavin Bisesi 2014-06-17 19:48:12 -0400
  • d0f3ae6c80 Merge pull request #87 from Daenyth/offline-buddy Gavin Bisesi 2014-06-17 15:17:53 -0400
  • f3a57d5506 Import data from mtgjson's allsets.xml Fabio Bas 2014-06-16 00:27:33 +0200
  • b749ddbc45 Add the ability to friend/ignore an offline user Daenyth 2014-06-15 14:59:54 -0400
  • 74163dba5d Merge pull request #86 from VanNostrand/doc Gavin Bisesi 2014-06-15 08:11:02 -0400
  • f042b80e0f Updated Usermanual.pdf Mark Morschhäuser 2014-06-15 10:43:04 +0200
  • 06f25ff546 Removed pthread information due to fixes in the buildsystem. Mark Morschhäuser 2014-06-15 10:41:23 +0200
  • 901b0d51d5 Slightly changed two captions. Mark Morschhäuser 2014-06-15 10:40:12 +0200
  • 6913f2bb4e Merge branch 'master' into musty Daenyth 2014-06-14 19:06:49 -0400
  • 0d3ec71e8f Merge splitter cards into a single card Fabio Bas 2014-06-14 16:47:36 +0200
  • 0aa647e205 Merge branch 'mtgjson-importer' of https://github.com/ctrlaltca/Cockatrice into mtgjson-importer Fabio Bas 2014-06-14 16:37:50 +0200
  • 62cfa74d08 Keep gatherer as image source; mtgimage as a hq alternative Fabio Bas 2014-06-14 12:11:03 +0200
  • f562f3ef06 Use mtgimage.com for card images Fabio Bas 2014-06-14 12:02:34 +0200
  • 4ff225cc3b Fix import of P/T; misc optimizations Fabio Bas 2014-06-14 11:52:55 +0200
  • f8a6f74211 Corrections to sets.xml for mtgjson.com Fabio Bas 2014-06-14 11:34:52 +0200
  • dfbcace05b OracleImporter: use json to parse cards in sets Fabio Bas 2014-06-14 11:34:06 +0200