Up version number to v0.6.1
This commit is contained in:
parent
5729057e32
commit
0efcfe0b27
7 changed files with 27 additions and 14 deletions
|
|
@ -260,8 +260,8 @@ elseif(APPLE)
|
||||||
BUNDLE True
|
BUNDLE True
|
||||||
MACOSX_BUNDLE_GUI_IDENTIFIER com.infinipaint.infinipaint
|
MACOSX_BUNDLE_GUI_IDENTIFIER com.infinipaint.infinipaint
|
||||||
MACOSX_BUNDLE_BUNDLE_NAME infinipaint
|
MACOSX_BUNDLE_BUNDLE_NAME infinipaint
|
||||||
MACOSX_BUNDLE_BUNDLE_VERSION "0.6.0"
|
MACOSX_BUNDLE_BUNDLE_VERSION "0.6.1"
|
||||||
MACOSX_BUNDLE_SHORT_VERSION_STRING "0.6.0"
|
MACOSX_BUNDLE_SHORT_VERSION_STRING "0.6.1"
|
||||||
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/macosinstall/Info.plist
|
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/macosinstall/Info.plist
|
||||||
)
|
)
|
||||||
add_custom_command(TARGET main POST_BUILD
|
add_custom_command(TARGET main POST_BUILD
|
||||||
|
|
@ -483,7 +483,7 @@ if(APPLE OR WIN32)
|
||||||
set(CPACK_PACKAGE_NAME "infinipaint")
|
set(CPACK_PACKAGE_NAME "infinipaint")
|
||||||
set(CPACK_PACKAGE_VERSION_MAJOR "0")
|
set(CPACK_PACKAGE_VERSION_MAJOR "0")
|
||||||
set(CPACK_PACKAGE_VERSION_MINOR "6")
|
set(CPACK_PACKAGE_VERSION_MINOR "6")
|
||||||
set(CPACK_PACKAGE_VERSION_PATCH "0")
|
set(CPACK_PACKAGE_VERSION_PATCH "1")
|
||||||
set(CPACK_PACKAGE_VENDOR "ErrorAtLine0")
|
set(CPACK_PACKAGE_VENDOR "ErrorAtLine0")
|
||||||
set(CPACK_PACKAGE_CONTACT "erroratline0@gmail.com")
|
set(CPACK_PACKAGE_CONTACT "erroratline0@gmail.com")
|
||||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
|
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,8 @@ android {
|
||||||
applicationId 'com.erroratline0.InfiniPaint'
|
applicationId 'com.erroratline0.InfiniPaint'
|
||||||
minSdkVersion 27
|
minSdkVersion 27
|
||||||
targetSdk 36
|
targetSdk 36
|
||||||
versionCode 2
|
versionCode 3
|
||||||
versionName "0.6.0"
|
versionName "0.6.1"
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
cppFlags "-fexceptions", "-frtti"
|
cppFlags "-fexceptions", "-frtti"
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,15 @@
|
||||||
<launchable type="desktop-id">com.infinipaint.infinipaint.desktop</launchable>
|
<launchable type="desktop-id">com.infinipaint.infinipaint.desktop</launchable>
|
||||||
|
|
||||||
<releases>
|
<releases>
|
||||||
|
<release version="0.6.1" date="2026-09-08">
|
||||||
|
<description>
|
||||||
|
<p>Patch update:</p>
|
||||||
|
<ul>
|
||||||
|
<li>Added fill color 1 and back color 0 to theme editor</li>
|
||||||
|
<li>Added disable touch for drawing option</li>
|
||||||
|
</ul>
|
||||||
|
</description>
|
||||||
|
</release>
|
||||||
<release version="0.6.0" date="2026-06-04">
|
<release version="0.6.0" date="2026-06-04">
|
||||||
<description>
|
<description>
|
||||||
<p>Major update:</p>
|
<p>Major update:</p>
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,9 @@
|
||||||
<key>CFBundleSpokenName</key>
|
<key>CFBundleSpokenName</key>
|
||||||
<string>InfiniPaint</string>
|
<string>InfiniPaint</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>0.6.0</string>
|
<string>0.6.1</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>0.6.0</string>
|
<string>0.6.1</string>
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
|
|
|
||||||
|
|
@ -120,9 +120,11 @@ void DrawingProgram::input_text_callback(const InputManager::TextCallbackArgs& t
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawingProgram::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
void DrawingProgram::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
|
if(button.deviceType == InputManager::MouseDeviceType::TOUCH && world.main.conf.disableTouchForDrawing)
|
||||||
|
return;
|
||||||
|
|
||||||
auto buttonCallbacks = [&](const InputManager::MouseButtonCallbackArgs& b) {
|
auto buttonCallbacks = [&](const InputManager::MouseButtonCallbackArgs& b) {
|
||||||
if(b.deviceType != InputManager::MouseDeviceType::TOUCH || !world.main.conf.disableTouchForDrawing)
|
drawTool->input_mouse_button_on_canvas_callback(b);
|
||||||
drawTool->input_mouse_button_on_canvas_callback(b);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if(button.down) {
|
if(button.down) {
|
||||||
|
|
@ -174,8 +176,10 @@ void DrawingProgram::input_mouse_button_callback(const InputManager::MouseButton
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawingProgram::input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) {
|
void DrawingProgram::input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) {
|
||||||
if(motion.deviceType != InputManager::MouseDeviceType::TOUCH || !world.main.conf.disableTouchForDrawing)
|
if(motion.deviceType == InputManager::MouseDeviceType::TOUCH && world.main.conf.disableTouchForDrawing)
|
||||||
drawTool->input_mouse_motion_callback(motion);
|
return;
|
||||||
|
|
||||||
|
drawTool->input_mouse_motion_callback(motion);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawingProgram::input_key_callback(const InputManager::KeyCallbackArgs& key) {
|
void DrawingProgram::input_key_callback(const InputManager::KeyCallbackArgs& key) {
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,6 @@ namespace VersionConstants {
|
||||||
|
|
||||||
constexpr int SAVEFILE_HEADER_LEN = 12; // DO NOT CHANGE THIS HEADER LENGTH
|
constexpr int SAVEFILE_HEADER_LEN = 12; // DO NOT CHANGE THIS HEADER LENGTH
|
||||||
const std::string CURRENT_SAVEFILE_HEADER = "INFPNT000006"; // Change whenever the save file is incompatible with the previous version
|
const std::string CURRENT_SAVEFILE_HEADER = "INFPNT000006"; // Change whenever the save file is incompatible with the previous version
|
||||||
const std::string CURRENT_VERSION_STRING = "0.6.0";
|
const std::string CURRENT_VERSION_STRING = "0.6.1";
|
||||||
constexpr VersionNumber CURRENT_VERSION_NUMBER(0, 6, 0);
|
constexpr VersionNumber CURRENT_VERSION_NUMBER(0, 6, 1);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||||
<assemblyIdentity version="0.6.0.0" processorArchitecture="*" name="com.infinipaint.infinipaint" type="win32" />
|
<assemblyIdentity version="0.6.1.0" processorArchitecture="*" name="com.infinipaint.infinipaint" type="win32" />
|
||||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||||
<windowsSettings>
|
<windowsSettings>
|
||||||
<!-- Enable UTF-8 -->
|
<!-- Enable UTF-8 -->
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue