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

118 commits

Author SHA1 Message Date
tooomm
04d84f9d9a repo cleanup (#2826) 2017-08-11 21:42:45 -04:00
tooomm
5b07f6d6d8 bump version number 2017-05-06 18:21:31 +02:00
ctrlaltca
3356b2ede7 Change version in about window and installer name (#2570) 
* Change version in about window and installer name

* Change version in about window and installer name

* Cmake get version updates

* dev snapshot format changed

* alignment changes
 2017-04-20 13:41:18 +02:00
tooomm
1cc50b2793 remove travis deployment to bintray (#2516) 2017-03-19 12:58:31 -04:00
Zach H
47cafde521 fix lowercase (#2419) 
* fix lowercase

* fix changes

* fix .desktop

* servatrice .desktop
 2017-02-23 08:53:18 +01:00
skwerlman
24c95e00ed add RPM support to make package (#2373) 
use like `cmake .. -DPACKAGE_GENERATOR=RPM`
defaults to DEB
 2017-02-19 15:08:25 +01:00
woogerboy21
0cfa6863d5 Simpler forgot password functionality (#2393) 
* Simpler forgot password functionality (Server/Client)
 2017-02-15 17:41:40 -05:00
Gavin Bisesi
82742bbd47 Require Qt >= 5.4 on Windows 2016-06-11 15:53:52 -04:00
Fabio Bas
bb5292aa8d Drop Qt4, libgcrypt, qtmobility dependencies 2016-05-11 12:45:58 +02:00
Fabio Bas
a92b2ba600 CMake: add Qt-Svg to dependencies 2016-04-15 17:56:04 +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
tooomm
754e666eaa updated to new folder locations 
- `sounds` and `themes` moved into `cockatrice/`

moved subdirectory reference
`/cmakelists` to `/cockatrice/cmakelists`
 2016-02-24 15:41:04 +01:00
Fabio Bas
195ab9a150 Try to build windowsxp compatible packages 2016-02-17 15:08:56 +01:00
Fabio Bas
25d77fb64a Possibly fix #1598 2015-12-15 16:58:44 +01:00
Fabio Bas
8001b05ce7 Travis - deploy to bintray 2015-10-18 16:58:07 +02:00
Fabio Bas
bab4a51ebb CPack: Debian package 2015-10-13 22:16:00 +02:00
Fabio Bas
b63475829b Revert option from WITH_TESTS to TEST 2015-10-09 15:47:34 +02:00
Fabio Bas
7fe60279de Fix PR #1600 2015-10-09 14:59:42 +02:00
Gavin Bisesi
3ebe42c400 Add dummy googletest 
Uses the built in cmake -Dtest=ON

It should download googletest on the fly if needed.

Adds a new make target, `make test`

Ref #167
 2015-10-09 14:58:46 +02:00
Zach
d09b75a3c0 Merge pull request #1608 from ctrlaltca/travis_package 
Travis changes for package creation
 2015-10-01 14:32:24 -04:00
Fabio Bas
35815a894a Make travis build a package 2015-09-29 23:38:30 +02:00
Fabio Bas
8e348455f9 Added appveyor script 2015-09-27 10:36:53 +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
8e89b0d7ec Remove spaces and parenthesis from package names; hopefully fix #1063 2015-05-08 15:14:01 +02:00
Fabio Bas
569180799d When compiling with qt5, require at least version 5.0.3 2015-02-18 14:20:39 +01:00
Michael Callahan
3a0c86938c Clean up a small pile of compiler warnings. 2014-12-30 15:54:38 -07:00
Fabio Bas
9cfb09cd5b Possible fix for #405 2014-10-28 16:30:49 +01:00
Fabio Bas
90e90b59a3 Reverted WITH_SERVER to OFF 2014-10-10 14:23:31 +02:00
Fabio Bas
6f25e09132 Deploy openssl libraries under win32 
They are needed to fetch prices from deckbrew and possibly, in the
future, for ssl server connections
 2014-10-10 14:12:30 +02:00
Fabio Bas
e5eda9f172 Add a UPDATE_TRANSLATIONS options that actually updates translations! 2014-09-04 16:15:01 +02:00
Fabio Bas
1f0ba0ea08 Debug compilation: check flags actually supported by the compiler 2014-07-25 17:32:12 +02:00
Fabio Bas
04ad73fcdc Workaround for qt5 version compiled with -reduce-relocations 2014-07-06 23:25:44 +02:00
Fabio Bas
523483bccc Add a WITH_QT4 cmake option to force the use of Qt4 2014-06-30 22:10:29 +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
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
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
Daenyth
09d6d26fb2 Merge branch 'master' into cmake_qt5 
Conflicts:
	cockatrice/src/main.cpp
 2014-06-28 09:13:10 -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
Fabio Bas
d19340a117 Windows: create nsis package using cake 2014-06-27 20:21:26 +02:00
Fabio Bas
fc8c55ae97 Added cmake policy specific for win32 compilation 2014-06-27 17:24:25 +02:00
Fabio Bas
634dd91b66 Set some cmake policies to mute cmake warnings 2014-06-26 20:19:47 +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
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
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
Fabio Bas
5c13c06982 Merge remote-tracking branch 'upstream/master' into cmake_qt5 2014-06-24 18:13:26 +02:00
Daenyth
4574df0a2e Remove testclient cmake option. 
This has been obsolete a long time
 2014-06-22 21:25:57 -04:00
Fabio Bas
377433b5cc CPack generator; removed old prepareMacRelease.sh 
By now tested on OSX only
 2014-06-22 23:41:15 +02:00
Fabio Bas
d7a962c055 CMake: support fir linking against qt5 2014-06-21 14:12:55 +02:00
Mark Morschhäuser
0497239cef Added MSVC compiler flags to cmake file. 2014-06-18 13:42:14 +02:00
Fabio Bas
a35b62509a Handle correctly user-defined CMAKE_BUILD_TYPE 2014-06-14 10:35:18 +02:00
Fabio Bas
660ff349ab Add a proper, top-level project name 2014-06-12 23:32:12 +02:00
Fabio Bas
ddec7e6561 Create CMake options for components 2014-06-12 23:31:30 +02:00
Fabio Bas
721cf6fe4f Re-indent CMakeLists.txt using spaces 2014-06-11 18:08:30 +02:00
Fabio Bas
62f756e698 Remove pthread detection and linking: it's unused 2014-06-11 01:20:19 +02:00
Fabio Bas
4c1687264d main CMakeLists.txt: major overhaul 
* define CMAKE_INSTALL_PREFIX
* define compilation flags
* find needed libraries
* enable Qt4’s automoc
* Added comments
 2014-06-10 23:29:24 +02:00
Fabio Bas
39e2bf06f5 Merge branch 'master' into cmake-overhaul 2014-06-10 23:11:31 +02:00
Fabio Bas
79c805b835 Create sounds/zonebg CMakeLists.txt 2014-06-10 14:11:16 +02:00
Mark Morschhäuser
bf6ec478cb Dealt with SFMT compile warnings. 2014-05-18 11:10:29 +02:00
Max-Wilhelm Bruker
c65f327e71 server crash fixes 2013-01-27 15:15:27 +01:00
Max-Wilhelm Bruker
cf4bc71d57 made client / server compilation optional 2012-01-21 22:29:10 +01:00
Max-Wilhelm Bruker
e202d659a0 moc weirdness workaround on Unix, added install target 2012-01-21 22:13:27 +01:00
Max-Wilhelm Bruker
3c24899de6 switched from qmake to cmake 2012-01-21 19:21:57 +01:00