mirror of
https://github.com/MountCloud/FireDog.git
synced 2026-10-16 20:20:49 +08:00
Merge branch 'v1.3.3'
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
|
|
||||||
//main version
|
//main version
|
||||||
#define FIREDOG_VERSION "1.3.1"
|
#define FIREDOG_VERSION "1.3.3"
|
||||||
|
|
||||||
//feature library version
|
//feature library version
|
||||||
#define FIREDOG_FEATURE_LIBRARY_VERSION "1.2.1"
|
#define FIREDOG_FEATURE_LIBRARY_VERSION "1.2.1"
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
#pragma warning (disable: 4996)
|
||||||
|
|
||||||
#include "featurelibrary.h"
|
#include "featurelibrary.h"
|
||||||
|
|
||||||
using namespace nlohmann;
|
using namespace nlohmann;
|
||||||
|
|||||||
+3210
-1569
File diff suppressed because it is too large
Load Diff
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
#include "Qss/Qss.h"
|
#include "Qss/Qss.h"
|
||||||
|
|
||||||
#define FIREDOG_EDITOR_VERSION "v2.1"
|
#define FIREDOG_EDITOR_VERSION "v2.2"
|
||||||
#define EXIT_CODE_REBOOT -123456789
|
#define EXIT_CODE_REBOOT -123456789
|
||||||
|
|
||||||
//匹配管家
|
//匹配管家
|
||||||
|
|||||||
@@ -78,6 +78,20 @@ $ge: *comparison rule*, greater than or equal to comparison, use two *number rul
|
|||||||
|
|
||||||
# 更新日志 Update log
|
# 更新日志 Update log
|
||||||
|
|
||||||
|
# v1.3.3
|
||||||
|
|
||||||
|
```
|
||||||
|
FireDog Version: v1.3.3
|
||||||
|
FireDog Editor Version: v2.2
|
||||||
|
Feature Libraray Version: v1.2.1
|
||||||
|
|
||||||
|
1:修复检测结果为空时报错问题。
|
||||||
|
2:优化yaml组件,让yaml组件支持gcc 4.8版本(centos7默认),增强引擎的跨平台编译能力。
|
||||||
|
|
||||||
|
1: Fix the error reporting that the detection result is empty.
|
||||||
|
2: Optimize the yaml component, let the yaml component support gcc 4.8 version (centos7 default), and enhance the cross-platform compilation ability of the engine.
|
||||||
|
```
|
||||||
|
|
||||||
# v1.3.1
|
# v1.3.1
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|||||||
Reference in New Issue
Block a user