Commit graph

275 commits

Author SHA1 Message Date
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
Fabio Bas
74c58cc2b0 fix qt libraries bundling on osx
fix #1547
2015-10-01 23:35:54 +02:00
Fabio Bas
8e348455f9 Added appveyor script 2015-09-27 10:36:53 +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
Fabio Bas
fcc5370082 Fetched new translations 2015-09-08 19:12:41 +02:00
Fabio Bas
5951c95e81 extracted new translatable strings 2015-09-08 19:10:57 +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
Zach
e6a8fa59e3 Merge pull request #1428 from tooomm/patch-1
text adjustments in oracle
2015-08-27 12:39:00 -04:00
Fabio Bas
fcff6301ed Fetched new translations. Arrr! 2015-08-27 18:32: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
0b94b47f72 Servatrice portable + cmake options
Use -DPORTABLE=1 to build a portable version
2015-08-25 21:25:13 +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
marco
c8d59eec5e Refactred settings to use settingscache & ini files 2015-08-22 01:05:15 +02:00
marco
b0bf94e378 Shorcut read from settings 2015-08-09 12:16:52 +02:00
Fabio Bas
7e7c0ef4d2 Updated translations 2015-08-01 10:55:06 +02:00
Zach
7ebf817b17 Merge pull request #1197 from Cockatrice/cpp11 2015-07-13 13:23:18 -04: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
Gavin Bises
8ed9d35724 Update project to C++11 compilation. 2015-07-03 10:02:31 -04: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
Zach
6fd1e839df Merge pull request #1168 from ctrlaltca/oracle_hidpi
Enable HiDpi on oracle too
2015-06-28 09:41:38 -04:00
Fabio Bas
56db6cd060 Updated translations 2015-06-28 15:17:46 +02:00
ctrlaltca
4f972848a5 Merge pull request #1162 from ctrlaltca/oracle_fixes
Oracle fixes
2015-06-28 15:00:37 +02:00
Fabio Bas
a8de6d5c67 Enable HiDpi on oracle too 2015-06-25 16:02:26 +02:00
Fabio Bas
fa6e9c7344 updated translations 2015-06-24 13:26:02 +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
5975184d67 Merge pull request #1091 from ZeldaZach/oracle_hideaway 2015-05-21 14:06:20 -04:00
Fabio Bas
df83a82fa3 Removed gaelic translation from oracle, too
The cockatrice translation has been removed yesterday.
2015-05-21 19:14:31 +02:00
Zach H
56c1a7f8b4 hideaway update 2015-05-21 09:45:16 -04:00
Fabio Bas
4da1404a06 Translation updates 2015-05-20 19:43:52 +02:00
tooomm
a6970d9624 svg+png updates
-updated and cleaned up cockatrice+servatrice svg's
-added old original svg's for future adjustments
-updated cockatrice+servatrice png's

ico+icns updates

-see #925 for more details
-updated svg's as source for new icon files

bmp updates

-updated svg's as source for new installer logos

cleaned up oracle.svg

cleaned up oracle.svg /2

svg updates /2

removed sensible data

`inkscape:export-filename` removed

removed sensible data

inkscape:export-filename

removed sensible data

inkscape:export-filename

removed sensible data

inkscape:export-filename

fix

fix2
2015-04-28 16:06:36 +02:00
Fabio Bas
9e281f70ae Fetched new translations from Transifex 2015-04-24 17:19:46 +02:00
Fabio Bas
af3a3239fb Updated translations 2015-04-21 14:49:50 +02:00
Fabio Bas
881cea27f4 Rework the way sets selection/importing works; fix #539 (rebased) 2015-04-18 18:47:09 +02:00
Fabio Bas
42c0b09fbd Remove dependency on QtXml (unused) 2015-04-16 12:26:02 +02:00
tooomm
b8219ca82b oracle icon updates
- ico for win
- icns for mac
both now with several resolutions inside and high res support

mac version even included old+different logo
2015-04-08 01:23:20 +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
c3e5679604 Fetch updated translations from transifex 2015-03-26 15:13:57 +01:00
Fabio Bas
2da43b8155 fetched updated translations from transifex 2015-03-14 18:49:00 +01:00
Fabio Bas
ec8382cbb5 Fetched new translations from transifex 2015-03-07 12:45:27 +01:00
Fabio Bas
def4d50e97 Fetched new translations from transifex 2015-02-23 22:40:07 +01:00
Fabio Bas
514c414cfc Fix oracle progressbar; fix #764 2015-02-21 10:46:16 +01:00
Zach
3bf80540da Merge pull request #731 from poixen/oracle_logo
Updated oracle logo
2015-02-18 11:48:14 -05:00
Matt Lowe
cfa54e5eb8 Updated to 48x48 2015-02-18 16:58:32 +01:00
ctrlaltca
e4147e6476 Merge pull request #738 from ctrlaltca/zip_win32
Fix zip support in oracle under win32; fix #736
2015-02-13 19:05:57 +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
798dc09fe6 Translation updates to support Transifex
* ignore .tx folder
 * cmake: when UPDATE_TRANSLATIONS=ON, extract new strings only to the
english translation file.
 * added info in CONTRIBUTING.md
 * updated english translations
2015-02-13 15:56:17 +01:00
Matt Lowe
d1fa7a1075 Vacuumed defs 2015-02-12 14:45:30 +01:00
Matt Lowe
3f49e3f82e Updated logo
Updated logo
2015-02-12 13:39:01 +01:00
Jaeic Lee
64a436be6c Slightly updated Korean Translation
Consistency for certain affixes
2015-02-09 16:54:36 +09:00
Jaeic Lee
c94e5f1186 Updated Korean translation
Added new strings for Cockatrice
New Oracle translation
Cleaned up vanished strings
2015-02-09 16:38:52 +09:00
Fabio Bas
f80e319900 Added translations for oracle; fix #293
Translations have been updated.
2015-02-08 21:17:51 +01:00
Fabio Bas
40386a3415 Don't require lib, it's optional 2015-02-08 00:58:36 +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
ctrlaltca
16bbc5e8c0 Merge pull request #516 from mcallahan/compilation-warnings
Clean up a small pile of compiler warnings.
2015-01-01 14:32:53 +01:00
Michael Callahan
3a0c86938c Clean up a small pile of compiler warnings. 2014-12-30 15:54:38 -07:00
Fabio Bas
54ce135e0c Optimize qt plugins installation
* Always install “release” plugins
 * install only plugins actually used
2014-12-28 22:21:45 +01: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
Gavin Bisesi
a320af70da Merge pull request #418 from ctrlaltca/osx_info_plist
OSX: Add proper infos to info.plist
2014-11-09 17:34:35 -05:00
Fabio Bas
c0ee060af4 Fixed vendor name 2014-11-09 23:14:36 +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
Fabio Bas
a716d73a42 OSX: Add proper infos to info.plist
fixes #411
2014-11-09 21:03:10 +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