ctrlaltca
c06fc562a1
Cmake scripts refactoring; fix #3225 ( #3230 )
...
* fix #3225
* Servatrice: use websockets as an optional component (for qt < 5.3)
* Attempt++
2018-05-12 23:28:22 +02:00
ctrlaltca
a7f4aace9c
Extract the xml parser from carddatabase ( #3223 )
2018-05-04 03:46:08 -04:00
David Szabo
9727699e26
braces are only left for split cards ( #3217 )
...
* braces are only left for split cards
* condition for braces modified
2018-05-02 21:20:58 -04:00
ctrlaltca
2780270911
macOS: fix qt plugin installation ( #3216 )
...
* Osx: fix qt plugin installation
* Add make install step to travis debug build
* only install under osx
* Add "styles" plugins (for native look'n'feel)
* Osx: upgrade qt from 5.5 to current (5.10.1)
* Fix osx on travis
The qt homebrew formula now installs three qt* symlinks (qt, qt5, qt5@5.x) so we can't use/don't need bash globbing anymore
2018-05-02 15:57:35 -04:00
Zach H
1fbdea0f35
translation updates ( #3200 )
2018-04-16 02:42:58 -04:00
David Szabo
2a9d76f090
Colors on split cards sorted in WUBRG order ( #3128 )
2018-03-07 20:26:47 -05:00
Zach H
5859fa2f20
translation updates ( #3124 )
2018-03-02 16:50:10 -05:00
Vafthrudnir
65ef66cfa7
Braces left in for split mana costs in xml ( #3108 )
2018-02-13 22:37:24 -05:00
Vafthrudnir
c8a10a9997
Mnemonic created
2018-02-14 02:40:46 +01:00
Vafthrudnir
4e8a09517c
Button text changed to "Save" from "Next"
2018-02-14 02:36:54 +01:00
Vafthrudnir
8084ab605f
Tablerow fixed for non-mana generating artifacts ( #3104 )
2018-02-12 18:04:11 -05:00
Vafthrudnir
3426a6b201
'Rarity' property added to split cards in xml ( #3102 )
2018-02-09 23:45:59 +01:00
Vafthrudnir
a0d6a342d3
Loyalty filter added ( #3087 )
2018-02-07 11:33:01 -05:00
Zach H
8a8b580501
translations ( #3078 )
2018-02-05 12:22:49 -05:00
ctrlaltca
517420cccb
Replace CardInfo* and Carset* with smart pointers ( #3053 )
...
* Replace CardInfo* and Carset* with smart pointers
* fixes to help memory & c++11 stuff
2018-02-02 12:52:47 -05:00
ctrlaltca
b29bd9e070
Clang-format ( #3028 )
...
* 1/3 Add .clang-format file and travis compilation check
* 2/3 Run clang-format
* 3/3 Fix compilation problems due to include reordering
* 3bis/3 AfterControlStatement: false
2018-01-27 10:41:32 +01:00
Zach H
d19744236e
Automatic Spoiler Season ( #2991 )
...
* oracle now can be run in spoiler or normal mode
* tests for travis
* only run on relaunch
* spoilers in client (not oracle now) and tray icon shows when done
* spoiler status will be checked before downloading spoiler file
* only download if they care about spoilers
* reload db on spoiler download
* manual update button, code cleanup, and fix enabling sets when new
* cleanup, nullchecks, and fixes to spoiler
* reload DB even if not in spoiler season; necessary as we have a check elsewhere to prevent the reload if spoiler check happens
* Implement changes from 2991#issuecomment-356169374
* Change implicit nullptrs, alert on file deletion, minor changes
* make reload thread safe and minor changes from 2991#issuecomment-356450302
* Fix locking
* Disable update now button while process running
2018-01-10 13:27:43 -05:00
tooomm
7e80f4b4ae
oracle: fix wording for token download ( #2946 )
2017-12-15 15:42:30 -05:00
Kyle Grammer
6e24f59826
Fixing split card from UNH with wrong name in database ( fix #2947 ) ( #2949 )
2017-12-15 15:37:32 -05:00
tooomm
b615b5b33e
Translation Updates ( #2918 )
2017-11-19 15:11:37 -05:00
ctrlaltca
6b6ba9a8f1
Update translations ( #2890 )
...
* Translations
* update and test codacy change
2017-10-09 19:16:23 +02:00
ctrlaltca
ccee0aa3fd
Cmake: remove old unneeded POLICIES (fix Appveyor) ( #2859 )
2017-09-22 17:47:05 +02:00
tooomm
af3423e67d
split up string and argument ( #2822 )
2017-08-06 20:51:54 -04:00
John Hill
7c8daf68ea
Add version label to Oracle Importer ( #2818 )
2017-08-06 14:03:19 -04:00
ctrlaltca
1366e5970e
Portable mode for windows ( #2794 )
...
* Portable mode for windows
* fix start menu in portable mode
* Make gcc an happy puppy
* Clean old installation if we are installing over an old portable mode installation
* Default to Desktop\CockatricePortable
* Settings dialog fixes
* wording
2017-07-08 11:22:29 +02:00
Psithief
ae15f5df06
Handling of tokens/related cards improved. ( #2773 )
2017-06-20 18:35:06 -04:00
tritoch
23d27cff77
Handle 'aftermath' cards like 'split' cards ( #2626 )
2017-04-22 14:36:22 -04:00
Zach H
657e1ac9e6
fix c style casting ( #2561 )
2017-04-05 15:45:58 -04:00
Zach H
ef7670a1e6
translation file updates ( #2559 )
...
* translation file updates
* translation updates
2017-03-31 15:29:43 -04:00
ctrlaltca
6e723b2a99
translations ( #2469 )
2017-03-14 00:04:26 +01:00
ctrlaltca
160c4cea6b
Translations ( #2430 )
2017-03-01 10:18:56 +01:00
ctrlaltca
7373819c32
Add release channels for autoupdater ( #2362 )
...
Fetch releases from github and find corresponding installers on bintray
2017-03-01 09:43:09 +01:00
Zach H
47cafde521
fix lowercase ( #2419 )
...
* fix lowercase
* fix changes
* fix .desktop
* servatrice .desktop
2017-02-23 08:53:18 +01:00
ctrlaltca
a1840ea9d3
translations galore ( #2245 )
2016-10-29 11:31:35 +02:00
Fabio Bas
0e8206a36f
Updates translations
2016-09-20 22:23:36 +02:00
Fabio Bas
670f55bc28
Translations update
2016-06-30 15:26:52 +02:00
Fabio Bas
1bc56e1c86
Fix some translation issues
...
Fix #2010
2016-06-15 22:17:31 +02:00
Zach H
829c96673b
Add rarity filter to deck editor
2016-05-31 03:33:56 -04:00
Fabio Bas
bb5292aa8d
Drop Qt4, libgcrypt, qtmobility dependencies
2016-05-11 12:45:58 +02:00
Fabio Bas
af3b4ded22
Update translations
2016-04-25 18:45:24 +02:00
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
e9736d298e
Translations update
2016-04-05 19:35:24 +02:00
Fabio Bas
a55b3784eb
cmake: Enable c++11 for all targets
2016-03-21 11:42:38 +01: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
Fabio Bas
50dde5dde1
Some updated translations from transfix
2016-02-02 22:04:49 +01:00
Fabio Bas
7c128f69b0
Updated translations
2016-01-29 00:30:54 +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
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
