jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-04 20:43:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework "paths" settings loading and card database loading

Browse source 
* 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
This commit is contained in:
Fabio Bas 2016-03-10 15:33:53 +01:00
parent 0b8f52e084
commit 1e3fb6c6e1
41 changed files with 855 additions and 1074 deletions
Download patch file Download diff file Expand all files Collapse all files

13
travis-dependencies.sh
View file

@ -11,9 +11,10 @@ if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
brew upgrade cmake
else
# common prerequisites
sudo add-apt-repository -y ppa:smspillaz/cmake-master
sudo apt-get update -qq
sudo apt-get -y purge cmake
sudo apt-get install -y libprotobuf-dev protobuf-compiler cmake bc
if (( QT4 )); then
@ -28,15 +29,7 @@ else
# prerequisites for tests
if [[ $BUILDTYPE == "Debug" ]]; then
if [[ $DIST == "precise" ]]; then
sudo add-apt-repository -y ppa:george-edison55/precise-backports
sudo apt-get update -qq
sudo apt-get install -y cmake cmake-data libgtest-dev
else
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
sudo apt-get update -qq
sudo apt-get install -y cmake cmake-extras libgtest-dev
fi
sudo apt-get install -y libgtest-dev
sudo mkdir /usr/src/gtest/build
cd /usr/src/gtest/build