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
woogerboy21
9ba74fee5c
Example Update
...
Renamed mysql configuration file to include example extension and set
git to ignore mysql.cnf per request.
2014-07-02 13:23:50 -04:00
woogerboy21
b27873667b
Optimization
...
Updates for performance improvements per request
2014-07-02 11:11:17 -04:00
woogerboy21
2b55170110
DB Maint Scripts
...
External shell script to help maintain the cockatrice database tables.
2014-07-01 13:11:52 -04:00
Gavin Bisesi
fb4a7b3274
Give more friendly login error message
2014-07-01 12:04:33 -04:00
Gavin Bisesi
e955732ba8
Merge pull request #163 from arxanas/vanguard-card-names
...
Fix #155 : Vanguard card names no longer conflict with regular card names.
2014-07-01 07:04:01 -04:00
arxanas
f730dca14c
Fix #155 : Vanguard card names no longer conflict with regular card names.
2014-07-01 02:29:25 -04:00
Fabio Bas
523483bccc
Add a WITH_QT4 cmake option to force the use of Qt4
2014-06-30 22:10:29 +02: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
Fabio Bas
052996b7a1
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-06-29 17:13:12 +02:00
Fabio Bas
c0981a1743
Prettier package name
2014-06-28 19:53:15 +02:00
Fabio Bas
3509df76b7
Remove old version parsing from nsis script
2014-06-28 19:48:51 +02:00
Fabio Bas
fc5a193e0d
NSIS: remove additional files on uninstall
2014-06-28 19:39:47 +02:00
Fabio Bas
fc24ffdec2
Cmake reorganization
...
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
2014-06-28 19:39:26 +02:00
Fabio Bas
e997b1d2bc
Windows: drop the old nsis script
...
cpack generates it on the fly from a template
2014-06-28 18:44:38 +02:00
Fabio Bas
803fd7c95d
Windows: Generate an nsis package on the fly with "make package"
2014-06-28 18:44:38 +02:00
Daenyth
ec3690fd29
Fix typo in gcc opts
2014-06-28 11:04:12 -04:00
ctrlaltca
29a7415f95
Merge pull request #3 from Daenyth/cmake_qt5
...
Fix merge conflicts with master in cmake_qt5
2014-06-28 15:27:51 +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
c0bd7db658
Install libgcrypt on osx travis
2014-06-27 22:57:24 -04:00
Daenyth
38aa1f60ed
Don't pass warn/err flags for release mode build.
...
It's making travis complicated
2014-06-27 22:50:21 -04:00
Daenyth
6d3fe428e7
Fix some warnings
...
Ref #127
2014-06-27 22:19:23 -04:00
Daenyth
d3b4ef38a0
Compile servatrice on travis
2014-06-27 20:42:19 -04:00
Daenyth
6da64315d2
Merge branch 'pr138'
2014-06-27 20:00:46 -04:00
Daenyth
1d02e0d5ec
Clarify comment about typedef for OSX compiling
2014-06-27 20:00:29 -04:00
Gavin Bisesi
e258f8625a
Merge pull request #121 from woogerboy21/serverlog-filtering
...
Server log filtering
2014-06-27 19:02:30 -04:00
woogerboy21
f685bd2abe
formatting
...
4 space indent + code flow rewrite for easier readability.
2014-06-27 18:18:03 -04:00
Fabio Bas
d19340a117
Windows: create nsis package using cake
2014-06-27 20:21:26 +02:00
Fabio Bas
096f200eb9
Install libraries and plugins automatically under windows
...
You won’t have to copy manually all the dlls in the release directory
anymore
2014-06-27 17:40:29 +02:00
Fabio Bas
fc8c55ae97
Added cmake policy specific for win32 compilation
2014-06-27 17:24:25 +02:00
Fabio Bas
34772cccab
Compilation fix for MSVC+Qt5
2014-06-27 17:09:09 +02: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
woogerboy21
b83fe95b05
removed extra un-needed empty line.
...
removed extra un-needed empty line.
2014-06-26 14:46:22 -04:00
woogerboy21
365de1fdd0
added multiple filter capabilities
...
changed the single qstring log filtering to qstringlist to allow multiple filtering capabilities
2014-06-26 14:38:57 -04:00
Fabio Bas
634dd91b66
Set some cmake policies to mute cmake warnings
2014-06-26 20:19:47 +02:00
woogerboy21
977cf7340a
settings update/addition
...
updated settings name (loglevel) to a more descriptive name (writelog)
added logfilters setting to allow user defined filters.
2014-06-26 00:40:21 -04:00
woogerboy21
91a96643f0
updated filtering code
...
rewrote filtering code to allow for user input
code only filters on single string at the moment (still needs updated).
2014-06-26 00:38:43 -04:00
Daenyth
fb7de2ad1d
Merge branch 'windows-nsis-fix'
2014-06-25 20:26:56 -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
62ca6130d1
#include <QtConcurrent> only for qt5, qt4 has this in QtCore
2014-06-25 19:28:03 +02:00
Fabio Bas
4e56ceb623
revert changes in .travis.yml
2014-06-25 19:13:11 +02:00
