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 #21

Merged
merged 15 commits into from
May 14, 2020
Merged

Sync with master #21

merged 15 commits into from
May 14, 2020

Conversation

rh101
Copy link
Owner

@rh101 rh101 commented May 14, 2020

No description provided.

PatriceJiang and others added 15 commits January 6, 2020 09:34
* Fix for issue #19890

* Updated with better fix from the V3 PR #18651

* Formatting fix

* Fixed issue with incorrect type (double instead of float) when compiling on certain platforms.

* Another attempt to fix compilation issue
* Merged improved BM font API from Cocos2d-x V3.  Code based on #20309 and #20300

* Added missing test resources.
Each tilemap row would be shifted to the right a certain number of
tiles.
This is caused by the carriage return in windows being '\r\n' and
the way each csv line is parsed.
The '\r' at the beginning of each line would be parsed as a tile id.
On windows we must remove all 'r' from the csv string.
* Update CMakeLists.txt

* Update CMakeLists.txt

* Update CMakeLists.txt
Fix to compile with Visual Studio 2019.
Ricardo.
@rh101 rh101 merged commit 8e46166 into rh101:v4 May 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants