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

193 commits

Author SHA1 Message Date
ctrlaltca
4f30b5cd31 Merge pull request #1921 from ctrlaltca/number 
Implemented !setnumber!
 2016-04-11 15:16:25 +02:00
Fabio Bas
8c17e2d12a Implemented !setnumber! 
fix #1741
 2016-04-08 22:22:22 +02:00
Fabio Bas
2e7298d064 Fix english language in options 2016-04-08 19:34:28 +02:00
Fabio Bas
1e3fb6c6e1 Rework "paths" settings loading and card database loading 
* main.cpp: removed path checking and db loading
 * card database: merge card loading methods into a single one
 * settings cache: take care of returning safe paths for decks,
replays, etc..
 * main window: if db loading fails (eg. first run), propose to run
oracle

NSIS: propose to run cockatrice instead of oracle

Rework card database loading

 * Move carddatabase-related method out of deckeditor tab
 * Load cards in another thread and render them progressively
 * Optimize database reload after enabled sets change

Fix deck editor column width

 * removed the noCard hack.
 * getCard() no more creates cards instead of just returning existing
ones
 * Fix the “edit tokens” dialog.
 * PictureLoader: avoid trying to download twice the same card
 * PictureLoader: correct return of card background
 * AbstractCardItem: avoid recalculating card color at every paint

Use a different file to save custom tokens

Misc required improvements

 * Use nullptr;
 * Refactor CardInfoWidget to use CardInfoPicture and CardInfoText
instead of duplicating code;
 * Added CardInfo::getColorChar()
 * Fixed some potential crashes
 * removed dead code related to CardInfoWidget
 * Don't require a restart after adding a new custom sets file
 * Bump CMake requirements to 3.1
 2016-03-15 22:27:55 +01:00
Zach
36c3536e0c Merge pull request #1721 from ctrlaltca/speedup 
Misc speedups in card database
 2016-01-15 18:43:01 -05:00
Fabio Bas
bacb289eff Oracle: follow redirects 2016-01-15 16:07:26 +01:00
Zach H
ad0334e734 mtgjson now secure 2016-01-14 17:32:25 -05:00
Fabio Bas
fddcbb8296 Lazy loading of card database view => faster startup times 2015-12-28 15:26:10 +01:00
Fabio Bas
4b1c59424e Implement reverse-related tag for cards 2015-12-26 19:57:20 +01:00
Fabio Bas
4d7795ca3a Split pictuloader out of carddatabase 2015-12-26 16:40:17 +01:00
Fabio Bas
bab4a51ebb CPack: Debian package 2015-10-13 22:16:00 +02:00
Zach
d5adec53a2 Revert "Reimplemented PictureLoader as a singleton" 2015-09-23 03:17:33 -04:00
Fabio Bas
f6c7f3355f Reimplemented PictureLoader as a singleton 
* Removed remaining picture handling from card database and cardinfo
 * removed the “noCard object” hack
 2015-09-22 23:09:53 +02:00
marco
44fefc20c2 Fix portable on OSX 2015-09-03 19:47:07 +02:00
marco
baa61d0571 Merge branch 'master' into Refactor-settings 
Conflicts:
	oracle/CMakeLists.txt
 2015-09-01 21:28:53 +02:00
Fabio Bas
6d7baec37b Merge with master 2015-08-31 22:55:46 +02:00
Fabio Bas
5cfb034452 merged with master 2015-08-31 22:48:14 +02:00
tooomm
5d8d2f277c oxford compliance 
@ZeldaZach grammar nazi :) 👍
 2015-08-27 15:55:22 +02:00
tooomm
17665aad60 fixed alignment 
nice alignment over strict tabbing
 2015-08-27 14:55:19 +02:00
tooomm
f18f136d2b text adjustments 
- removed some info text since oracle imports all cards now and no longer offers sets selection
- added info about token
- `<br/>` --> `\n`
- capitalized `URL` --> http://www.oxforddictionaries.com/definition/english/URL
 2015-08-27 14:43:34 +02:00
