Commit Graph

38125 Commits

Author SHA1 Message Date
gestern 368684d13d Android: Adds supporting edge screens ()
* Android: Adds supporting edge screens

* Update CCGLViewImpl-android.h

* getSafeAreaRect(): Specifying indentation

Specifying indentation if the scale factor is different for grid
2018-09-15 16:45:22 +08:00
Arnold d9b2e0519d cocos2d::Data: prevent use after free. () 2018-09-14 14:36:47 +08:00
leda 5c170877e0
delete ANT check on setup.py ()
* update submodule

* delete ANT check on setup.py
2018-09-14 14:24:07 +08:00
Arnold e1d34fac0e linux: libfmod soft link use relative path () 2018-09-14 10:22:58 +08:00
leda 1e780cb1fe
rename CMake project name when "cocos new" () 2018-09-13 18:03:44 +08:00
Arnold 3d880f9bfb rebuild soft link after file copied to external/ () 2018-09-13 10:08:22 +08:00
minggo 7dcee2bcf9
Remove ccglstatecache () 2018-09-11 14:39:30 +08:00
verketh 482c9eb8ca add image format check for Image::saveToFile in CCImage-ios.mm ()
IOS保存灰度图崩溃
2018-09-10 16:35:31 +08:00
WangHe 3c8c5139c1 add error check for AVAudioSession setActive. () 2018-09-10 16:23:40 +08:00
Guilherme Gibertoni 6fb631e68e fix background music may resumes even though the application is on the background ()
If the device is locked or sleeps
Then the application that was running on foreground will be dismissed and trigger a onWindowsFocusChanged(true) event while the game is already on background
2018-09-10 16:06:43 +08:00
ggggamer cf56f96a14 ClassLoader.loadClass use 'Binary names'. () 2018-09-10 15:06:19 +08:00
ggggamer f91ef9deee Fix some EVENT_RENDERER_RECREATED problem. ()
* fix EVENT_RENDERER_RECREATED problem

* macro

* Event listener should add only once.
2018-09-10 15:04:35 +08:00
CHP 6a442192d4 Fix uninitialized variables problems found by drmemory () 2018-09-10 11:23:14 +08:00
CHP 548f50b92b Fix auto test ()
* Fix auto test

