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

Sync with master branch #4

Merged
merged 62 commits into from
May 29, 2019
Merged

Sync with master branch #4

merged 62 commits into from
May 29, 2019

Conversation

rh101
Copy link
Owner

@rh101 rh101 commented May 29, 2019

No description provided.

larisand and others added 30 commits April 7, 2019 18:04
There is an unmatched ");" in the file at line 720.
* Fix bug: can't play video in obbfile.

* Change check order.
The token array shouldn't be static in CCPUScriptTranslator.h,
otherwise including it will generate duplicate token array.
* Update UIDeprecated.cpp

There is no need of this last "}".

* End the NS_CC properly.

Change the "}" with NS_CC_END to avoid misunderstandings.
* add build test option for cmake

* configure build test option for cmake
…sed is a single character string literal. The character literal overload is more efficient. (#19614)
as compiler auto-generated ones are working fine.
…for loop. (#19637)

Pass by const reference when appropriate.
…t (e.g. precheader.cpp visible in MyGame's Visual Studio project).
* add clang-tidy support

* move clang_tidy_test up in travis yaml file

so that it's run first

* use dump-config to generate .clang-tidy file

* use flexible way to find run-clang-tidy.py

clang-tidy and run-clang-tidy.py shares common ancester directory.
find the script dynamically rather than hard-coding it.

* place clang-tidy check options in separate lines

* clang_tidy_test target clean up
* emplace_back accept constructor args directly
* use reserve

* remove superfluous null pointer check

* add null pointer check
* gradle-5.1.1

* update bindings-generator

* classpath 'com.android.tools.build:gradle:3.4.0'
* enable more clang-tidy performance options

* fix warning: performance-type-promotion-in-math-fn

prefer c++ math functions, as it handles float and double case
correctly. For example, std::sin has overload for both float and
double, but sin only has double argument. C++ math functions avoids
unnecessary floating point type conversions.

* add missing cmath headers

* change log to std::log
* emplace_back accept constructor args directly
* use reserve

* remove superfluous null pointer check

* add null pointer check
Clear the scene stack in the expected order
Make precheader files PRIVATE, otherwise they leak to the game project
* add concave polygon support to DrawNode

* change to cocos2d-x coding style

* add the url of the code comes from

* move test code to a seperate class
* add new clang-tidy option

* readability-container-size-empty

* minor fix for UnitTest

* clang-tidy: filter external directory

* add comment on python regular expression [ci skip]
yangyp-yes and others added 29 commits May 10, 2019 16:56
…emp”

The iOS side, eg:Writable directory is "**/Documents/",old code will get "**/Documents_temp/", However, due to the sandbox mechanism of iOS, you do not have the permission of this directory, so instead fixed it to  "**/Documents/_temp/"
FIX ios bug : You don’t have permission to save the file “Documents_t…
* Original pointer cast does nothing, as it doesn't change signature
* toupper arugment type should be unsigned char

Reference: https://en.cppreference.com/w/cpp/string/byte/toupper
* remove superfluous destructor
* use range-based for loop
* correct some documentation
* readability-redundant-control-flow
* Fix APK not have assets folder

* Android project: copy all res to assets folder
* AssureOutOfSourceBuilds() is called in module file. No need to
call it in root cmake file.
* readability-redundant-string-cstr
* fix toupper function call

* Original pointer cast does nothing, as it doesn't change signature
* toupper arugment type should be unsigned char

Reference: https://en.cppreference.com/w/cpp/string/byte/toupper

* add missing header
 FIX ios bug : You don’t have permission to save the file “Documents_temp”
* Support new Mali GPUs

Some new Mali GPUs use FP16 for matrix that is not precise enough. Should be FP32. Tested on Mali-T880.

The same issue is described here:
https://discuss.cocos2d-x.org/t/critical-issue-regarding-rendering-on-devices-with-renderer-type-mali/45568

* More convenient way to fix the shader precision.
…easeBuild` (#19732)

* fix get environment

* update gradle.scripts

* fix error

* remove extract modifications
* add clang-tidy-bugprone options

* bugprone-argument-comment
* bugprone-bool-pointer-implicit-conversion
* bugprone-dangling-handle
* bugprone-fold-init-type
* bugprone-forward-declaration-namespace

* enable more clang-tidy bugprone options

* bugprone-forwarding-reference-overload
* bugprone-inaccurate-erase,
* bugprone-incorrect-roundings,
* modify engine version (#19677)

* protect empty string (#19680)

* fix twice copy lua scripts error (#19687) (#19691)

* rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* (#19694)

* fix get environment (#19690)

* update release note and change log (#19711)

* [js-tests/cpp-tests] iOS: add fonts to Info.plist (#19708)

* add fonts to Info.plist

* use tabs instead of spaces

* fix lua-tests

* Update CHANGELOG

* setPercent after initialization (#19718)
f(void) is same as f() in C++ (but not in C), hence removing void.
And reformat the code around f(void) a bit.
* remove superfluous constructor and non-virtual destructor

destructor should be trivial if it doesn't manage resource. A vector
member clears itself automatically. No need to call `clear` in
destructor.
@rh101 rh101 merged commit 30fb96e into rh101:v3 May 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet