Skip to content

Commit

Permalink
0.2.2.626
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcui03 committed Mar 3, 2019
1 parent 1fa289f commit 4b45850
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 594 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
# Log path
bin/log/*

# Dump file
*.dmp
# Dump path
bin/dump/*

# Build path
build/*
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.RELEASE
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ZilchEditor.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
8 changes: 4 additions & 4 deletions ZilchEditor.pro.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.8.1, 2019-03-01T21:26:30. -->
<!-- Written by QtCreator 4.8.1, 2019-03-03T15:06:37. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
Expand Down Expand Up @@ -296,8 +296,8 @@
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">ZilchEditor</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace/Github/Zilch-Editor/ZilchEditor.pro</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">ZilchEditor2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/Workspace/Github/zilch-editor/ZilchEditor.pro</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">ZilchEditor.pro</value>
<value type="QString" key="RunConfiguration.Arguments"></value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
Expand All @@ -308,7 +308,7 @@
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory">./bin</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Workspace/Github/Zilch-Editor/build/5.12.1.win64</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/Workspace/Github/zilch-editor/build/5.12.1.win64</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
Expand Down
568 changes: 0 additions & 568 deletions ZilchEditor.pro.user.4.8-pre1

This file was deleted.

12 changes: 0 additions & 12 deletions ZilchEditor.qrc

This file was deleted.

11 changes: 6 additions & 5 deletions bin/config/version.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[Version]
Type=Alpha
Version=0.1.0


Type=Release
Major=0
Minor=2
Revision=2
Build=626
Channel=7
2 changes: 1 addition & 1 deletion src/util/Crash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/util/Crash.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 2 additions & 1 deletion src/util/Resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#include <string>

union HashMD5 {
unsigned char Byte[16];
unsigned char byte[16];
uint16_t data;
};

class ResourceBasic {
Expand Down

0 comments on commit 4b45850

Please sign in to comment.