* Add atomic include
2018-09-10 10:21:11 +08:00
TankorSmash 768ba5b6af add another xbox 360 configuration ()
This is more a standard wired 360 controller.
2018-09-10 09:52:41 +08:00
CocosRobot c99611589c [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 2018-09-07 09:25:07 +08:00
Arnold eb920949a2 Add websocket latency test ()
* compile on windows

* update android.mk, add WebSocketDelayTest.cpp

* update xcode project

* mac: fix printf format argument %llf

* update cmake
2018-09-07 09:11:04 +08:00
Arnold 8d75c07dcb Upgrade dep libs ()
* add libuv
* recompile libwebsocket 2.4.2 with libuv enabled
2018-09-06 16:07:25 +08:00
leda 80279cbf21 mark cocos2dx activity as "singleTask" () 2018-09-04 13:57:44 +08:00
Arnold f99c81c336 https downloader timeout on win/mac () 2018-08-31 10:12:04 +08:00
Jeff Wang 925b727bb1 replace setColor with setTextColor for RichElementText () 2018-08-17 11:52:16 +08:00
CocosRobot e946c11eb3 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 2018-08-07 11:24:27 +08:00
Jeff Wang 3948e5eece refine EditBox: add support for pressed and disabled image ()
* refine EditBox add support for pressed and disabled image

* add test case

* fix compile error

* fix compatibility

* fix compile warning

* fix test cases

* remove CC_DEPRECATED_ATTRIBUTE mark
2018-08-07 09:29:51 +08:00
tyfkda aacec550c9 Fix out of range access in Label ()
Out of range occurred in some condition
when using `Label` with its `getLetter()` member function.

`Label::recordPlaceholderInfo()` member function is called for
new line (\n) letter in `Label::multilineTextWrap()`,
but the function doesn't set `_lettersInfo[letterIndex].lineIndex`.

But `lineIndex` is used in `Label::updateLabelLetters()`
even if letter is new line.

This change checks `letterInfo.valid` to avoid
accessing `_linesOffsetX[letterInfo.lineIndex]`
for invalid (i.e. `NewLine`) letter.
2018-08-06 14:27:47 +08:00
saumyamukul dfa0360d99 Fix memory leaks () 2018-08-06 14:17:08 +08:00
ggggamer cddcf545db Node::draw and Node::visit use wrong arg type. ()
Should we use `FLAGS_TRANSFORM_DIRTY` here?
2018-08-06 13:46:31 +08:00
raphael10241024 bad8091e99 fix bug:when download's http request didn't return Content-Length header, downloader will return a negative progress value () 2018-08-06 13:37:34 +08:00
panzhihao 5693097fce Keep the same performer of CCDownloader 2018-08-06 12:38:14 +08:00
Jimmy Yin 4a3263d294 Lua: Optimize http header setting code () 2018-08-06 12:37:25 +08:00
Sylvain L. Kamdem d41820b14b Update UIAbstractCheckButton.cpp ()
This factory method to create a checkbox instance was not working (UICheckBox.cpp:79):
CheckBox* CheckBox::create(const std::string& backGround,
                           const std::string& cross,
                           TextureResType texType)
Because the program tries to load missing textures. I just added some exit conditions to avoid it.
2018-08-06 11:46:19 +08:00
Riyachang c8c5fc74f7 Fix: LabelLetter::isVisible always returns false () 2018-08-06 10:09:48 +08:00
CHP 2fe8b20bf1 Switch appveyor/travis assembleRelease/assembleDebug () 2018-07-30 14:54:52 +08:00
CHP 794518c33c ios and mac cmake travis configs ()
* ios and mac cmake travis configs

* run builds only on pull request

* Fix ios build
2018-07-29 23:23:40 +08:00
CHP 711225b0a1 switch one win32 build to cmake on appveyor CI ()
* Update gradle and android gradle plugin

* Switch win32 build to cmake

* Build Release

* Add --config Release

* Rename to win32_bin

* Remove check for mkdir

* Remove comment

* windows32_cocos_new_test cmake cpp_test sln build
2018-07-25 10:08:53 +08:00
Arnold fc09d1af05 disable auto URI encode in AsyncHttp client, fix () 2018-07-23 21:32:52 +08:00
CHP 4797732518 change PROP_BUILD_TYPE from ndk-build to CMake ()
* Update gradle and android gradle plugin

* PROP_BUILD_TYPE=cmake
2018-07-22 15:28:17 +08:00
CHP feb7cdaa48 V3 appveyor android build release only ()
* Update gradle and android gradle plugin

* appveyor_android_build_release_only - disable android_cocos_new_test - it is build in travis
2018-07-22 15:09:00 +08:00
CHP 2bab501cac Update android build tools to 27.0.3 ()
* Update gradle and android gradle plugin

* Update android build tools to 27.0.3
2018-07-22 13:58:58 +08:00
CHP 01f5b19ebf Update gradle and android gradle plugin () 2018-07-22 13:47:21 +08:00
Arnold 81b1e904cd SocketIO#emit/send support multiple parameters () 2018-07-18 13:41:12 +08:00
Umair Javed ec1fc92e37 Added initialisation checks in pcm audio service () 2018-07-13 16:24:36 +08:00
leda 275c37e430
update console sub-module for license changes ()
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 ()
* 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 ()
* 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 () 2018-07-10 23:02:37 +08:00
newnon df4d8e75f6 Fix websocket memory zereoing () 2018-07-10 22:57:05 +08:00
Valera d1597a0e3e Fix iCCP profile using mogrify () 2018-06-29 11:14:13 +08:00
leda b26e1bb086
correct , add check for unsafe strcpy() ()
* 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 ()
* 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 ()
* [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 

* 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