Commit Graph

1047 Commits

Author SHA1 Message Date
Wilson E. Alvarez cdee1e11de Performance tweak: use range-based for-loops instead of iterator-based for-loops. (#16642)
* Use ++ prefix instead for non-primitive data types in CCAutoPolygon.cpp

* Use ++ prefix instead for non-primitive data types in SimpleAudioEngine.cpp

* Use ++ prefix instead for non-primitive data types in CCNodeLoaderLibrary.cpp

* Use ++ prefix instead for non-primitive data types in CCActionManagerEx.cpp

* Use ++ prefix instead for non-primitive data types in CCDataReaderHelper.cpp

* Use ++ prefix instead for non-primitive data types in HttpClient-android.cpp

* Use ++ prefix instead for non-primitive data types in CCDevice-linux.cpp

* Use ++ prefix instead for non-primitive data types in ScriptingCore.cpp

* Switched implementation to range-based for loops

* Added readability, fixed loop in CCDataReaderHelper.cpp

Thanks to Dimon4eg for the code review.
2016-10-11 10:59:44 -07:00
zilongshanren 5b109854c3 fix mac system font creation with NSFont 2016-10-08 14:34:55 +08:00
Dmitry 771a69709f fix for #16589 (#16636) 2016-10-04 22:26:40 -07:00
minggo 5785c3fcdd use SharedPreferences.apply() instead (#16632) 2016-09-30 14:58:30 +08:00
mogemimi 8b703a8d12 Fix implicit conversion warning (#16598)
* Fix implicit conversion warning

* Change SAXParser::textHandler parameter type from int to size_t
2016-09-26 14:49:47 +08:00
Steve Tranby b22efc9115 Features: add events for window resize, focus, and unfocus (#16578)
* add events for window resize, focus, and unfocus

* fix typo
2016-09-20 20:32:33 -07:00
minggo 84a102edf8 merge v3.13.1 back to v3 2016-09-15 10:08:28 +08:00
mogemimi afe8b05da8 Remove semicolons before method bodies (#16566) 2016-09-14 10:44:00 -07:00
Jun Hyeon, Nam 4342aabe28 remove unnecessary comments (#16572) 2016-09-14 10:42:25 -07:00
minggo 3075108f1c get sdk version from java (#16546) 2016-09-12 09:49:39 +08:00
mogemimi 2b9ac2c950 Remove redundant semicolons (#16558) 2016-09-12 09:45:34 +08:00
mogemimi eca7b2392d Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
minggo 569681f6bd use api level 13 (#16538) 2016-09-07 14:50:03 +08:00
Ricardo Quesada 282959cc0f fix: uses correct design resolution (#16534)
fixes github issue #16485
2016-09-07 12:01:40 +08:00
Peter Siegmund 9449e687af fixed compile error for android-studio build (with-controller) (#16529) 2016-09-07 12:01:11 +08:00
Ricardo Quesada 2d1048bd00 fix: uses default designResolution if not set previosly (#16533)
fixes github issue #16485
and re fixes github issue #16003
2016-09-07 11:11:52 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory (#16522)
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
2016-09-06 10:14:14 +08:00
minggo db21e5f349 [ci skip]Travis enable pull request (#16494)
* refactor travis and build pull request

* delete unneeded file
2016-09-01 16:25:47 +08:00
Renato Almeida 1c40d5e16d Fix MessageBox inverted params on Android (#16484) 2016-09-01 16:10:02 +08:00
子龙山人 0b1f61b8ce fix possible crash of label shrinked (#16456) 2016-08-29 15:23:01 +08:00
minggo df3b33cd59 Merge pull request #16457 from minggo/merge-v3.13
Update rapid json to version 1.1.0.
2016-08-29 15:22:01 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
mogemimi 86563af08a Add missing override keywords 2016-08-28 23:45:15 +09:00
halx99 5bc3659a33 #Improve XML parse performance with rapidxml pure SAX parser (#16419)
* Update CCSAXParser.cpp

* #Improve XML parse performance with rapidxml pure SAX parser without compatible break.

* put rapidxml to external

* Update deps
2016-08-24 16:37:03 -07:00
Michael Kösel c339266556 [UserDefault-android] Return defaultValue parameter instead of some default value (#16416)
* Return defaultValue parameter instead of some default value

* Remove unnecessary semicolon
2016-08-24 18:07:17 +08:00
Adrien de Sentenac 3c60398c09 Fix size/position calculations for Linux system fonts. (#16328) 2016-08-23 12:01:43 +08:00
minggo 1b3ff00cef fix compiling error (#16420) 2016-08-23 11:05:01 +08:00
pandamicro f0be4f3069 Merge part of Cocos2d-x-lite (#16380)
* Update js auto binding settings with new ndk version

* Remove unnecessary property from Ref

* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup

* Fix spine track entry circle referencing issue

* cocos2d/cocos2d-x#16327: Fix global object leak issue in JSB

* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey

* Update JS versions

* Add docs for web v3.13

* Improve ScriptingCore

* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone

* Fix auto bindings configurations

* Update web ref
2016-08-19 16:28:47 +08:00
Ricardo Quesada 3ecaa71944 fix: validates director before layout in iOS (#16394)
Adds Director::isValid()
removes DisplayLinkDirector()
removes virtual functions from Director()
Director is no longer an abstract class

github issue #14276
2016-08-18 18:13:15 -07:00
minggo 3ce4134ab3 use java reflection to avoid API level dependent, use app-abi 10 (#16371)
* use java reflection to avoid API level dependent, use app-abi 10

* add license header
2016-08-17 13:55:26 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
minggo 03723da032 implement bsd_sinal for compiling or Android 21+ (#16292) 2016-08-02 16:52:15 +08:00
Dred95 d68f105da4 Fix openURL ubuntu error (#16283) 2016-08-01 11:51:05 +08:00
mogemimi c03dd85c3f Remove redundant includes (#16285) 2016-08-01 10:22:35 +08:00
QingliWang bbfd2d334c Some bug-fix and quality assurance for Tizen support. (#16281)
* Support audio interruption and resume callback when change earphone status.

* Refactor keyevent callback and add makecurrent for compatible with different binary.

* Enable Tizen indicator.

* Remove the unnecessary evasobject in the window and refactor the function for glview mode.

* Fix the compatible issue between Tizen 2.3 and 2.4.

* Fix the wrong directory of script resources for HellLua template project.

* Create performance-test project for Tizen platform.
2016-07-31 22:32:59 +08:00
Vladimir Perminov 817ab329f2 Win32 MessageBox correct show utf8 and LuaLog convert utf8 by common unicode api. (#16249)
* Win32 MessageBox correct show utf8

Support MessageBox utf8 string
based on pr #16234

* LuaLog convert utf8 by common unicode api.

* Add CCStdC.h
2016-07-29 09:36:39 +08:00
Vladimir Perminov 09aa7d9cf4 Win32 move unicode utils global. (#16234)
* Win32 move unicode utils global.

It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.

* Move to CCUtils-win32

Also in WinRT version.

* Copyright
2016-07-28 09:57:29 +08:00
Ricardo Quesada 47e6b0cf3d Merge pull request #16237 from ricardoquesada/issue_16220
Compile on macOS 10.10 and lower
2016-07-27 13:30:59 -07:00
Ricardo Quesada 9dcc1f8193 Compile on macOS 10.10 and lower 2016-07-27 07:44:00 -07:00
Ce Zheng 9903d31031 fix CCImage premultipliedAlpha for ETC format
translucent part of ETC format textures are rendered too bright due to
the fact that v3.12 sets PremultipliedAlpha to true by default. This
commit sets default value of _hasPremultipliedAlpha = false, deletes
unnecessary `_hasPremultipliedAlpha = false` code in multiple places,
making ETC format's _hasPremultipliedAlpha false while keeping other
formats unchanged.
2016-07-26 19:17:10 +09:00
mogemimi 093ef3a14f Fix typos in variable names 2016-07-26 04:06:01 +09:00
minggo cc14a06800 Issue 14206 (#16201)
* don't trigger applicationWillEnterForeground at first time to be the same as iOS

* rename first to firstTime
2016-07-25 14:25:48 +08:00
mogemimi 15030ad4c3 Fix typos in log messages 2016-07-25 02:53:22 +09:00
minggo a97906a280 Merge pull request #16184 from minggo/issue-16161
Issue 16161
2016-07-22 13:51:54 +08:00
minggo 8419cc2662 Merge pull request #16183 from SaxonDruce/android-willplaymusic
Implement willPlayBackgroundMusic() on Android
2016-07-22 10:57:26 +08:00
minggo fcd02f109e Merge pull request #16189 from mogemimi/fix-docs-typo
Fix typos in documentation and comments
2016-07-22 10:55:05 +08:00
Ricardo Quesada 1a834ebdbf fix: FPS appears again
Sets default glviewport() when the GLView::updateDesignResolutionSize()
is called

github issue #16139
2016-07-21 15:12:57 -07:00
mogemimi 94d4971ddc Fix typos in documentation and comments 2016-07-22 02:05:19 +09:00
Saxon Druce de091cd3d9 Implement willPlayBackgroundMusic() on Android, to return false if there is other music already playing in another app. 2016-07-21 14:29:13 +08:00
minggo 26dd7b2698 remove curl link for Android 2016-07-21 11:56:56 +08:00