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 |
|
Fabio Bas
|
634dd91b66
|
Set some cmake policies to mute cmake warnings
|
2014-06-26 20:19:47 +02: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 |
|
Fabio Bas
|
07ed519a25
|
Apply the patch in the previous commit globally
|
2014-06-25 19:12:38 +02:00 |
|
Fabio Bas
|
382a382c70
|
Maybe workaround buggy cmake module
|
2014-06-25 18:50:58 +02:00 |
|
Fabio Bas
|
4e4401a9e2
|
maybe fix travis build for ubuntu
|
2014-06-25 18:39:26 +02:00 |
|
Fabio Bas
|
567a6db184
|
Merge remote-tracking branch 'upstream/master' into cmake_qt5
|
2014-06-25 18:38:02 +02:00 |
|
Gavin Bisesi
|
bda01b2044
|
Install dependencies for travis more generally
|
2014-06-25 11:48:48 -04:00 |
|
Gavin Bisesi
|
2d400e55c7
|
Add OSX build flag to travis yml
|
2014-06-25 11:33:40 -04:00 |
|
Gavin Bisesi
|
0e7a5e582c
|
Merge pull request #129 from VanNostrand/doc
Recompiled usermanual.
|
2014-06-25 10:12:12 -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
|
c4458b16b2
|
Qt5: fix plugin installation
|
2014-06-25 15:53:25 +02:00 |
|
Fabio Bas
|
809f390e2f
|
Merge remote-tracking branch 'upstream/master' into cmake_qt5
|
2014-06-25 15:46:50 +02:00 |
|
Mark Morschhäuser
|
312acb3402
|
Recompiled usermanual.
|
2014-06-25 09:16:00 +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
|
1c9540befa
|
Set cmake module path to local for findqtmobility
|
2014-06-25 01:48:30 -04:00 |
|
Daenyth
|
0eb00fe39c
|
Add build-essential to travis cfg
This can't be causing the failure can it? It can't find QtMultimedia..
|
2014-06-25 01:31:43 -04:00 |
|
Daenyth
|
5ea59908a8
|
Cache apt for travis
|
2014-06-25 01:29:06 -04:00 |
|
Daenyth
|
8a331e30c6
|
Don't install qtmultimedia - not needed
|
2014-06-25 01:24:14 -04:00 |
|
Daenyth
|
44445704e7
|
Install qt-multimedia-dev for travis
|
2014-06-25 01:21:24 -04:00 |
|
Daenyth
|
ba1fc86f29
|
Install qt dep for travis
|
2014-06-25 01:18:52 -04:00 |
|
Daenyth
|
478c7f234f
|
Set up dependencies for travis
|
2014-06-25 01:17:12 -04:00 |
|
Daenyth
|
0dd4661b7c
|
Add travis build icon to README
|
2014-06-25 01:14:43 -04:00 |
|
Daenyth
|
0b87821497
|
Add rough draft for .travis.yml
|
2014-06-25 01:08:41 -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
|
bab340f7b7
|
Reworked a bit message handling from previous commit
|
2014-06-24 18:52:04 +02:00 |
|
Fabio Bas
|
2953c6ba2a
|
Ported servatrice
|
2014-06-24 18:42:46 +02:00 |
|
Fabio Bas
|
80f68306b5
|
Ported oracle to Qt5
|
2014-06-24 18:28:09 +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
|
02fb28eb9b
|
Merge branch 'master' into windows-nsis-fix
|
2014-06-23 23:16:20 -04:00 |
|
Daenyth
|
632e7f487c
|
Add debugging to file for windows
|
2014-06-23 23:15:53 -04:00 |
|
Daenyth
|
e925403bc5
|
Log cardname when downloading
|
2014-06-23 22:18:40 -04:00 |
|
Daenyth
|
fc599972f3
|
Write to APPDATA/Cockatrice, not APPDATA
|
2014-06-23 21:25:09 -04:00 |
|
Daenyth
|
f1e6aebaba
|
Set cockatrice path settings to use appdata instead of instdir
Putting user stuff in program files is bad
|
2014-06-23 21:21:08 -04:00 |
|
Daenyth
|
f7635f9e49
|
Don't recursive remove program files/cockatrice.
This should prevent deleting old deck files
|
2014-06-23 21:12:25 -04:00 |
|
ctrlaltca
|
36e4b84ba7
|
Merge pull request #2 from Daenyth/feature-cpack
Check for path creation failure
|
2014-06-23 08:43:07 +02:00 |
|
Daenyth
|
ea08fe168c
|
Fix Q_INTERFACES warnings
Fix #88
|
2014-06-22 22:32:53 -04:00 |
|