aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add feature list requirement (#3287)

Browse source 
* add feature list requirement

* version update

* version bump
This commit is contained in:
Zach H 2018-06-17 18:06:12 -04:00 committed by GitHub
parent d36f86c523
commit e147bd6cea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.appveyor.yml
View file

@ -1,4 +1,4 @@
version: 2.5.2-branch-{branch}-build-{build}
version: 2.6.0-branch-{branch}-build-{build}
# Skipping commits affecting specific files (GitHub only).
# More details here: https://www.appveyor.com/docs/appveyor-yml and https://www.appveyor.com/docs/how-to/filtering-commits

2
CMakeLists.txt
View file

@ -34,7 +34,7 @@ endif()
# A project name is needed for CPack
# Version can be overriden by git tags, see cmake/getversion.cmake
PROJECT("Cockatrice" VERSION 2.5.2)
PROJECT("Cockatrice" VERSION 2.6.0)
# Use c++11 for all targets
set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ ISO Standard")

1
common/featureset.cpp
View file

@ -23,6 +23,7 @@ void FeatureSet::initalizeFeatureList(QMap<QString, bool> &featureList)
featureList.insert("mod_log_lookup", false);
featureList.insert("idle_client", false);
featureList.insert("forgot_password", false);
featureList.insert("2.6.0_min_version", false); // This is temp to force users onto a newer client
}
void FeatureSet::enableRequiredFeature(QMap<QString, bool> &featureList, QString featureName)