From 4b45850a3fa3721c03523b6d828e0a32d42e0fbb Mon Sep 17 00:00:00 2001 From: Alex Cui Date: Sun, 3 Mar 2019 15:19:18 +0800 Subject: [PATCH] 0.2.2.626 --- .gitignore | 4 +- CHANGELOG | 5 + CHANGELOG.RELEASE | 25 ++ ZilchEditor.pro | 2 +- ZilchEditor.pro.user | 8 +- ZilchEditor.pro.user.4.8-pre1 | 568 ---------------------------------- ZilchEditor.qrc | 12 - bin/config/version.cfg | 11 +- src/util/Crash.c | 2 +- src/util/Crash.h | 1 + src/util/Resource.h | 3 +- 11 files changed, 47 insertions(+), 594 deletions(-) delete mode 100644 ZilchEditor.pro.user.4.8-pre1 delete mode 100644 ZilchEditor.qrc diff --git a/.gitignore b/.gitignore index 17802ed..76ddd29 100644 --- a/.gitignore +++ b/.gitignore @@ -34,8 +34,8 @@ # Log path bin/log/* -# Dump file -*.dmp +# Dump path +bin/dump/* # Build path build/* diff --git a/CHANGELOG b/CHANGELOG index da46686..bb6182f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.2.2.626 +Date: 2019.3.3 +Features: + - Changed dump file to /dump directory. +--------------------------------------------------------------------------------------------------- Version: 0.2.2.625 Date: 2019.3.1 Features: diff --git a/CHANGELOG.RELEASE b/CHANGELOG.RELEASE index ce9bc02..816645e 100644 --- a/CHANGELOG.RELEASE +++ b/CHANGELOG.RELEASE @@ -1,4 +1,29 @@ --------------------------------------------------------------------------------------------------- +Version: 0.2.2 +Date: 2019.3.3 +Features: + - Added area in costume part.[build-586] + - Added button for importing files as a costume.[build-590] + - Added support on Windows 32bit.[build-590] + - Added dumpinfo support for windows x86.[build-597] + - Added costume list.[build-597] + - Added border to costume item in costume part.[build-597] + - Added costume selecting.[build-608] + - Added about widget.[build-625] + - Changed style of costume part.[build-597] + - Changed dump file to /dump directory.[build-626] + - Finished UI part of costume list and costume view.[build-608] + - Finished import images as a costume.[build-608] + - Now select costume in costume list can change the costume of sprite.[build-616] +Bugfixes: + - Fixed the blocks below a block that will be deleted cannot be deleted.[bug#12][build-621] + - Fixed the sprite doesn't resize when changes the costume.[bug#29][build-621] + - Fixed the block doesn't delete from block list of sprite.[bug#30][build-621] +Source: + - Added qt5.11.2 msvc2015 64bit sdk.[build-590] + - Add build profile to project, for Qt5.12.1 msvc2017 32/64bit.[build-621] + - Changed build directory.[build-590] +--------------------------------------------------------------------------------------------------- Version: 0.2.1 Date: 2019.2.16 Features: diff --git a/ZilchEditor.pro b/ZilchEditor.pro index 4a485d7..f83ab6d 100644 --- a/ZilchEditor.pro +++ b/ZilchEditor.pro @@ -58,7 +58,7 @@ QMAKE_CFLAGS += /WX # make warnings as error [MSVC] #================================================= # The program version # {Marjor}.{Minor}.{Revision}.{Build} -VERSION = 0.1.1.408 +VERSION = 0.2.2.626 #================================================= # Linked libs. LIBS += -ldbghelp # DbgHelp.dll [Windows] diff --git a/ZilchEditor.pro.user b/ZilchEditor.pro.user index 329ff5b..f6e16fc 100644 --- a/ZilchEditor.pro.user +++ b/ZilchEditor.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -296,8 +296,8 @@ 2 ZilchEditor - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace/Github/Zilch-Editor/ZilchEditor.pro + ZilchEditor2 + Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace/Github/zilch-editor/ZilchEditor.pro ZilchEditor.pro 3768 @@ -308,7 +308,7 @@ false true ./bin - D:/Workspace/Github/Zilch-Editor/build/5.12.1.win64 + D:/Workspace/Github/zilch-editor/build/5.12.1.win64 1 diff --git a/ZilchEditor.pro.user.4.8-pre1 b/ZilchEditor.pro.user.4.8-pre1 deleted file mode 100644 index 06e341f..0000000 --- a/ZilchEditor.pro.user.4.8-pre1 +++ /dev/null @@ -1,568 +0,0 @@ - - - - - - EnvironmentId - {5a693662-d124-451a-a6c9-bdb2946b50fb} - - - ProjectExplorer.Project.ActiveTarget - 1 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - qt2 - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - false - 0 - 4 - false - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.11.2 MSVC2017 64bit - Desktop Qt 5.11.2 MSVC2017 64bit - qt.qt5.5112.win64_msvc2017_64_kit - 0 - 0 - 0 - - ./build/win64 - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - ./build - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - ./build - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - ZilchEditor - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace/Github/Zilch-Editor/ZilchEditor.pro - true - - ZilchEditor.pro - ./bin - D:/Workspace/Github/Zilch-Editor/build/win64 - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.11.2 MSVC2015 32bit - Desktop Qt 5.11.2 MSVC2015 32bit - qt.qt5.5112.win32_msvc2015_kit - 0 - 0 - 0 - - ./build/win32 - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - D:/Workspace/Github/build-ZilchEditor-Desktop_Qt_5_11_2_MSVC2015_32bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - D:/Workspace/Github/build-ZilchEditor-Desktop_Qt_5_11_2_MSVC2015_32bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - ZilchEditor - - Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace/Github/Zilch-Editor/ZilchEditor.pro - true - - ZilchEditor.pro - - D:/Workspace/Github/Zilch-Editor/build/win32 - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 2 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - diff --git a/ZilchEditor.qrc b/ZilchEditor.qrc deleted file mode 100644 index e8ad032..0000000 --- a/ZilchEditor.qrc +++ /dev/null @@ -1,12 +0,0 @@ - - - bin/asset/splash.png - - - - bin/style/Default.qss - - - bin/asset/app.qss - - diff --git a/bin/config/version.cfg b/bin/config/version.cfg index 99f1d82..44c4a81 100644 --- a/bin/config/version.cfg +++ b/bin/config/version.cfg @@ -1,5 +1,6 @@ -[Version] -Type=Alpha -Version=0.1.0 - - +Type=Release +Major=0 +Minor=2 +Revision=2 +Build=626 +Channel=7 diff --git a/src/util/Crash.c b/src/util/Crash.c index 8286034..967ac78 100644 --- a/src/util/Crash.c +++ b/src/util/Crash.c @@ -93,7 +93,7 @@ long ApplicationCrashHandler(EXCEPTION_POINTERS *pException) { GetLocalTime(&SystemTime); char FileName[50]; memset(FileName, 0, sizeof(FileName) / sizeof(char)); - sprintf(FileName, "%04d%02d%02d-%02d%02d%02d.%03d.dmp", + sprintf(FileName, "dump/%04d%02d%02d-%02d%02d%02d.%03d.dmp", SystemTime.wYear, SystemTime.wMonth, SystemTime.wDay, SystemTime.wHour, SystemTime.wMinute, SystemTime.wSecond, SystemTime.wMilliseconds diff --git a/src/util/Crash.h b/src/util/Crash.h index 61b08ef..ac69575 100644 --- a/src/util/Crash.h +++ b/src/util/Crash.h @@ -15,6 +15,7 @@ void ConvertNumberBin8(char *Buffer, uint8_t Value); void OutputCPUStatus64(char *Buffer, const char *Name, uint64_t Value); void OutputCPUStatus32(char *Buffer, const char *Name, uint32_t Value); void OutputCPUStatus16(char *Buffer, const char *Name, uint16_t Value); +void OutputCPUStatus8(char *Buffer, const char *Name, uint8_t Value); void BindCrashHandler(void); diff --git a/src/util/Resource.h b/src/util/Resource.h index 09bb29d..c8c3b52 100644 --- a/src/util/Resource.h +++ b/src/util/Resource.h @@ -6,7 +6,8 @@ #include union HashMD5 { - unsigned char Byte[16]; + unsigned char byte[16]; + uint16_t data; }; class ResourceBasic {