marco
4125d690fa Fix merge & relative path for portable build 2015-08-25 20:22:31 +02:00
marco
be7efa98cf Fix relative path for image download & settings 2015-08-23 15:54:52 +02:00
marco
1e2d5b0693 Fix translate setting + Mod oracle to portable build 2015-08-23 14:14:11 +02:00
Fabio Bas
a65b2e6c94 Changed url to cockatrice's tokens repo + minor fix 2015-07-08 19:31:04 +02:00
Fabio Bas
eda55679da Implemented suggested improvements 2015-07-08 10:19:05 +02:00
Fabio Bas
24aabc4cfe Oracle: download tokens; fix #915 2015-07-07 20:06:14 +02:00
Fabio Bas
5e1566046e removed debug 2015-07-02 15:31:14 +02:00
Fabio Bas
5f28dff30e Fix #1188 2015-07-02 09:22:05 +02:00
Fabio Bas
aed20324da reverted #163 2015-06-23 21:45:08 +02:00
Fabio Bas
f95fe57c1b Import split cards of any size; fix #181 2015-06-23 21:42:25 +02:00
Fabio Bas
6afc6cc4fd Cleaned and commented code 2015-06-23 19:36:40 +02:00
Fabio Bas
a1d28736d7 Oracle remove old code handling split cards; fix #382 2015-06-23 19:23:07 +02:00
Fabio Bas
6b8ebe54e9 Theme manager 
This is the first implementation of a theme manager. It’s a rebased and
revisited version of #792.
 2015-06-15 14:35:58 +02:00
Fabio Bas
518bda8c09 Rotate 180 degrees the art of flipped cards 2015-06-13 16:10:06 +02:00
Fabio Bas
da84bb33e1 Import related cards in the card database 2015-06-11 10:48:50 +02:00
Zach H
56c1a7f8b4 hideaway update 2015-05-21 09:45:16 -04:00
Fabio Bas
881cea27f4 Rework the way sets selection/importing works; fix #539 (rebased) 2015-04-18 18:47:09 +02:00
Fabio Bas
62d0a61717 Set cmc to 0 if not set; fix #669 2015-03-30 11:56:08 +02:00
Fabio Bas
28ec1a7186 Fix #633 
Requires #889
 2015-03-29 18:55:15 +02:00
Fabio Bas
48d588f6cd Fix #670 
Additionally, remove an unneeded split() + join() call on every card
text
 2015-03-29 17:48:59 +02:00
Fabio Bas
514c414cfc Fix oracle progressbar; fix #764 2015-02-21 10:46:16 +01:00
Fabio Bas
3c285e572c Fix compilation under win32; fix installation of lib under win32 2015-02-13 17:58:20 +01:00
Fabio Bas
e8cb260734 Fix win32 compilation without zlib 2015-02-13 16:58:55 +01:00
Fabio Bas
f80e319900 Added translations for oracle; fix #293 
Translations have been updated.
 2015-02-08 21:17:51 +01:00
Fabio Bas
06290d2326 Changed popup buttons from "Ok/Cancel" to "Yes/No" 2015-02-04 14:47:09 +01:00
Fabio Bas
917a29fac0 This error message needs to explain itself a bit better 2015-02-04 12:18:25 +01:00
Fabio Bas
4ebcfc6b34 Raise a question popup when zip parsing fails 2015-02-04 12:15:28 +01:00
Fabio Bas
781f8a6603 Oracle: support AllSets.json.zip; Fix #624 
Imported unzip methods from OSDaB-Zip project;
Adds a soft dependency on zlib to oracle; if lib if not found, oracle
will continue to compile and work but without zip support.
 2015-02-02 19:59:35 +01:00
Gavin Bises
acb9bc20c4 Fix #640 - don't add muid-0 cards to splitCards map 2015-01-29 17:09:14 -05:00
Gavin Bises
e2fe25735b Parse cmc from json and store in cards.xml 2015-01-28 20:28:38 -05:00
Gavin Bises
cbdb1b8bcd Inform user of cards.xml save location on success 2015-01-26 19:05:32 -05:00
tooomm
4963cf4618 Added text line about default selection 2015-01-26 00:59:28 +01:00
Michael Callahan
3a0c86938c Clean up a small pile of compiler warnings. 2014-12-30 15:54:38 -07:00
Fabio Bas
9cc8d8b86c Misc fixes 
ucfirst(setCode): requires oracle re-run
reorder columns
rename the “short name“ column as “set code“
ensure proper casting for releaseDate and sortKey fields (refs 00a5ed0)
 2014-12-05 08:48:33 +01:00
Fabio Bas
859adca0c7 Fixed indentation 2014-11-20 09:16:30 +01:00
Fabio Bas
ac43fa23b9 Better handle the TK set used for tokens 
Let oracle add a basic TK set in cards.xml
Unify all the code previously using the string literal “TK”
 2014-11-19 19:44:54 +01:00
Fabio Bas
cb37073828 Oracle: fetch release date and set type 
and save them in cards.xml
 2014-11-10 16:22:46 +01:00
Fabio Bas
cb055055a9 Oracle: add button to restore default download url 
Should avoid the problem explained in #414
 2014-11-09 21:15:31 +01:00
Gavin Bisesi
006451f402 Merge pull request #238 from arxanas/no-overwrite-tokens-xml 
Fix #231: tokens.xml no longer overwritten by cards.xml.
 2014-10-06 11:34:58 -04:00
Gavin Bisesi
48817ed283 Merge pull request #314 from ctrlaltca/win32_setup_fix 
Fix oracle under windows
 2014-10-02 10:35:22 -04:00
Fabio Bas
98e5211ad5 Fix oracle under windows 2014-09-15 16:15:27 +02:00
Peng Liu
3cd6cc9195 Added the location Oracle attempted to save cards.xml to the failure message. 2014-09-15 06:32:46 -04:00
Peng Liu
9a934f3a43 Fixed a bug that caused Oracle to be stuck in an infinite loop if the default path checkbox was checked but failed to write. 2014-08-15 01:09:21 -04:00
Gavin Bisesi
0bb0530a31 Merge pull request #245 from pliu037/oracle-cards-path 
Oracle cards.xml path
 2014-08-11 10:13:38 -04:00
Peng Liu
3375d45571 Logically inverted the if... else statement by removing the logical not (!). Cleaned up a ;;. 2014-08-07 12:58:03 -04:00
Gavin Bisesi
ab7d70a9c8 Merge pull request #263 from ctrlaltca/oracle_icon 
Add icon to oracle
 2014-08-07 12:00:46 -04:00
Fabio Bas
40e9735678 Add icon to oracle 2014-08-07 17:27:15 +02:00
Waleed Khan
c0d4669088 Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml 
Conflicts:
	cockatrice/src/carddatabase.cpp
 2014-08-07 11:06:41 -04:00
Fabio Bas
2e051c3fd7 add success notification to oracle 2014-08-07 16:10:57 +02:00
Peng Liu
605479694d Removed some redundant code. Factored out translations. 2014-08-05 08:50:42 -04:00
Peng Liu
8be4a14fcc Before: If default is checked, Oracle will always save to the AppData path. 
If a path to cards.xml is set, Oracle will update that cards.xml.
If Oracle is run before a path to cards.xml is set, if default is checked, cards.xml will be saved on the AppData path. Furthermore, this path will be set as the cards.xml path for both Oracle and Cockatrice.
If Oracle is run before a path to cards.xml is set, if default is NOT checked, cards.xml will be saved at the selected path and this path will be set as the cards.xml path for both Oracle and Cockatrice.
If a path to cards.xml is set, if default is NOT checked, cards.xml will be saved at the selected path but this path will NOT be set as the cards.xml path for either Oracle or Cockatrice. This allows people who already have a cards.xml (which may be customized), to still obtain clean copies of cards.xml through Oracle without overwriting their own
 2014-07-31 15:33:11 -04:00
Waleed Khan
9ba5d7968e Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml. 2014-07-29 23:46:04 -04:00
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
62ca6130d1 #include <QtConcurrent> only for qt5, qt4 has this in QtCore 2014-06-25 19:28:03 +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
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
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
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
Chia-Wei Li
01277e9ad9 Repeatly download text spoiler until a valid XML document is received 2013-12-17 19:16:00 +08:00