Fabio Bas
9ca5908de5
Create an enum for price sources
...
Probably settingscache would have been the correct place for the enum,
but keeping it in the same class/file where price sources are defined
sounds cleaner to me
2014-07-02 21:42:04 +02:00
Fabio Bas
a9ffbf5d2d
use a signal instead of calling QMetaObject::invokeMethod
2014-07-02 21:41:52 +02:00
Gavin Bisesi
fb4a7b3274
Give more friendly login error message
2014-07-01 12:04:33 -04:00
arxanas
7cbe410172
Fix #45 : don't send tokens to deckstats.
2014-06-30 03:08:55 -04:00
Fabio Bas
922e98af67
Add pricing from deckbrew.com
...
* the previous PriceUpdater class has become abstract
* BLPPriceUpdater inherits the old code for blacklotusproject.com
* DBPriceUpdater is a new implementation for deckbrew.com
* add a setting to choose between the two
2014-06-29 23:33:03 +02:00
Daenyth
4d6f46b06e
Change client ping send interval to 9 sec
2014-06-29 14:46:06 -04:00
Fabio Bas
d86fa410df
Chat room: ensure focus on the input line
2014-06-29 19:32:03 +02:00
Fabio Bas
27bd00bec8
Direct chat: ensure focus is on the input line; fixes #113
2014-06-29 19:29:45 +02:00
Daenyth
09d6d26fb2
Merge branch 'master' into cmake_qt5
...
Conflicts:
cockatrice/src/main.cpp
2014-06-28 09:13:10 -04:00
Daenyth
8d31fe6cbc
Clean up deck load chat message
2014-06-28 09:04:45 -04:00
Daenyth
4c2a553f03
Have servatrice inform players of sideboard size
...
Ref #142
2014-06-28 00:36:43 -04:00
Daenyth
6d3fe428e7
Fix some warnings
...
Ref #127
2014-06-27 22:19:23 -04:00
Daenyth
1d02e0d5ec
Clarify comment about typedef for OSX compiling
2014-06-27 20:00:29 -04:00
Fabio Bas
54805fb14e
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-06-27 15:21:01 +02:00
arxanas
080fd326ed
Fixed #131 : Compiles on OS X now.
2014-06-26 16:57:47 -04:00
Daenyth
144bb7fa89
Merge remote-tracking branch 'origin/invalid-windows-paths'
2014-06-25 20:26:46 -04:00
Gavin Bisesi
fcc62a1e1f
Use defined(Q_OS_WIN) in #elif to satisfy MSVC
...
It's always windows.
2014-06-25 17:09:17 -04:00
Fabio Bas
2354ed6909
Require Qt4 >=4.8.0; remove some ifdefs on qt version
2014-06-25 16:00:48 +02:00
Fabio Bas
809f390e2f
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-06-25 15:46:50 +02:00
Fabio Bas
7035150351
Deckstats: move QUrl handling into its own function; better separation of qt4/qt5 code
2014-06-25 09:07:02 +02:00
Daenyth
aee86ce45a
Mark QGraphicsItem for AbstractGraphicsItem
2014-06-25 01:53:19 -04:00
Daenyth
d811fee2f3
Include missing qdebug
...
Dunno how I missed that.
Fix #128
2014-06-25 00:11:55 -04:00
Gavin Bisesi
65f59747c9
Merge pull request #116 from ctrlaltca/feature-cpack
...
Use cpack to create osx's dmg
2014-06-24 21:08:57 -04:00
Daenyth
df659e58fe
Mask set shortcodes for windows illegal filenames
...
Ref #122
2014-06-24 20:49:03 -04:00
Fabio Bas
6dbdaafb33
Ported cockatrice
2014-06-24 19:13:47 +02:00
Fabio Bas
5c13c06982
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-06-24 18:13:26 +02:00
Daenyth
e5d9692d78
Fall back to plain text load when xml load fails
2014-06-24 00:14:59 -04:00
Daenyth
0420f4f7af
Log download failures
2014-06-23 23:44:13 -04:00
Daenyth
e925403bc5
Log cardname when downloading
2014-06-23 22:18:40 -04:00
Daenyth
ea08fe168c
Fix Q_INTERFACES warnings
...
Fix #88
2014-06-22 22:32:53 -04:00
Daenyth
e5d15e8dbc
Notify deck editor when price feature setting is changed
...
Ref #112
2014-06-22 21:20:14 -04:00
Daenyth
c54f7b9245
Log on failed path copy
2014-06-22 20:14:22 -04:00
Fabio Bas
66c87a1ee6
OSX: Handle sounds for first time installations
...
If the sounds path is unset in the settings and a “sounds” directory
doesn’t exists in the user’s data directory, install the sounds files
and set the settings value accordingly
2014-06-22 23:42:12 +02:00
Fabio Bas
0b4701c42f
OSX: Handle zonebg for first time installations
...
If none of the gameboard images is set and and the user’s data
directory doesn’t contain a “zonebg” directory, create the directory,
copy contents from cockatrice’s app bundle and sets the config
accordingly.
2014-06-22 23:42:12 +02:00
Fabio Bas
55c4c464e4
OSX: get translation path from qt.conf instead of hardcoding it
2014-06-22 23:41:15 +02:00
Fabio Bas
2a5f6181aa
Osx: removed plugins path detection and fixed translation path detection
2014-06-22 23:41:15 +02:00
Gavin Bisesi
1260ccc531
Merge pull request #111 from Daenyth/better-invalid-db-ux
...
Don't be a jerk when card database isn't usable.
2014-06-22 15:28:45 -04:00
Daenyth
68c0932a2f
Don't have decklist sort behavior rely on column order
2014-06-22 08:36:35 -04:00
Daenyth
e99c1bbe6d
Merge remote-tracking branch 'origin/master' into editor-sorting-v5
2014-06-22 08:10:22 -04:00
Daenyth
27847e1551
Don't be a jerk when card database isn't usable.
...
Better error message and allow the user to still connect
Ref: #102
2014-06-21 15:53:13 -04:00
Daenyth
38b83acae0
Fix #105 - remove emdash from card type when getting main type
2014-06-21 12:42:46 -04:00
Daenyth
53d2b82e61
Use picUrl templates to download cards.
...
Add HQ card option
2014-06-21 01:12:47 -04:00
Daenyth
8281f63134
Add settings fields for pic urls
2014-06-20 22:10:26 -04:00
Daenyth
fa52ed00a3
Merge branch 'master' into mtgjson-importer
2014-06-20 20:43:19 -04:00
Mark Morschhäuser
6fa94dd475
Qt5: toAscii() and fromAscii() Methods are deprecated
2014-06-20 16:55:26 +02:00
Mark Morschhäuser
a903c231f2
Qt5: QDesktopServices::storageLocation deprecated
2014-06-20 16:54:46 +02:00
Mark Morschhäuser
648a6a3884
Qt5: QUrl addQueryItem moved to QUrlQuery
2014-06-20 16:53:45 +02:00
Mark Morschhäuser
929bcb55da
Fixed bug in filtertree.cpp
2014-06-18 12:10:15 +02:00
Mark Morschhäuser
8708c96695
Merge remote-tracking branch 'origin/master' into win32
...
Conflicts:
cockatrice/CMakeLists.txt
oracle/CMakeLists.txt
2014-06-18 12:09:32 +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
