Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V3 #20740

Open
wants to merge 338 commits into
base: v4
Choose a base branch
from
Open

V3 #20740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
338 commits
Select commit Hold shift + click to select a range
8d5c1d4
[lua] remove luaL_error, which kill process (#19257)
PatriceJiang Dec 21, 2018
451d913
[vs2017] upgrade 3rd party libs to support vs2017 in release mode (#1…
PatriceJiang Dec 21, 2018
c6224d1
[uibutton] fix size init order (#19260)
PatriceJiang Dec 24, 2018
b136b56
increase cmake stability , remove tests/CMakeLists.txt (#19261)
drelaptop Dec 24, 2018
cc6ffbd
Update changelog and release note (#19264)
PatriceJiang Dec 25, 2018
fea0b04
update versoin code (#19265)
PatriceJiang Dec 25, 2018
9bd7732
Merge pull request #19266 from cocos2d/3.17.1
drelaptop Dec 25, 2018
00cad6c
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Dec 25, 2018
c9e4cb2
standardize pause & resume logic on GLSurfaceView (#19256)
drelaptop Dec 26, 2018
9fadf4e
fix spritecache plist parsing issue (#19269)
PatriceJiang Dec 26, 2018
403deed
cmake win32 Precompiled header (#19273)
crazyhappygame Jan 1, 2019
2941200
Ability to get low coupling inheritance (#19276)
gestern Jan 4, 2019
9f424e2
[3rd-libs] upgrade to version 154 (#19282)
PatriceJiang Jan 9, 2019
2d319be
Install ninja (#19298)
crazyhappygame Jan 15, 2019
941f579
update 3rd libs & console, fix file issues (#19284)
PatriceJiang Jan 15, 2019
3c3964c
Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
formatCvt Jan 16, 2019
f29d107
revert ndk-build final target, others need it (#19296)
drelaptop Jan 16, 2019
ccb5d81
Add clear request and responses method to httpclient (#19294)
benjaprieto Jan 16, 2019
8978825
ReFix bug: PremultipliedAlpha is not working for png (#19138)
sense-zzz-time Jan 16, 2019
6259d5d
Ui video player new style looping input options (#19297)
benjaprieto Jan 18, 2019
a109a5d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Jan 18, 2019
55b6d3a
cmake support set iOS Deployment Target for root project (#19315)
drelaptop Jan 18, 2019
ac539b1
refine cmake, add iOS sign config (#19327)
drelaptop Jan 21, 2019
e71ef82
refine cmake, allow developer switch Debug/Release in IDE (#19329)
drelaptop Jan 22, 2019
c1acc20
Add Android P cutout area support (#19286)
formatCvt Jan 29, 2019
8fc3b7b
update change log, "allow cleartext HTTP traffic" don't include template
drelaptop Jan 29, 2019
d8382c1
Adds Configuration::getInfoAsMap() (#19381)
gestern Feb 13, 2019
9011e84
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Feb 13, 2019
378e3cd
Checking, does the touch is within the height of the line, not the he…
kasandko Feb 14, 2019
17704df
If path to file is tool long crash is possible. (#19383)
sbrednikhin Feb 14, 2019
2675f1d
Font atlas texture initialization delayed (#19384)
sbrednikhin Feb 14, 2019
4db6353
fix header path include style (#19395)
minggo Feb 14, 2019
fa3ab72
Fix memory leak if invoking Texture2D::setAlphaTexture many times. (#…
dumganhar Feb 18, 2019
d9a3493
need to generate binding codes for all targets (#19424)
drelaptop Feb 22, 2019
0e996a9
remove unneeded codes (#19421)
minggo Feb 25, 2019
d7212ea
refine travis, don't generate binding codes for cpp only target (#19430)
drelaptop Feb 25, 2019
eda0c24
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Feb 26, 2019
0c57689
Lua: add manual bindings for EventDispatcher::addCustomEventListener …
Feb 27, 2019
6b2f160
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Feb 27, 2019
9483182
fix the member parameter:_percent is always be 0 during the update pr…
EricDDK Feb 27, 2019
d3e6727
Method to check if any IME dispatcher is active. (#19451)
sbrednikhin Mar 1, 2019
f0f732c
[Android] fix FileUtils::listFiles with path 'assets/' (#19457)
PatriceJiang Mar 4, 2019
80c6a69
Getting current clearing color in Renderer
sbrednikhin Mar 15, 2019
7634d12
Merge pull request #19518 from sbrednikhin/patch-1
minggo Mar 18, 2019
7dbd0d5
Tabs to spaces
sbrednikhin Mar 18, 2019
e5fa917
Tabs to spaces
sbrednikhin Mar 18, 2019
66dbafe
Methods of changing clearing color
sbrednikhin Mar 18, 2019
9caa7b2
Getting clearing color from Director interface
sbrednikhin Mar 18, 2019
b9ff3dd
Ability to change title position
gestern Mar 19, 2019
b16292a
Merge pull request #19520 from sbrednikhin/v3
minggo Mar 19, 2019
d8787b4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Mar 19, 2019
a19fae8
Merge pull request #19525 from CocosRobot/update_lua_bindings_1552959478
minggo Mar 19, 2019
a3a536e
Merge pull request #19524 from gestern/patch-1
minggo Mar 19, 2019
f723537
Merge pull request #1 from cocos2d/v3
rh101 Mar 27, 2019
19a96bd
Only send the ON_PERCENTAGE_CHANGED if and only if the percentage val…
rh101 Mar 27, 2019
b10839a
Merge pull request #2 from rh101/v3_SliderFix
rh101 Mar 27, 2019
78a8b2b
Only send the ON_PERCENTAGE_CHANGED if and only if the percentage val…
rh101 Apr 1, 2019
56abd88
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Apr 1, 2019
a837ed7
[windows] use PostMessage to replace SendMessage (#19569)
PatriceJiang Apr 3, 2019
14d1ffe
revert threads (#19572)
PatriceJiang Apr 4, 2019
d930cd3
Merge pull request #3 from cocos2d/v3
rh101 Apr 6, 2019
5dedc9d
Update CCArmature.cpp (#19579)
larisand Apr 8, 2019
d71ae3f
use CC_SAFE_DELETE_ARRAY instead of CC_SAFE_DELETE (#19580)
minggo Apr 8, 2019
fc6a6db
Fix bug: can't play video in obbfile. (#19476)
halx99 Apr 10, 2019
b1e4a17
fix base/CMakeLists.txt (#19575)
Xrysnow Apr 10, 2019
f8fb981
fix static token array in headfile (#19164)
iDings Apr 10, 2019
1b1a1a4
End the NS_CC properly. (#19603)
larisand Apr 15, 2019
b1e4a16
add build test option for cmake (#19608)
deflinhec Apr 17, 2019
d5021cf
Optimize calls to std::string::find() and friends when the needle pas…
JohnCoconut Apr 18, 2019
494bf3e
fix outdated documentation [ci skip] (#19618)
JohnCoconut Apr 19, 2019
5ca2cd7
prefer delegate constructor over new(this) (#19613)
JohnCoconut Apr 19, 2019
59e0820
rewrite parseIntegerList with better performance (#19619)
JohnCoconut Apr 19, 2019
7f72ee6
update binding generator (#19625)
minggo Apr 22, 2019
690089b
move parseIntegerList to a free function in ccUtils, add few testcase…
JohnCoconut Apr 24, 2019
42ea50d
remove redundant user-defined copy constructor and destructor, (#19636)
JohnCoconut Apr 25, 2019
5dd1021
Changed shader data types mediump to highp to remove possible sprite …
gamehelphere Apr 25, 2019
79893ef
Optimize cases where loop variable is unecessarily copied in a range-…
JohnCoconut Apr 26, 2019
baad26e
Make precheader files PRIVATE, otherwise they leak to the game projec…
Stinkfist0 Apr 15, 2019
776ab10
add optimization for OPPO. (#19631)
xianyinchen Apr 28, 2019
9b038ee
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Apr 28, 2019
7370ab4
add clang-tidy support (#19643)
JohnCoconut Apr 30, 2019
c80bf4e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Apr 30, 2019
2ba1c62
fix FastTMXLayer with anchor point
kackyt Apr 30, 2019
7a75069
fix FastTMXLayer does not reflect Opacity
kackyt Apr 30, 2019
8ee3020
fix Sprite update_blend_func (#19649)
kackyt Apr 30, 2019
a39f393
minor refactoring of AudioEngine
JohnCoconut Apr 29, 2019
98a1898
The scene stack should be cleared in a LIFO manner, which allows for …
rh101 May 3, 2019
ac4af4c
Gradle.5.1.1 (#19657)
crazyhappygame May 5, 2019
6e36f63
enable more clang-tidy performance options (#19656)
JohnCoconut May 6, 2019
8fb45be
minor refactoring of AudioEngine (#19655)
minggo May 6, 2019
5974051
Merge pull request #19661 from rh101/v3
minggo May 6, 2019
3e99584
Merge pull request #19611 from Stinkfist0/private_precheader
minggo May 7, 2019
b5293f2
fix concave polygon bug in DrawNode (#19641)
ShadowJobs May 8, 2019
86acfba
add new clang-tidy option (#19670)
JohnCoconut May 8, 2019
999414f
add new clang-tidy option (#19682)
JohnCoconut May 9, 2019
7784c52
modify fdGetter (#19671)
alexhuangster May 10, 2019
aed3179
fix twice copy lua scripts error (#19687)
drelaptop May 10, 2019
3575127
FIX ios bug : You don’t have permission to save the file “Documents_t…
yangyp-yes May 10, 2019
1fb4ef0
Merge pull request #1 from yang1500313979/yang1500313979-patch-1
yangyp-yes May 10, 2019
ad5dbb2
fix toupper function call
JohnCoconut May 13, 2019
edad341
setPercent after initialization (#19689)
PatriceJiang May 14, 2019
ab4b241
refactor CCIMEDispatcher (#19688)
JohnCoconut May 14, 2019
b33333d
add new clang-tidy option (#19698)
JohnCoconut May 14, 2019
c36dbb4
Fix APK not have assets folder (#19679)
May 14, 2019
ec6e9f9
remove duplicate function call in cmake (#19697)
JohnCoconut May 15, 2019
9ca4920
fix for #19713 (#19714)
Pinchuka May 15, 2019
2204a8a
add missing header
JohnCoconut May 15, 2019
d5e0213
fix string append (#19717)
PatriceJiang May 15, 2019
be3b7a2
add new clang-tidy option (#19699)
JohnCoconut May 16, 2019
9548d4e
fix toupper function call (#19705)
minggo May 16, 2019
86fb9f3
use string::append change name
yangyp-yes May 16, 2019
0754953
fix assign nullptr to std::string (#19615)
EricDDK May 16, 2019
19db791
Merge pull request #19722 from EricDDK/fix_19615_null_str
minggo May 17, 2019
415ae3a
Merge pull request #19693 from yang1500313979/v3
minggo May 17, 2019
42cafac
Support new Mali GPUs (#19411)
AIGRIND-LLC May 17, 2019
023b172
[Change] the CC_64BITS macro to 64-bit decision. (#19723)
EricDDK May 17, 2019
3427ca3
fix wrong buffer type (#19724)
minggo May 17, 2019
6569fc5
new clang-tidy option: readability-string-compare (#19742)
JohnCoconut May 22, 2019
bdb962d
[Android] gradle copy resources to assets folder before `preDebug|Rel…
PatriceJiang May 22, 2019
0065377
remove redundant semicolon (#19743)
JohnCoconut May 22, 2019
2957486
render state of technique shuold be saved in technique (#19725)
minggo May 22, 2019
ace5d96
fix (#19749)
PatriceJiang May 23, 2019
dd99b1c
add clang-tidy-bugprone options (#19750)
JohnCoconut May 24, 2019
767134c
Merge 3.17.2 (#19755)
minggo May 27, 2019
39199b1
remove void arg in func delcaration and reformat (#19758)
JohnCoconut May 27, 2019
2727af8
refactor CCBundle3DData (#19756)
JohnCoconut May 27, 2019
82763f8
refactor CCScene (#19767)
JohnCoconut Jun 4, 2019
bb27140
Added support for saving images with non-premultiplied alpha (#19782)
rh101 Jun 4, 2019
cefdfd4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Jun 4, 2019
6af14cd
skip shapes of 0 area in processTriangles (#19791)
PatriceJiang Jun 4, 2019
0cb62f6
[Android]Override removeDirectory function in FileUtilsAndroid, fix "…
wanghehacker Jun 5, 2019
8addb57
more clang-tidy perf options (#19783)
JohnCoconut Jun 5, 2019
8b48536
fix return value in EditBoxImpl-linux (#19798)
JohnCoconut Jun 6, 2019
da1a503
refactor use const reference
kackyt Jun 6, 2019
30414cc
android_allowBackup2
crazyhappygame Jun 6, 2019
a46236a
Merge pull request #19811 from crazyhappygame/android_allowBackup2
minggo Jun 10, 2019
9b45665
Merge pull request #19759 from kackyt/fix_fast_tmx_layer
minggo Jun 11, 2019
3b5800b
update log_ref (#19840)
PatriceJiang Jun 17, 2019
91bb4d1
update travis ci configuration (#19841)
PatriceJiang Jun 17, 2019
bf90996
install g++6.0 in travis (#19842)
PatriceJiang Jun 18, 2019
d09918b
refactor AudioEngine-Linux (#19822)
JohnCoconut Jun 19, 2019
4afda3a
refactor CCGeometry (#19847)
JohnCoconut Jun 21, 2019
e8bc4b3
fix memory leak in CCUserDefault (#19853)
JohnCoconut Jun 25, 2019
2ac747c
update oppo sdk. (#19864)
xianyinchen Jun 26, 2019
ce1815a
update to 3.17.2 (#19869)
slackmoehrle Jun 27, 2019
9afcfa2
Speed up post build step by disabling unnecessary cmake command (#19873)
rh101 Jun 27, 2019
95d0273
[JSB] Some fixes for cc.DrawNode: (#19889)
ricardopetrere Jul 2, 2019
921d04f
clang-tidy: performance-unnecessary-value-param (#19870)
JohnCoconut Jul 3, 2019
c03c5b4
Add the ability to set global Z order of physics debug draw node (#19…
rh101 Jul 3, 2019
a096ac8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Jul 3, 2019
4107942
fix Wformat warnings (#19893)
JohnCoconut Jul 3, 2019
e7dd2c5
add setOptimise function for c++ (#19882)
xianyinchen Jul 5, 2019
a3911cf
refactor ObjectFactory (#19902)
JohnCoconut Jul 16, 2019
0874818
clang tidy modernize redundant void arg (#19900)
JohnCoconut Jul 16, 2019
3b7eb57
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Jul 16, 2019
8c8005e
fix ZipUtils memory-malloc succ check error. (#19923)
ggggamer Jul 18, 2019
a7809e9
fix lua arg check error. (#19924)
ggggamer Jul 18, 2019
9696569
Fix cocos2d-js issue: Font height was not getting calculated properly…
vaibhavgohel Jul 18, 2019
eb466a3
disable clang-tidy checks on script bindings code (#19928)
JohnCoconut Jul 19, 2019
69e7825
Fix divide by zero in ui::Slider (#19957)
rh101 Jul 22, 2019
a242a79
Small performance boost in using Mat4::operator*= instead of operator…
tankorsmash Jul 23, 2019
8f0df47
fix android crash in special http request header (#19899)
zoxin Jul 23, 2019
6ba59e9
clang-tidy clang-tidy-modernize-use-emplace (#19955)
JohnCoconut Jul 23, 2019
3d60bb1
remove app from recent apps when exit (#19961)
minggo Jul 23, 2019
21bf818
Update 3rd party lib references (#19959)
rh101 Jul 23, 2019
a40444c
refactor-CCDrawNode (#19969)
JohnCoconut Jul 24, 2019
7d0c10f
Revert "Small performance boost in using Mat4::operator*= instead of …
minggo Jul 24, 2019
b442dfe
refactor CCDrawNode: part2 (#19972)
JohnCoconut Jul 24, 2019
888682b
upgrade glfw to 3.3 (#19971)
Mee-gu Jul 24, 2019
b631e4c
Support interface only libraries (#19855)
rh101 Jul 25, 2019
e9dca84
remove MainMenu.xib file. (#19968)
Mee-gu Jul 26, 2019
c6f0196
don't invoke super.onPause() to prevent egl context lost (#19996)
minggo Jul 30, 2019
ec4ebb6
fix v3 travis compiling error (#20002)
minggo Aug 1, 2019
bd6c14f
in Node::enumerateChildren, searchFromParent shouldn't search from ch…
dzj0821 Aug 2, 2019
c840544
fix RotateTo animation when angle is bigger than 360 (#20009)
dzj0821 Aug 5, 2019
67fde78
fix crash when plist filename hasn't suffix (#19999)
dzj0821 Aug 5, 2019
baa6381
[v3] add renderer performance test (#20010)
PatriceJiang Aug 5, 2019
67ba5b4
refactor Quaternion class (#20031)
JohnCoconut Aug 15, 2019
7a72518
Fixing a bug in Node::enumerateChildren (#20045)
ktrongnhan Aug 19, 2019
a8ebce5
update deps (#20051)
PatriceJiang Aug 21, 2019
1a7b99e
fix FastTMXLayer (#20066)
Mee-gu Aug 30, 2019
1875590
update external (#20068)
PatriceJiang Aug 30, 2019
96eb639
[bugfix] v3 Fileutils iOS isDirectory (#20080)
PatriceJiang Sep 4, 2019
a2b2b36
use AVPlayerController instead (#20085)
minggo Sep 4, 2019
ecce450
Ios webview (#20098)
minggo Sep 5, 2019
4c48060
Use external-deps-163 (#20114)
PatriceJiang Sep 12, 2019
e73b7f1
fix memory leak (#20110)
minggo Sep 17, 2019
10a0bb1
uses the same precision for uniforms (#20107)
minggo Sep 17, 2019
efb2d7c
fix bug that system font is not rendered correctly on macOS Catalina …
minggo Sep 17, 2019
f0cdd02
Fix error with update line height (#19914)
kasandko Sep 18, 2019
4439b6b
Fix include order for Win32.
halx99 Sep 19, 2019
ca9ffe0
Merge pull request #20134 from halx99/patch-1
minggo Sep 20, 2019
4356cda
Remove tinyxml2 from CCSaxParser implement. (#20141)
halx99 Sep 20, 2019
ae993e6
Fix RenderTexture PMA setting (#20143)
rh101 Sep 20, 2019
481adca
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Sep 21, 2019
8f454b4
set software mode will slow down performance (#20152)
minggo Sep 23, 2019
068c0f0
Sprite and RenderTexture blending mode set based off texture premulti…
rh101 Sep 24, 2019
a43861e
Make luabindings framework compat with lua52 & lua53. (#20157)
halx99 Sep 25, 2019
8f17512
[v3] update submodule cocos2d-console (#20132)
PatriceJiang Sep 25, 2019
a500e7f
Rename cocos2d::MessageBox to cocos2d::ccMessageBox. (#20159)
halx99 Sep 25, 2019
835fec0
fix OpenGL ERROR 0x0502 cannot delete VAO 0 (#20178)
deflinhec Sep 29, 2019
3f26b75
Upgrade minizip to 1.2.0 (#20158)
halx99 Sep 29, 2019
cc57e2f
Added JS stack trace (#20168)
vyshnavsdeepak Sep 29, 2019
708116f
Update ZipUtils.cpp (#20192)
halx99 Oct 12, 2019
3712166
Update deps to 167 (#20194)
halx99 Oct 12, 2019
5a9a517
fix text wrong warp issue (#20225)
Mee-gu Oct 22, 2019
fa114c4
fix issue: TextField can not receive characters(non number or english…
minggo Oct 24, 2019
f2702fb
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Oct 24, 2019
75db613
PostMessage to SendMessage (#20199)
KAndQ Oct 24, 2019
6e6b37b
fix issue that can not receive Chinese characters with system input m…
minggo Oct 24, 2019
df76b1e
update bullet (#20240)
Mee-gu Oct 24, 2019
f906617
add missing function (#20250)
minggo Oct 25, 2019
917d215
Revert "fix RotateTo animation when angle is bigger than 360 (#20009)…
minggo Oct 27, 2019
41f2c72
update Node::getTag comment (#20255)
tankorsmash Oct 28, 2019
73a4e83
add default CFBundleShortVersionString value to info.plist
Mee-gu Oct 30, 2019
e43ed60
Merge pull request #20268 from Mee-gu/fixInfoPlist
minggo Oct 30, 2019
0d41ade
Unify the effect of printing multiline logs.
KAndQ Oct 30, 2019
ab95b95
Fixes so that in the web view we are able to navigate different links…
deepshah7 Oct 31, 2019
95ccd7f
remove extern "C" from base/base64.h for avoiding base64 function sym…
Naruto Oct 31, 2019
857fb8d
fix lua header path including error (#20277)
minggo Nov 1, 2019
195720b
fix textfield issues (#20294)
minggo Nov 6, 2019
f2ab921
don't set glview transparent, it many cause afterimage (#20298)
minggo Nov 6, 2019
786283d
Allow game code to override BM Font parsing and support rotated font …
rh101 Nov 8, 2019
21b008c
Recompile luajit (#20306)
PatriceJiang Nov 8, 2019
596da2d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Nov 8, 2019
ef16d4f
[iOS]Screen Time would makes App stuck sometimes (#20313)
wanghehacker Nov 12, 2019
5860e85
fixed broken links, removed outdated links. (#20318)
slackmoehrle Nov 12, 2019
ab3998e
Cmake mult config (#20317)
crazyhappygame Nov 13, 2019
69dcd01
Improve bmfont api (#20309)
rh101 Nov 13, 2019
846e57b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Nov 13, 2019
282f3fa
fix issues of textfield (#20303)
minggo Nov 14, 2019
a8a7a92
Fixing a crash in iOS 9.3.5 when we have a layer with WebView getting…
deepshah7 Nov 14, 2019
f7e0421
fix videoplayer crash in release mode (#20327) (#20330)
minggo Nov 14, 2019
9fea479
[v3] fix asan reported errors (#20335)
PatriceJiang Nov 15, 2019
49a9dff
manually maintain reference count (#20329) (#20337)
minggo Nov 15, 2019
1c97e41
fix issue that can not close keyboard if using EditBox on iOS (#20336)
minggo Nov 15, 2019
cdfc781
close keyboard when Done is pressed (#20341)
minggo Nov 18, 2019
8708e82
Added tmx animated tile support, with test case. (#20315)
DEAGS3000 Nov 18, 2019
651acd0
Fix ui::Layout scissor clipping (#20352)
rh101 Nov 20, 2019
796e09f
UIVideoPlayer-ios.mm regression fix. (#20368)
dave-ori Nov 23, 2019
5a9ec25
Fix visual studio console output (#20357)
rh101 Nov 23, 2019
a217661
Fix to properly delete easingParams array (#20374)
sabify Nov 27, 2019
a96ff32
Fix isVariable method buffer overflow. (#20376)
ggggamer Nov 28, 2019
a0df006
[bugfix] Android Device::getDPI / v3 (#20509)
PatriceJiang Apr 30, 2020
6e6cdb6
Update CCPlatformConfig.h (#20693)
crazyhappygame Nov 17, 2021
64977e5
Support python 2 and 3 (#20698)
crazyhappygame Nov 29, 2021
674fc07
Setup github actions for V3 (#20701)
crazyhappygame Dec 2, 2021
387f56a
Fix mac build V3 (#20703)
crazyhappygame Dec 3, 2021
cd7446f
Create pch for all platforms V3 (#20705)
crazyhappygame Dec 6, 2021
e4b6a5e
fix typo (#20810)
gogo2464 Nov 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 33 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
Checks: >
-*,
performance-faster-string-find,
performance-for-range-copy,
performance-implicit-conversion-in-loop,
performance-inefficient-algorithm,
performance-inefficient-vector-operation,
performance-move-const-arg,
performance-move-constructor-init,
performance-type-promotion-in-math-fn,
performance-unnecessary-copy-initialization,
performance-unnecessary-value-param,
readability-container-size-empty,
readability-delete-null-pointer,
readability-redundant-control-flow,
readability-redundant-string-cstr,
readability-string-compare,
bugprone-argument-comment,
bugprone-bool-pointer-implicit-conversion,
bugprone-dangling-handle,
bugprone-fold-init-type,
bugprone-forward-declaration-namespace,
bugprone-forwarding-reference-overload,
bugprone-inaccurate-erase,
bugprone-incorrect-roundings,
modernize-redundant-void-arg,
modernize-use-emplace,

WarningsAsErrors: '*'
HeaderFilterRegex: '/(?!external)/.*'
AnalyzeTemporaryDtors: false
FormatStyle: none
98 changes: 98 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# This is a basic workflow to help you get started with Actions

name: CI

on:
push:
branches: [ v4, v3 ]
pull_request:
branches: [ v4, v3 ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
ubuntu-18_04:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- run: python download-deps.py --r no
- run: echo -e "y" | bash build/install-deps-linux.sh
- run: cmake -B b -S .
- run: cmake --build b

# https://github.com/cocos2d/cocos2d-x/issues/20471
# ubuntu-20_04:
# runs-on: ubuntu-20.04
# steps:
# - uses: actions/checkout@v2
# - run: python download-deps.py --r no
# - run: echo -e "y" | bash build/install-deps-linux.sh
# - run: cmake -B b -S .
# - run: cmake --build b

windows-2019:
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- run: python download-deps.py --r no
- run: cmake -B b -S . -G "Visual Studio 16 2019" -A Win32
- run: cmake --build b

windows-2022:
runs-on: windows-2022
steps:
- uses: actions/checkout@v2
- run: python download-deps.py --r no
- run: cmake -B b -S . -G "Visual Studio 17 2022" -A Win32
- run: cmake --build b

macos-10_15:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
- run: python download-deps.py --r no
- run: cmake -B b -S . -GXcode
- run: cmake --build b --target cpp-tests

macos-11:
runs-on: macos-11
steps:
- uses: actions/checkout@v2
- run: python download-deps.py --r no
- run: cmake -B b -S . -GXcode
- run: cmake --build b --target cpp-tests

ios_macos-10_15:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
- run: python download-deps.py --r no
- run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_SYSTEM_PROCESSOR=arm64
- run: cmake --build b --config Release --target cpp-tests -- -quiet

ios_macos-11:
runs-on: macos-11
steps:
- uses: actions/checkout@v2
- run: python download-deps.py --r no
- run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_SYSTEM_PROCESSOR=arm64
- run: cmake --build b --config Release --target cpp-tests -- -quiet -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)"

android_windows-2019:
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- run: python download-deps.py --r no
- run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
shell: bash
working-directory: tests/cpp-tests/proj.android

android_ubuntu-20_04:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- run: python download-deps.py --r no
- run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
shell: bash
working-directory: tests/cpp-tests/proj.android
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,18 @@ tests/lua-tests/project/proj.tizen/res/
cmake-build-*/
.vs
cmake_build*

# tmp android build files
cocos/platform/android/libcocos2dx/.project
tests/lua-tests/project/proj.android/.project
tests/lua-tests/project/proj.android/app/.project
tests/*/proj.android/.settings/org.eclipse.buildship.core.prefs
tests/*/project/proj.android/.settings/org.eclipse.buildship.core.prefs

# tmp folder for temp usage
tmp/
temp/

# external libs zip
*.zip
**/simulator/
45 changes: 40 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ matrix:
include:
# linux
- os: linux
dist: xenial
env:
- BUILD_TARGET=linux
- GEN_BINDING_AND_COCOSFILE=true
Expand All @@ -10,6 +11,12 @@ matrix:
- secure: M5lyDs0qai15mWHzJdkh0WPfVJJmVZu6SWtYULxatukGPXVwoQvmEtYAwAW+iz6aM+tXksQ/mk6nW5L8UFbHm+n6yrsa5bZU9sGXjilPE8p8bLFYDmIbPRazU+E6pBP3J2CDoAm0XnWkiYQ8feTxKTo6ysLnHAEjyaHTw0+Q1GM=
sudo: required
language: cpp
# clang-tidy
- os: linux
dist: xenial
env: BUILD_TARGET=linux_clang_tidy
language: cpp
sudo: required
# mac_cmake
- os: osx
env: BUILD_TARGET=mac_cmake
Expand All @@ -24,29 +31,52 @@ matrix:
sudo: required
# android ndk-build
- os: linux
env: BUILD_TARGET=android_ndk-build
dist: xenial
env: BUILD_TARGET=android_cpp_ndk-build
language: android
sudo: required
# android_lua ndk-build
- os: linux
dist: xenial
env: BUILD_TARGET=android_lua_ndk-build
language: android
sudo: required
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
# android cmake
- os: linux
env: BUILD_TARGET=android_cmake
dist: xenial
env: BUILD_TARGET=android_cpp_cmake
language: android
sudo: required
# android_lua cmake
- os: linux
dist: xenial
env: BUILD_TARGET=android_lua_cmake
language: android
sudo: required
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
# android_js cmake
- os: linux
dist: xenial
env: BUILD_TARGET=android_js_cmake
language: android
sudo: required
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-6
# mac
- os: osx
env: BUILD_TARGET=mac
Expand All @@ -60,11 +90,13 @@ matrix:
osx_image: xcode9.3
sudo: required
- os: linux
env: BUILD_TARGET=android_cocos_new_test
language: cpp
dist: xenial
env: BUILD_TARGET=android_cocos_new_cpp_test
language: android
sudo: required
- os: linux
env: BUILD_TARGET=linux_cocos_new_test
dist: xenial
env: BUILD_TARGET=linux_cocos_new_lua_test
language: cpp
sudo: required

Expand All @@ -73,6 +105,9 @@ script:
before_install:
- tools/travis-scripts/before-install.sh

jdk:
- oraclejdk8

cache:
bundler: true

Expand Down
109 changes: 108 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,110 @@
cocos2d-x-3.17.2 May.21 2019

[NEW] Network: added clear requests and responses method to httpclient
[NEW] UI: VideoPlayer added ability to enable/disable looping, resonding user input
[NEW] UI: VideoPlayer added function to set style
[NEW] IMEDispacher: added a function to check if any IME dispatcher is active
[NEW] Renderer: add a function to get current clearing color
[NEW] Lua: added binding codes for `EventDispathcer::addCustomEventListener()`

[REFINE] Android: added optimization codes for OPPO devcies
[REFINE] Network: improved websocket traces
[REFINE] Android: supported Android P cutout area
[REFINE] FontAtlas: font atlas texture initialization delayed
[REFINE] LOG: CCLOG may block thread on windows

[FIX] FileUtils:fixed a bug that `listFiles()` can not work correctly if the file path starts with `assets/` on Android
[FIX] AssetsManager: fixed a bug that `_percent` is always be 0 during the update process
[FIX] Texture2D: fixed memory leak if `Texture2D::setAlphaTexture()` is invoked many times
[FIX] FontAtlasCache: avoided crash if a file path is too long
[FIX] Audio: fixed crash on iOS
[FIX] UI: VideoPlayer could not play video in obb file on Android
[FIX] SpriteFrame: fixed performance issue in parsing plist files
[FIX] 3rd: unzip failed to uncompress files

cocos2d-x-3.17.1 Nov.19 2018

[REFINE] Renderer: properly reduce clear buffer times to save energy
[REFINE] Engine: improve the reuse logic of sprite frames cache
[REFINE] Engine: add `GLView::setCursor` for desktop platforms
[REFINE] Engine: add methods to change icons for desktop platforms
[REFINE] UI: improve iPhone X home indicator handling behavior
[REFINE] UI: add line spacing support for system font on iOS and Android
[REFINE] UI: add support for pressed and disabled image in EditBox
[REFINE] UI: shrink extra label text if too long, prevent label too long crash
[REFINE] LUA: add binding code for cocos2d::Downloader
[REFINE] Android: add supporting SafeArea for most edge screens devices
[REFINE] Android: change default value of PROP_BUILD_TYPE from ndk-build to CMake
[REFINE] Android: update project config to gradle 4.6, sdk 28, android gradle plugin 3.1.0
[REFINE] Android: add ability to not stop music on game start in android
[REFINE] Windows: refine CCDevice-win32 BitmapDC
[REFINE] Windows: improve binary folder structure, copy resources to "Resources/" folder
[REFINE] Action: add ui::LoadingBar support to Progress actions
[REFINE] Network: support multiple parameters in SocketIO emit/send method
[REFINE] FileUtils: improve thread safety (use single recursive_mutex)
[REFINE] FileUtils: add getFileSize impl for Windows
[REFINE] FileUtils: add listFiles impl for Android and Windows platform
[REFINE] FileUtils: exact fullPathForDirectory from fullPathForFilename, fullPathForFilename should not accept directory
[REFINE] CMake: improve libraries link, compile options config
[REFINE] CMake: remove un-elegant prebuilt feature at internal cmake build scripts
[REFINE] 3rd: upgrade libwebsockets to 2.4.2 with libuv enabled
[REFINE] 3rd: improve cmake build scripts for external libs
[REFINE] 3rd: upgrade luajit to 2.1.0-beta3, fix random crash in Android release mode
[REFINE] 3rd: external/lua/lua is not referenced in cmake and it will be removed in the near future
[REFINE] Tests: add websocket latency test
[REFINE] Tests: add download multi task test case
[REFINE] Tests: improve part test cases UI shows
[REFINE] cocos console: disable "gen-libs" command
[REFINE] Others: add another xbox 360 configuration
[REFINE] Others: remove ANT_ROOT env check on setup.py
[REFINE] Others: improve cmake tests in travis CI scripts

[FIX] Renderer: handle opengl recreate event for CameraBackgroundDepthBrush
[FIX] Renderer: fix some EVENT_RENDERER_RECREATED problem
[FIX] Engine: fix the last update time was not corrected if next delta time was zeroed
[FIX] Engine: be safe to handle operator= in CCData
[FIX] Engine: aviod reading outside of the buffer when print log
[FIX] Engine: avoid duplicate find action when already found
[FIX] Engine: prevent free _bytes when src and dest are identical in CCData
[FIX] Engine: fix Console::loop() consumes 100% of CPU usage
[FIX] Engine: fix Action doesn't work when follow Node added PhysicsBody
[FIX] UI: fix locate image path relative to tsx file error in TiledMap
[FIX] UI: fix several bugs with button's title, include memory leak
[FIX] UI: fix LabelLetter::isVisible always return false
[FIX] UI: fix not support sprite frame when ignoreContentAdaptWithSize is false
[FIX] UI: fix out of range access in Label
[FIX] UI: fix Widget::getAncestorWidget error
[FIX] UI: fix iOS editbox EndAction wrong when single line mode (UITextField)
[FIX] UI: Fix for Label and UIRichEdit text trailing space trimming
[FXI] JavaScript: fix crash if garbage collection runs between TouchStart and TouchEnd event
[FIX] Audio: fix AudioEngine rotateBufferThread crash on iOS
[FIX] Audio: add extra init checks in pcm audio service, avoid crash in PcmAudioService
[FIX] Audio: fix AVAudioSessionErrorCodeCannotStartPlaying error may occur on Apple
[FIX] Audio: fix background music may resumes even the application is on the background on Android
[FIX] Audio: fix AudioCache* holding invalid pointer value
[FIX] Network: fix memory leaks in WebSocket
[FIX] Network: fix websocket memory zereoing size error
[FIX] Network: fix https downloader timeout on win/mac
[FIX] Network: fix "cc.loader.load" convert url error
[FIX] iOS: fix project build warnings in Xcode
[FIX] iOS: fix crash when saving gray colorspace image
[FIX] iOS: `js/lua tests` fix double free issue on app exits.
[FIX] Android: shorten C++ build path, reduce long path error on Windows
[FIX] Android: keep cocos2dx activity at task root by mark "singleTask" in manifest
[FIX] Android: fix crash caused by JNIEnv null pointer in getStringUTFCharsJNI function
[FIX] Android: use 'Binary names' style on JNI for ClassLoader.loadClass
[FIX] Android: allow cleartext HTTP traffic by default for all tests project
[FIX] Windows: Support VS2017 in release mode
[FIX] Action: fix repeat CallFunc for some times, may never stop
[FIX] Physics: fix PhysicsJointMotor setRate and getRate Bad Access Crash
[FIX] FileUtils: fix removeDirectory() failure on win32
[FIX] FileUtils: let getContents return an error code when the filename is a directory
[FIX] FileUtils: let isFileExistInternal return false when folder as parameter on Linux
[FIX] LUA: performance drop bug introduced in 3.17
[FIX] CMake: fix project name always be "TemplateCpp" when create a new project
[FIX] Tests: fix auto test stop in cpp-tests project
[FIX] cocos console: do uninstall only when that app is installed for android

cocos2d-x-3.17 May.21 2018

[HIGHLIGHT] Android: support Android Studio 3.0, NDK 16
Expand Down Expand Up @@ -1164,7 +1271,7 @@ cocos2d-x-3.7rc0 July.1 2015
[NEW] C++: Added ActionFloat
[NEW] C++: Supported physical keyboard on WinRT
[NEW] FileUtils: checked filename case characters on windows
[NEW] FileUitls: added supporting loading files that which file path include utf-8 characters
[NEW] FileUtils: added supporting loading files that which file path include utf-8 characters
[NEW] PhysicsShape: added sensor property
[NEW] Sprite: used triangle command
[NEW] 3d: Added `getFarPlane` and `getNearPlane` in `Camera` class
Expand Down
Loading
Loading