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

1520 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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