halx99
cc53868d27
More clearly ETC1 format, sync enums for ETC1, correct somethings
2020-09-01 11:43:03 +08:00
halx99
9e4f61d9d6
ETC2 feature check for metal
2020-09-01 00:03:49 +08:00
halx99
815c737e6b
wrap fowardPixels for hardware decoder
2020-08-31 23:09:42 +08:00
halx99
09cedf60b2
Improve images decoder
2020-08-31 21:04:47 +08:00
halx99
e96ae229dd
Merge: 5ddc84bbee
539e5ca42c
...
Merge pull request #189 from aismann/patch-8
Update README.md
2020-08-31 04:27:33 -07:00
halx99
a87c0bba78
More clearly data owner when decode images.
2020-08-31 19:24:23 +08:00
halx99
fa5d2d198b
fix resources relative path to avoid test case crash on mobile
2020-08-31 17:39:29 +08:00
halx99
c338472df8
Move copyright notice to header [skip appveyor][skip travis]
2020-08-31 17:35:01 +08:00
halx99
477aa0c185
Clearly CCLOG content
2020-08-31 17:13:04 +08:00
halx99
65a7bd5360
Remove test code [skip appveyor] [skip travis]
2020-08-31 16:31:37 +08:00
halx99
086c3dee3c
Add comment for etc1/etc2 compression tools [skip appveyor][skip travis]
2020-08-31 16:16:13 +08:00
halx99
258dfc5b4a
ETC2 Metal support
2020-08-31 15:45:05 +08:00
halx99
b12068e1c8
Use etc2_decode_image decode etc1 to RGBA8888 [skip appveyor] [skip travis]
...
This can avoid further texture data convert
2020-08-31 15:34:20 +08:00
halx99
8749c63346
fix compile issue
2020-08-31 15:17:28 +08:00
halx99
2443e01136
fix compile issue
2020-08-31 14:50:33 +08:00
halx99
27ba2fd377
Remove unused file [skip appveyor][skip travis]
2020-08-31 14:48:10 +08:00
halx99
da8f1c56fe
ETC2 software decode support
2020-08-31 14:11:48 +08:00
halx99
43f464163c
1. Finish ETC2 support on GL renderer backend
...
2. Improve ASTC compressed format check
2020-08-30 17:58:39 +08:00
halx99
0edf05888f
fix CCValue::visit
2020-08-30 17:45:21 +08:00
halx99
318c6855a3
fix #187
2020-08-30 13:03:32 +08:00
halx99
21cb31685d
Merge: 6b4d5918c0
e6108d111a
...
Merge pull request #186 from halx99/fix-185
Fix ASTC bytesPerRow calculation
2020-08-29 10:27:04 -07:00
halx99
f53ddd2c4a
Update README_CN.md
2020-08-30 00:28:20 +08:00
halx99
0943e0a793
Fix ASTC bytesPerRow calculation
2020-08-30 00:11:33 +08:00
halx99
479047361d
Clear vector after releaseTextures
2020-08-29 22:00:58 +08:00
halx99
9baf39823e
Release old storage textures
2020-08-29 20:07:13 +08:00
halx99
b32b9b75e9
More clearly comment
2020-08-29 19:51:42 +08:00
halx99
998335b8af
More clearly comment for multi-textures support
2020-08-29 17:39:17 +08:00
halx99
d147190d8a
Remove unused comment [skip appveyor][skip travis]
2020-08-29 16:59:15 +08:00
halx99
32549195cf
fix multi-texture2d support
2020-08-29 16:56:48 +08:00
halx99
8f448b517c
fix ci
2020-08-28 17:26:30 +08:00
halx99
2197bb52cd
Sync missing feature from v3, and API compatible
2020-08-28 16:33:52 +08:00
halx99
4674b1e89d
Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough
2020-08-28 15:42:40 +08:00
halx99
81b038c18d
Code improvement
2020-08-28 15:01:25 +08:00
minggo
1934eb5ac9
close keyboard when Done is pressed ( #20341 )
...
* close keyboard when Done is pressed
2020-08-28 14:50:52 +08:00
halx99
238cd782e3
Add CMake -DCC_FORCE_USE_GLES to control whether force use gles on win32,iOS
2020-08-28 12:57:00 +08:00
halx99
2a234afc3d
Improve listFiles for win32, use std::move avoid string deep copy
2020-08-28 11:05:32 +08:00
halx99
e75a29a393
fix #179
2020-08-28 11:04:14 +08:00
halx99
7ce3f4ab34
Make logical more clearly
2020-08-27 17:35:30 +08:00
halx99
53b1da1bf9
fix mssing sources
2020-08-27 12:44:30 +08:00
halx99
b6f2d775a9
Make UserDefault encrypt/decrypt algorithm can be customlized
2020-08-27 12:37:20 +08:00
halx99
f583ec6300
By default, disable stream parsing
2020-08-27 11:40:44 +08:00
halx99
6345cca301
freetype stream parsing support, reduce memory use on FontCache
2020-08-27 11:35:55 +08:00
halx99
ea1cb45ba3
Refine code style
2020-08-27 10:19:21 +08:00
halx99
6ac06d8571
fix ci compile
2020-08-27 00:49:07 +08:00
halx99
c9d6c5afdf
Rename PXFileStream to CCFileStream
2020-08-27 00:21:44 +08:00
halx99
d0c01ea688
Merge: 6be52c29e7
9d7d1e40fb
...
Merge branch 'master' of https://github.com/c4games/engine-x into master
2020-08-26 12:46:51 +08:00
halx99
6df5f91142
Sync LayoutHelper APIs
2020-08-26 12:46:41 +08:00
halx99
8d7a5ab3c6
finish killCurrentProcess implementation on windows
2020-08-26 10:36:33 +08:00
halx99
6fe10e8809
Add utils::killCurrentProcess API to kill game immidiately
2020-08-25 23:12:26 +08:00
halx99
0e0a28e033
Merge: 1740c444f8
5c850e00ac
...
Merge pull request #171 from halx99/feature-170
Add utils::createInstance to instead macro CREATE_FUNC
2020-08-24 23:55:37 -07:00
halx99
feb4e1783a
fix warning
2020-08-25 14:47:51 +08:00
halx99
0545a471cb
fix ci
2020-08-25 14:08:17 +08:00
halx99
d39f803459
Add utils::createInstance to instead macro CREATE_FUNC
2020-08-25 13:49:45 +08:00
halx99
c8a665da40
Update al format enum
2020-08-24 19:04:08 +08:00
halx99
3b770e4519
Improve engine CMakeLists.txt for ios
...
benefit: Now engine can build without ios.toolchain.cmake,
because we solvoe follow issues:
a. fix cmake try_compile failed with arm device without
b. fix try_compile/compile will failed with device on armv7
c. fix thread local storage require:
1. deployment target >= 9.0 (arm64)
2. deployment target == 10.x (armv7)
2020-08-24 15:31:45 +08:00
halx99
34c51f5596
Print al vender and version after initialized
2020-08-20 22:37:34 +08:00
halx99
e348312baa
Naming style [skip appveyor] [skip travis]
2020-08-19 12:26:31 +08:00
halx99
eaaeeea27f
Refine code
2020-08-19 12:10:29 +08:00
halx99
98fab08a6c
fix label crashing, add private use BatchCommand move constructor to adapte std::vector resize properly
2020-08-19 11:46:13 +08:00
halx99
7ff2ffa0b3
Make CustomCommand safe copyable and moveable
2020-08-19 11:42:32 +08:00
halx99
aa3f12628a
Sync mssing code from official-v3
2020-08-18 14:43:09 +08:00
halx99
083d14f342
Improve code quality
2020-08-18 14:29:09 +08:00
halx99
b594cda5e3
Consider mutex use, which object dou you want guard?
2020-08-18 12:48:16 +08:00
halx99
9eb32b634f
Make core lib can be build as dll, fix link issue for external
2020-08-18 12:36:44 +08:00
halx99
c9882c195a
Update README_CN.md
2020-08-18 12:11:04 +08:00
halx99
641b2e40f3
Sync fix from https://github.com/cocos2d/cocos2d-x/pull/20518
2020-08-18 12:09:56 +08:00
halx99
a3a231495c
Backport CCValue APIs
2020-08-18 11:33:18 +08:00
halx99
d084d9f61a
Improve shared library for android, remove mojoal,sdl2, still use OpenAL.framework on apple platform, alsoft on other platforms.
2020-08-17 18:45:14 +08:00
halx99
bda3a720b4
Use CC0-1.0 licensed decoder 'minimp3' to replace LGPL licensed decoder 'mpg123'
2020-08-17 14:56:53 +08:00
halx99
b090664084
Make android listFiles behavior same with other platforms
2020-08-17 12:09:31 +08:00
halx99
08e3b65b9a
More clearly check supported pcm format by alsoft extends
2020-08-15 17:48:57 +08:00
halx99
2e4499b6d0
Add ios framework required by SDL2, check whether SDL2 support strip it later
2020-08-15 17:47:40 +08:00
halx99
072deafeae
Adapte zlib licensed AL library: mojoal
2020-08-14 18:58:44 +08:00
halx99
f72f6e8cac
Cleanup unused code for min support iOS
2020-08-13 23:03:55 +08:00
halx99
a09253c7a2
fix-157
2020-08-13 22:35:41 +08:00
halx99
a3b208075b
fix compile issue without alsoft
2020-08-13 00:41:30 +08:00
halx99
da2ec96fd8
fix ci android build issue.
2020-08-12 18:53:33 +08:00
halx99
5732e20789
Tidy code
2020-08-12 18:40:04 +08:00
halx99
d9ef1e238f
Simplify audio source again, merge audio sources
2020-08-12 17:00:07 +08:00
halx99
37d4be2152
FreeType: Output missing char in .ttf at _DEBUG compiling mode
2020-08-12 14:24:06 +08:00
halx99
9fef6a8720
Sync macro
2020-08-07 23:55:25 +08:00
halx99
7e7fba9649
By default, make cocos2d::log multi-threading safe
2020-08-07 23:52:41 +08:00
aismann
63e7c6e4dc
OpenGL 'works' better...
2020-08-07 08:10:12 +02:00
halx99
d424be2a80
Naming style
2020-08-07 00:39:55 +08:00
halx99
77b3290226
Make CCValue compatible official cocos2d-x v3/v4
2020-08-06 19:39:50 +08:00
halx99
9c92a5e4ab
Sync optimize code from v3
2020-08-06 17:37:34 +08:00
halx99
b781a25e16
Reorder members of Node, sizeof(Node) decrease from 640 to 616 on 32bit application
2020-08-06 13:30:35 +08:00
halx99
8af53505c1
Merge: 3cf637418f
137ded73a5
...
Merge branch 'master' of https://github.com/c4games/engine-x into master
2020-08-05 18:12:31 +08:00
halx99
4713580381
Update features [skip appveyor] [skip travis]
2020-08-05 18:11:52 +08:00
halx99
ff5ec02d77
Merge: bda1fce2b1
f38f76c1a1
...
Merge pull request #145 from halx99/spine-3.8
Sync spine code and resource to 3.8
2020-08-05 02:38:59 -07:00
halx99
03816cd0c0
fix console output error on win32, see #144
2020-08-05 17:30:30 +08:00
halx99
e8765c88f8
Sync spine code and resource to 3.8
2020-08-05 17:04:57 +08:00
halx99
4214ed6add
Add missing optimize from v3
2020-08-05 13:10:37 +08:00
halx99
df2073f1e5
win32 cover wide API use, remove unused long getFieSize(const std::string&)
2020-08-05 12:24:31 +08:00
halx99
9f66d7dce0
utf-8 file path
2020-08-05 12:17:57 +08:00
halx99
205d6e5fb9
fix lua compile issue
2020-08-04 22:38:57 +08:00
halx99
94a2a6994c
Macro and engine name alias
2020-08-04 14:53:59 +08:00
halx99
2add0272a3
Add ENGINEX_VERSION and improve ABI compatiable
2020-08-04 12:11:36 +08:00
halx99
d2d656e83d
Update CCColorizer.cpp
2020-08-04 01:31:32 +08:00
halx99
2e4b573e8c
Update CCColorizer.cpp
2020-08-04 01:01:05 +08:00
halx99
d3cb044df2
Update CCColorizer.h
2020-08-04 00:59:02 +08:00
halx99
57a1e88533
fix compile issue
2020-08-04 00:39:48 +08:00
halx99
e638e0bd68
Tidy sources
2020-08-04 00:14:35 +08:00
halx99
8b9a6bbbf1
fix android build issues
2020-08-03 20:31:47 +08:00
halx99
1e392c9dfe
Refine readme [skip appveyor][skip travis]
2020-08-03 19:12:07 +08:00
halx99
3049b8f751
Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable
2020-08-03 17:51:40 +08:00
halx99
8f541a61a7
Merge: 5f96ce8981
3e95b8ccf3
...
Merge pull request #135 from halx99/unify-plist-ops
Unify plist implementation, remove apple specific sources.
2020-08-02 20:22:36 -07:00
halx99
588e977ef0
Merge: 8cc189fb4d
6fd4d6e4ab
...
Merge pull request #134 from halx99/fullscreen-mode
Refactor full screen support
2020-08-02 20:03:07 -07:00
halx99
d6958498d4
Unify plist implementation, remove apple specific sources.
2020-08-03 10:48:26 +08:00
halx99
8024b9b2e9
Adapte multi monitors
2020-08-03 10:33:04 +08:00
halx99
1c59ba423c
Unnecessary space lilne [skip appveyor] [skip travis]
2020-08-02 17:00:35 +08:00
halx99
996f303eb7
Optimize param use.
2020-08-02 16:48:19 +08:00
halx99
b12cde7c19
vidMode need moniter
2020-08-02 16:36:58 +08:00
halx99
049a7e58ba
Update comment [skip appveyor] [skip travis]
2020-08-02 16:24:30 +08:00
halx99
76d246ce54
check isFullscreen
2020-08-02 16:22:41 +08:00
halx99
2bd0a48e02
Provide more useful for setFullscreen with width,height,refreshRate.
2020-08-02 16:18:39 +08:00
halx99
7c816dae8d
Refactor full screen support, fix different behavior when enter full screen between 1 and >=2 times
2020-08-02 11:54:46 +08:00
halx99
bd9a409dd7
Add wav testcase
2020-08-01 19:25:39 +08:00
halx99
f807981d80
fix #129
2020-08-01 11:23:13 +08:00
halx99
247cb83b18
fix #127
2020-07-31 17:23:03 +08:00
halx99
2a2b397f27
Add alconfig.h to choose whether use openal-soft
2020-07-31 17:03:58 +08:00
halx99
65bb368cc2
Add missing detect macro CC_USE_ALSOFT_ON_APPLE on apple platform
2020-07-31 16:36:45 +08:00
halx99
c17ea9fdd5
Update comment [skip appveyor] [skip travis]
2020-07-31 15:49:50 +08:00
halx99
bcd1c17aa5
Tidy audio source, unify headers: AudioEngineImpl.h AudioPlayer.h
2020-07-31 14:32:08 +08:00
halx99
bef47490e0
Refine message output [skip travis] [skip appveyor]
2020-07-31 11:35:52 +08:00
halx99
14e090f9bf
fix option order
2020-07-31 11:22:42 +08:00
halx99
77f9757d4d
[Audio] Use apple system decoder for non .ogg audio files
2020-07-31 00:31:39 +08:00
halx99
9345f18159
Add CMAKE option CC_USE_ALSOFT_ON_APPLE to use kcat openal-soft on apple platform, by default currently OFF
2020-07-31 00:06:59 +08:00
halx99
3608150968
Use std::vector<char> to manage pcmData buffer on AudioCache, remove unused source from AudioCache.mm
2020-07-30 18:09:50 +08:00
halx99
72dcc33747
Fix dead-lock when play/stopAll immidiately
2020-07-30 17:26:54 +08:00
halx99
a2800e0144
Sync missing fixs from v3, see: https://github.com/cocos2d/cocos2d-x/pull/19240
2020-07-30 17:07:38 +08:00
halx99
4ff88cc55c
Sync fix from v3, see also: https://github.com/cocos2d/cocos2d-x/pull/20509
2020-07-30 10:59:50 +08:00
halx99
1d53eaf3ff
Take care _programState use
2020-07-21 23:11:03 +08:00
halx99
818842671f
fix compile issue on iOS
2020-07-21 23:05:25 +08:00
halx99
6d88adb7f9
fix lua link error
2020-07-20 17:00:48 +08:00
halx99
16a0fd73c3
Merge: db0ed5bd59
a3a65b0320
...
Merge pull request #109 from halx99/win-utf8
Improve utf-8 path on win32, explicit call wide version of system API.
2020-07-10 16:56:18 +08:00
halx99
e9fa3b4dac
Merge: 7624df74f3
d20d3fd241
...
Merge pull request #111 from halx99/fix-type-error
fix type error, well xxhash never generate 0 for validate draw command.
2020-07-10 16:42:57 +08:00
halx99
67ab691c30
fix compile issue
2020-07-10 16:00:21 +08:00
halx99
3df478d5e1
Merge: 851d301574
7b82d47fcf
...
Merge pull request #110 from halx99/fix-angle
Correct feature test when use angle backend
2020-07-10 15:56:41 +08:00
halx99
26da430a2f
fix type error, well xxhash never generate 0 for validate draw command.
2020-07-10 15:55:31 +08:00
halx99
c93a443f18
Correct feature test when use angle backend
2020-07-10 15:16:44 +08:00
halx99
d61534e359
Improve utf-8 path on win32, explicit call wide version of system API.
2020-07-10 15:14:16 +08:00
halx99
a76af60dbb
Adapte glfw-3.4
2020-07-03 11:08:39 +08:00
halx99
44276b824a
Merge: 58403292cd
bfd1709ab7
...
Merge pull request #108 from halx99/master
Optimzie writeStringToFile
2020-06-14 16:29:40 +08:00
halx99
8f3c82a287
Merge: 80f33f376c
208bc9fe6f
...
Merge pull request #107 from halx99/master
Auto copy angle lib to target bin directory
2020-06-14 16:23:58 +08:00
halx99
7cd562750e
Optimzie writeStringToFile
2020-06-14 15:54:55 +08:00
halx99
ef9b96de58
ios don't support thread local storage
2020-06-14 15:52:15 +08:00
halx99
98cb60f8bb
fix ios compile error
2020-06-14 13:58:29 +08:00
halx99
489fb1a50a
finish angle dependencies auto copy for win32, make flatbuffers dep header only
2020-06-14 12:50:20 +08:00
halx99
e58b7c292a
Support use google angle support on windows.
2020-06-12 12:42:58 +08:00
halx99
7ce113d7e5
fix label not rendering
2020-06-12 11:34:02 +08:00
halx99
8a20c6e2db
Sync from: https://github.com/cocos2d/cocos2d-x/pull/20531
2020-06-12 11:24:10 +08:00
halx99
9b57ed3781
[Audio] Improve mutex use
2020-06-04 23:11:24 +08:00
halx99
3a75843131
Remove unused macro
2020-06-04 12:55:22 +08:00
halx99
56407a9efe
[WAV] Finished MSADPCM & IMA4 compress format support.
2020-06-04 12:26:25 +08:00
halx99
bbd7b82bc7
Provide framesToBytes instead getBytesPerFrame
2020-06-03 23:09:45 +08:00
halx99
552ee8a9a6
fix enum.
2020-06-02 12:18:12 +08:00
halx99
c79bc38dca
Use store bitsPerFrame as-is instead bytesPerFrame.
2020-06-02 12:09:51 +08:00
halx99
54e390ef9f
Optimize, avoid include self.
...
Even through all compiler can handle it, we should not do that include, thanks: https://github.com/cocos2d/cocos2d-x/pull/20525
2020-05-20 08:56:12 +08:00
halx99
3e3097202a
Merge: 5d29919586
7676fe2c6c
...
Merge pull request #95 from halx99/master
Fix play some .wav file have tail noise
2020-05-19 14:18:39 +08:00
halx99
bc777089fe
Merge: 661d471b37
b65c4ddadc
...
Merge pull request #93 from halx99/master
Fix wav decoder when Format chunk have EXT info
2020-05-19 13:39:07 +08:00
halx99
d8a56aab52
Update copyright
2020-05-19 12:52:34 +08:00
halx99
194ff5f0d3
Merge: 8cb24b066f
b65c4ddadc
...
Merge branch 'master' of https://github.com/halx99/engine-x
2020-05-19 12:50:25 +08:00
halx99
8cb5ebfa86
Fix ci compile issue.
2020-05-19 12:49:34 +08:00
halx99
590185b9f8
Fix play some .wav file have tail noise, at non-apple platforms we use mpg123,ogg,wav decoder, so don't need workaround to adjust tail frame.
2020-05-19 12:19:29 +08:00
halx99
e22155ea0a
Remove win32 spec include.
2020-05-19 12:13:34 +08:00
halx99
82f53e2fed
Fix wav decoder when Format chunck have EXT info
2020-05-19 11:42:54 +08:00
halx99
a6c342231b
Apple platform no alext.h
2020-05-18 18:36:21 +08:00
halx99
e2ceefd3aa
Add all audio source format supported by OpenAL
2020-05-18 17:30:42 +08:00
halx99
c37bc0ac8e
Improve bit depth support, both 8bit, 16bit, 32bit FLT, 64bit DBL
2020-05-18 14:56:13 +08:00
halx99
e77b0eb4be
Fix compile error
2020-05-18 10:13:57 +08:00
halx99
f26fbf2843
fix missing include header file
2020-05-18 09:21:52 +08:00
halx99
fd6868da79
fix #89
2020-05-17 17:15:10 +08:00
halx99
4db4562d27
Optimize wav decoder code
2020-05-17 16:58:54 +08:00
halx99
d2cb808160
Improve StringUtils::format reuseable, see #88
2020-05-15 22:57:33 +08:00
halx99
5b18408c96
fix typo
2020-05-11 23:00:02 +08:00
halx99
0fef6018c0
fix #86
2020-05-06 16:28:34 +08:00
halx99
04a460705d
finish issue: #85
2020-05-06 15:42:25 +08:00
halx99
cccb66f1ae
fix memory leak & correct indent
2020-03-30 14:54:13 +08:00
halx99
e2ac139a62
Remove unused src
2020-03-05 20:47:11 +08:00
halx99
b30af83018
Remove unused Android.mk files
2020-03-04 22:59:33 +08:00
halx99
db6399f792
Merge: 313d4dc2a1
04ac727c8e
...
Merge branch 'master' of https://github.com/halx99/engine-x
2020-03-03 23:18:14 +08:00
halx99
ecd988d324
Update deps to v33
2020-03-03 23:17:38 +08:00
halx99
f6ff10a8e9
fix ios compile error
2020-03-03 20:05:56 +08:00
halx99
52058861a0
Refactor CCValue.
2020-03-03 19:24:07 +08:00
halx99
331fa9542e
Use original c lib minizip-1.2.0
2020-02-28 13:55:25 +08:00
halx99
8822faae98
Remove unnecessary std::move semantics
2020-02-28 12:10:27 +08:00
halx99
04cce8b7e5
Optimize & sync sources
2020-02-28 02:15:33 +08:00
halx99
9d797b6998
Clean JSB sources, optmize script event dispatch.
2020-02-28 02:15:33 +08:00
halx99
48007c67c9
Merge: b350a7abf8
d9e6cb8e33
...
Merge pull request #72 from c4games/sync-v3-pr20107
Sync v3 pr20107 & fix builtin shaders
2020-02-24 20:59:11 +08:00
halx99
88b7b95b73
Merge: 0c291dd470
f5eac1eede
...
Merge pull request #71 from c4games/sync-v3-pull-19256
Sync v3 pr-19256
2020-02-24 19:52:22 +08:00
halx99
810397ebfe
Merge: f0d60d4a85
a7e118ec0b
...
Merge pull request #70 from c4games/remove-unused-shader
Remove unused shader
2020-02-24 17:51:58 +08:00
halx99
825ec25a6b
Sync v3 pr20107 & fix builtin shaders, see: https://github.com/cocos2d/cocos2d-x/pull/20107
2020-02-24 17:09:25 +08:00
halx99
57dd626e39
Fixup, optimize shader compile log.
2020-02-24 16:27:10 +08:00
halx99
77b1f41c85
Sync v3 pr-19256, see: https://github.com/cocos2d/cocos2d-x/pull/19256
2020-02-24 16:22:40 +08:00
halx99
07bbbe6095
Remove unused shader
2020-02-24 16:13:49 +08:00
halx99
d0c0872dd9
Add missing header
2020-02-23 21:36:36 +08:00
halx99
d0ddafb424
fix indent
2020-02-23 21:31:55 +08:00
halx99
734b5bd44f
fix #41
2020-02-23 21:27:14 +08:00
halx99
82808a321d
Remove duplicated code
2020-02-17 20:21:43 +08:00