Commit Graph

37285 Commits

Author SHA1 Message Date
Umair Javed ec1fc92e37 Added initialisation checks in pcm audio service (#18934) 2018-07-13 16:24:36 +08:00
leda 275c37e430
update console sub-module for license changes (#18930)
update console sub-module for license changes, and check appveyor CI
2018-07-11 14:43:39 +08:00
boondaburrah 40934faf09 Fix OSX linker error with missing GameController.framework (#18926)
* Fix OSX linker error with missing GameController.framework

* remove GameController.framework from jscocos2d_depend_libs

GameController.framework is now included in all APPLE builds so it's not necessary to include it twice.
2018-07-11 09:40:18 +08:00
leda 8d4ee80ac1
add test case for issue #18597(audio crash on iOS), and fix (#18865)
* use atomic_bool type for _isRotateThreadExited

* add test case for issues 18597

* fix test case error

* add data race comments, fix lock usage error

* add comments for audioplayer

* fix typo in comments

* revert wrong changes

* update test case, keep reproduce

* add alSourceUnqueueBuffers before stop

* improve UnqueueBuffers

* detail test case to show side effect

* remove unused comments

* add comments for AudioPlayer change

* correct a audio log level

* change log level from W to VV

* update time step, add play state check

* remove record time of UnqueueBuffers
2018-07-11 09:36:57 +08:00
Koveshnikov Peter e27f33a74b Issue18909 Widget::getAncestorWidget fix (#18913) 2018-07-10 23:02:37 +08:00
newnon df4d8e75f6 Fix websocket memory zereoing (#18643) 2018-07-10 22:57:05 +08:00
Valera d1597a0e3e Fix iCCP profile using mogrify (#18908) 2018-06-29 11:14:13 +08:00
leda b26e1bb086
correct #18768, add check for unsafe strcpy() (#18885)
* add check for unsafe strcpy()

add check for unsafe strcpy()

* complying with required coding style

substitute tab with 4 spaces

* NULL -> nullptr
2018-06-08 17:52:50 +08:00
Valera 702fc83974 Fix include guard in CCEventListenerMouse.h (#18872)
* Fix include guard in CCEventListenerMouse.h

* Remove extra new line
2018-06-08 17:13:38 +08:00
rh101 fd7f7ba085 Fix for Label and UIRichEdit text trailing space trimming (#18876)
* [UIRichText.cpp] Allow user to select if they want to trim trailing spaces for a RichElementText. Also fixed crash if estimatedIdx is less than 0 in certain conditions.
[UIRichText.h] New flag added for enabling trailing space trimming.
[CCLabelTextFormatter.cpp] Only trim trailing whitespace if lines are being split. This will trim all whitespace up to the next non-whitespace token in a line.

* Fix for oversized sprites that need to be offset by X and Y to be aligned correctly in the UIRichText

* Revert "Fix for oversized sprites that need to be offset by X and Y to be aligned correctly in the UIRichText"

This reverts commit fc5492e878a982ff748488bf1de4ffa88a3d4755.

* [UIRichText] Reverted changes made for trimming since they are no longer required. The changes made to CCLabelTextFormatter.cpp fixed all the current issues.

* Added test cases from #18869

* Removed the forced trailing space clipping since it is not required here, and causing side-effects.

* Removed comment that no longer applies to that section of code
2018-06-08 17:06:29 +08:00
Jo Huang 5d7e58a2a1 Fix iOS editbox EndAction wrong when single line mode. (UITextField) (#18870) 2018-06-01 11:11:21 +08:00
CocosRobot 8988f999f6 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18868) 2018-05-30 21:54:47 +08:00
CocosRobot 1b5f08f528 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18866) 2018-05-30 20:56:51 +08:00
Stewart Imel c84c5761a1 fix typos and grammar in comments (#18853) 2018-05-30 20:41:59 +08:00
Vasily Fomin eb87dec447 Fix misleading comment text in CCMenu.h (#18855) 2018-05-30 20:39:23 +08:00
Ricardo Petrére dfdaf9ed61 cc.PI2 was only present in html5 release, added it into JSB (#18860)
[JavaScript] cc.PI2 was only present in html5 release, added it into JSB
2018-05-30 20:36:21 +08:00
ggggamer 59c854a159 Avoid duplicate find action when founded. (#18863) 2018-05-30 20:33:53 +08:00
pyrosphere d1661a7e85 Fix ZipUtils include headers order (#18857)
An old hack that changed the default order of included headers in ZipUtils causes issues when compiling cocos2d for Android 64-bit, throwing errors of missing `fgetpos` and `fsetpos` functions.
2018-05-29 22:57:15 +08:00
leda 1f1664ae27
fix cmake win32 macro definitions, and improve (#18856)
* fix win32 macro error, improve cmake macro define

* add more comments
2018-05-28 09:27:03 +08:00
panzhihao cc145cb852 be safe to handle operator= (#18850)
* 等号赋值函数,先判断this是否不等于other再做赋值

1、CCData那个会闪退
2、CCGLProgramState那个会造成_value.tex.texture泄漏

* replace TAB to  4 SPACE
2018-05-25 09:58:11 +08:00
leda a44e208975
fix cmake android prebuilt libcpufeatures path error (#18847)
* add cpufeatures lib output path

* added audio header
2018-05-25 09:56:19 +08:00
CocosRobot 2b80503972 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18844) 2018-05-23 11:32:42 +08:00
leda 1ea57fe42a
let app resource path visible when executing "cmake .." on win32 (#18839) 2018-05-23 11:23:16 +08:00
Valera 0519685f72 Add methods to change window icons on windows and linux (#18833)
* Add GLViewImpl::setIcon and GLViewImpl::setDefaultIcon for windows and linux

* Include CCImage.h only if required

* Fix empty icon image

* Fix windows build

* [skip ci] Replace `{ return; }` with `{}`

* Add icon test to cpp-empty-test

* [skip ci] Replace TABs with spaces, add comments

* Chnage requested things, fix formatting

* Fix define

* Fix ios build
2018-05-23 09:29:49 +08:00
Sylvain L. Kamdem baceef7678 Update CHANGELOG corrected little mistakes (#18841) 2018-05-22 22:22:19 +08:00
leda eae47d008d sync 3.17 to v3 (#18837)
* fix cmake use sqlite3 error on macOS (#18822)

* fix cmkae dumplicate include dir in macOS

* reduce outer effect when fix js-tests sqlite link error

* improve fix dumplicate include-dir

* sqlite3 use error

* add sqlite3 lib link for iOS (#18825)

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18823)

* docs update for 3.17 release, ChangeLog and ReleaseNotes (#18824)

* start add changelog for 3.17 changes

* add changelog

* go on changelog

* refine and reorder changelog

* finish change log

* add a miss item

* start ReleaseNote

* add more changelog

* add test env

* add doctoc

* improve some words

* remove typo error

* improvement

* bugs -> Bugs

* detail releasenotes

* improve release notes

* finish improve ReleaseNotes

* add english releaseNotes

* improve english release note

* add english doctoc

* some improvements

* fix typo error

* improve english tittle

* update root Readme (#18830)

* adapt readme for 3.17 release

* add a item for getting help

* reorder get help

* modify for release (#18831)

* modify for release

* started CMake doc edits

* revisions

* sync Chinese release notes with English improvements (#18832)

* sync chinese release notes with English improvements

* little fix

* update doctoc

* update releaseNotes doctoc
2018-05-21 17:06:29 +08:00
leda 9ccc271591 add download multi task test case (#18795)
* add network test case

* improve download task

* Trigger CI
2018-05-17 09:10:51 +08:00
leda e74e07bde4 refactor cmake copy res, fix #18813 (#18816)
* refactor cmake cocos copy res function

* refactor cmake dll copy from add_custom_command to configure_file
2018-05-17 09:07:17 +08:00
newnon b940d7dcdb Аdded the ability not to stop sound & music on game start in android and changed default behaviour to not stop (#18640) 2018-05-15 14:30:05 +08:00
CocosRobot 7ef5745003 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18821) 2018-05-15 10:20:46 +08:00
Peter Siegmund bac694dc55 fix reorder warning (#18819) 2018-05-14 10:34:56 +08:00
leda 4675ee79cd correct iOS project config when using CMake `-GXcode` generate (3.17 round 2 test) (#18808)
* ARCH_DIR only useful for search linux prebuilt libs

* add iOS app target ONLY_ACTIVE_ARCH property

* set Xcode property for application, include all depend target

* fix bugs-editbox-win32 crash

* improve EditBox-align test case

* typo error

* update cocos-console submodule

* VS RelWithDebInfo build use release folder external libs
2018-05-11 15:09:09 +08:00
leda f5e35cfe4f check android Gradle config for release mode (#18804)
* update getCocosCommandPath function

* fix typo error in proguard-rules

* update gradle judge OperatingSystem API

* keep default ndk-build
2018-05-11 15:07:19 +08:00
leda 391f30a3f3 beauty cmake format, reduce duplicate defines (#18799)
* reduce cmake module duplicate

* make module use more clear, correct cmake style

* keep default physics option

* delete the modules distributed with cmake

* unify the cmake files format

* use AndroidNdkModules at cmake sys modules

* add cmake comments for win

* update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
Kazuma Ito 9942b06592 Fix link in README (#18776)
In #18644, the link `webchat.freenode.net` was deleted.
But, it has not been completely deleted.
So, I deleted the remaining links.
2018-04-25 09:51:24 +08:00
leda a5c52607d5 check test cases and fix small bugs before 3.17 release (#18786)
* update edit box H alignment case

* improve label no-break-space test case

* fix label test cases bug

* add GetterSetter define for the placeHolder of TextField

* fix event condition bugs on ParticleTest.lua
2018-04-25 09:50:53 +08:00
leda 9275dda539 adjust android / linux build config for cocos CLI (#18780)
* make android native build default mode clear

* update android native build comment

* temp change sub-module, need change before merge

* change tests project cmake file dir

* change PROP_BUILD_TYPE to PROP_BUILD_TYPE

* change var name for build.gradle

* modify others 3 tests project config

* make compile_sdk_version same as target_sdk_version

* update sdk version in CI config script

* update sub-module to cocos2d

* let the cmake build of template  project more clear

* update cocos-console submodule
2018-04-24 13:46:20 +08:00
François Perrad 2991a18fae CMake: avoid unsafe header path when cross-compiling (#18782) 2018-04-23 09:04:45 +08:00
leda ed0288f22d replace ptr_fun with lambda, avoid compile error (#18783)
* update trim func, avoid compile error using c++17

* resume wrong deleted
2018-04-20 18:04:19 +08:00
CocosRobot 68adbb08ec [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18779) 2018-04-20 17:50:34 +08:00
leda fbad734633 Revert "fix issue that render texture will have wrong effect if using with global z order (#18629)" (#18777)
This reverts commit 38864456bf.
2018-04-19 09:37:05 +08:00
leda bed8c0ac77 add bullet include dir to cocos mk (#18774) 2018-04-19 09:27:15 +08:00
leda 8ada72aa5c update web Spine to 3.6.39 2018-04-19 09:26:37 +08:00
Slack-Moehrle 1ffd22f313 updated README (#18760)
corrected that we support Android Studio. Fixed language for CMake introduction and usage.
2018-04-08 09:35:16 +08:00
Jordi Vilalta Prat 712b093b27 Don't count spaces at the end of line as part of the line width (#18751) 2018-04-04 11:53:16 +08:00
leda 383c5afa6b Fix sqlite link error,CMake support iOS app Icon (#18746)
* make pack iOS app on Device easier

* fix sqlite link error

* fix app no Icon on iOS when CMake generate Xcode project

* remove useless info.plist source add

* rollback default iOS platform to device

* update cmake readme for ios build

* change android default build to ndk-build, not cmake
2018-04-03 11:18:22 +08:00
sp-andres-barrera d66af06112 Support for non-breaking characters in label (#18753)
* Added non-breaking character check function

* Check for non-breaking characters in words when formatting label text

* Added nbsp again as space character (removed in previous PR https://github.com/cocos2d/cocos2d-x/pull/18147)
2018-04-02 10:27:26 +08:00
halx99 6317e35f01 Fix issue #18724 (#18741)
see issue: https://github.com/cocos2d/cocos2d-x/issues/18724
2018-03-20 10:13:33 +08:00
CocosRobot 542f064c37 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18740) 2018-03-19 10:15:40 +08:00
CHP 64a81ca13b Simplify CI scripts (#18734)
* Fix win32 cpp-template, speedup appveyor, add cocos new CI configuration

* fix cocos new for win32

* Add cocos new test to travis CI

* Remove mac_cocos_new_test

* install_linux_environment, gradlew build

* unify android setup

* Install andorid to android-ndk

* Set NDK_ROOT

* lua-tests set proper path

* Android build only debug

* Refactoring

* Linux verbose output

* Linux verbose output

* Clean up appveyor CI

* Fix gen-bindings

* pyenv install latest python

* pyenv init

* eval pyenv init

* split android to cpp and lua

* Simplify CI scripts

* Remove easy_install

* Update before-install.sh

* Update run-script.sh

* Init pyenv
2018-03-19 09:21:51 +08:00