Skip to content

Commit

Permalink
Version 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
deathkiller committed Nov 5, 2023
1 parent c964c7d commit 26df132
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set(NCINE_APP_DESCRIPTION "Open-source reimplementation of Jazz Jackrabbit 2")
set(NCINE_APP_DESCRIPTION_FULL "Jazz² Resurrection is reimplementation of the game Jazz Jackrabbit 2 released in 1998. Supports various versions of the game (Shareware Demo, Holiday Hare '98, The Secret Files and Christmas Chronicles). Also, it partially supports some features of JJ2+ extension and MLLE.\n\nFurther information can be found here: http://deat.tk/jazz2/")
set(NCINE_APP_VENDOR "Dan R.")
set(NCINE_REVERSE_DNS "jazz2.resurrection")
set(NCINE_VERSION "2.1.0")
set(NCINE_VERSION "2.2.0")

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
get_filename_component(PARENT_SOURCE_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
Expand Down
2 changes: 1 addition & 1 deletion Sources/Common.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# define NCINE_APP_NAME "Jazz² Resurrection"
#endif
#if !defined(NCINE_VERSION)
# define NCINE_VERSION "2.1.0"
# define NCINE_VERSION "2.2.0"
#endif
#if !defined(NCINE_LINUX_PACKAGE)
# define NCINE_LINUX_PACKAGE NCINE_APP_NAME
Expand Down
8 changes: 4 additions & 4 deletions Sources/Resources.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2, 1, 0, 0
PRODUCTVERSION 2, 1, 0, 0
FILEVERSION 2, 2, 0, 0
PRODUCTVERSION 2, 2, 0, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
Expand All @@ -21,12 +21,12 @@ VS_VERSION_INFO VERSIONINFO
BLOCK "000004b0"
{
VALUE "CompanyName", "Dan R."
VALUE "FileVersion", "2.1.0.0"
VALUE "FileVersion", "2.2.0.0"
VALUE "InternalName", "Jazz2"
VALUE "LegalCopyright", "© 2016-2023 Dan R."
VALUE "OriginalFilename", "Jazz2.exe"
VALUE "ProductName", "Jazz² Resurrection"
VALUE "ProductVersion", "2.1.0.0"
VALUE "ProductVersion", "2.2.0.0"
VALUE "FileDescription", "Jazz² Resurrection: Open-source reimplementation of Jazz Jackrabbit 2"
}
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/nCine/Backends/Android/AndroidInputManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ namespace nCine
LOGI("Device (%d, %d) - Axes%s", deviceId, joyId, deviceInfoString);
#endif
if (numAxes >= 4) {
// Android sometimes returns strange range for the first axis, all other axes are fine
// Android sometimes returns strange range for the first two axes, all other axes are fine
if (std::abs(joyState.axesMinValues_[0]) < 0.01f && joyState.axesRangeValues_[0] > 128.0f &&
std::abs(joyState.axesMinValues_[1]) < 0.01f && joyState.axesRangeValues_[1] > 128.0f &&
joyState.axesMinValues_[2] == -1.0f && joyState.axesRangeValues_[2] == 2.0f &&
Expand Down

0 comments on commit 26df132

Please sign in to comment.