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

160 commits

Author SHA1 Message Date
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
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