mogemimi
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
minggo
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
halx99
9ff61f915c
Add findChild for cocos2d::utils ( #15548 )
...
* Add searchNode for cocos2d::utils
Add searchNode for cocos2d::utils
* fix compile error on win32_bak
* convert line terminates to unix sytle.
* Rename searchNode to findChild, and etc.
* fix compile error.
2016-05-04 09:46:00 +08:00
minggo
4766e0dd9b
Merge pull request #15545 from minggo/isse-15540
...
avoid remove event listener multiple times
2016-05-04 09:39:38 +08:00
Adrien de Sentenac
1a76c9ea3b
Add OBB (zip) support ( #15515 )
...
* Add OBB support.
OBB must be a zip file with audio and video files stored uncompressed.
* Use introspection to be able to build with Android API level 10.
Using the new audio engine to play sounds from the OBB will only work with API level 12 (Android 3.1) or above.
2016-05-04 09:21:35 +08:00
minggo
d41207e99a
avoid remove event listener multiple times
2016-05-03 10:56:03 +08:00
Xpol Wan
f111583214
Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont().
...
* Remove unnecessary memory copy in FileUtils::getFileData()
* Add Data::takeBuffer() to simplify FileUtils::getFileData() and CCFreeTypeFont::loadFont().
2016-04-29 09:31:09 +08:00
Ricardo Quesada
c432b23ef6
fix: removes `friend class Game`
...
fixes Github issue #15221
2016-04-27 18:57:41 -07:00
zilongshanren
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
Xpol Wan
94944082c4
Fixes warning about deprecated cc_wcslen.
2016-04-26 14:21:25 +08:00
mogemimi
71677ee286
Fix unused variable warning when building with Xcode
2016-04-22 20:25:32 +09:00
Steve Tranby
0f0c9b627b
Add support for Unsigned with CCValue ( #13785 )
...
Add support for Unsigned with CCValue
2016-04-22 13:49:20 +08:00
minggo
488ceb485d
Merge pull request #14547 from colajam93/fix-linux-clang-build
...
Add missing header
2016-04-21 15:38:53 +08:00
MURAKAMI Yukio
9514b51057
Console refactor ( #15013 )
2016-04-21 11:31:20 +08:00
minggo
08b000bacf
Merge pull request #14426 from pyrosphere/fix-controller-ios6
...
Fix crash when using cocos2d::Controller on iOS6
2016-04-20 11:45:13 +08:00
minggo
f49f69dac8
Merge pull request #14525 from elvman/key_none
...
Add enum value for no key
2016-04-20 11:21:43 +08:00
minggo
5bd592ca34
Merge pull request #15231 from SteveKChiu/v3
...
Fix calculation of base64Encode outLength
2016-04-18 17:54:14 +08:00
zilongshanren
001a0ee812
remove useless warning log of stencil buffer. ( #15396 )
...
1. disable GC for Native object
2. improve js tests of label
2016-04-18 15:43:54 +08:00
xpol
3780064a82
Allow inherit form platform fileutils ( #15304 )
...
* Allow inherit form FileUtilsLinux, FileUtilsWin32 and FileUtilsWinRT.
* Removed objc from CCFileUtils-apple.h
define FILEUTILS_APPLE_ENABLE_OBJC to enable FileUtilsApple:setBundle() for compatibility.
* Smart pointers heal us all.
* Add config macro in ccConfig.h and prefix with CC_.
* enabled by default.
* use #if rather than #ifndef.
* Do not deprecate setBundle.
2016-04-14 11:59:24 +08:00
James Chen
f3e6e8331a
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener.
2016-04-11 11:54:15 +08:00
Sai628
dfc12c8351
Bug fix: CCValue operator overloading of Comparison "==" in case Type::VECTOR
2016-04-08 14:11:39 +08:00
colajam93
d023a3ad1a
Add missing header
2016-04-08 02:16:22 +09:00
minggo
6ac9a42e6c
Merge pull request #15383 from mogemimi/fix-implicit-conversion
...
Fix implicit conversion issues with Xcode 7.3
2016-04-07 17:58:30 +08:00
mogemimi
c0e4780e77
Fix implicit conversion issues with Xcode 7.3
2016-04-07 17:01:17 +09:00
James Chen
514ac58bf3
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener.
2016-04-07 15:50:59 +08:00
Nam Hyeon Uk
7f2b0edc04
Vector iterator declaration & initializer list constructor
...
* Vector iterator typedef -> alias declaration
* Vector constructor with initializer list
* fix indent
2016-04-07 13:47:01 +08:00
JANG SUN HYUK
107cef0667
getRandomObject() in Vector, Map is changed
...
* getRandomObject is changed
https://github.com/cocos2d/cocos2d-x/issues/15270
getRandomObject issue in Vector
* Update CCMap.h
* Update CCVector.h
2016-04-07 11:46:54 +08:00
minggo
944307a5f8
Merge pull request #15260 from mxenabled/dennacerise/color_constructor
...
Add optional alpha parameter to Color4B and Color4F constructors
2016-04-06 11:50:02 +08:00
mogemimi
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
zilongshanren
400e77808c
Revert "UIEditBox attachWithIME, detachWithIME make working"
2016-03-22 14:18:39 +08:00
Xpol Wan
32e408487f
Fixes import path for m and mm files.
2016-03-21 20:12:58 +08:00
Xpol Wan
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
Xpol Wan
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
zilongshanren
56878bd441
Merge pull request #14532 from xpol/refactor-utf-module
...
Overhaul UTF modules and add full set of UTFs conversion functions.
2016-03-18 14:00:47 +08:00
YooJaehong
7eeccbc771
UIEditBox attachWithIME, detachWithIME make working
...
(android, iOS tested)
2016-03-17 10:26:53 +09:00
Denna Lawrence
737455fda6
Add optional alpha parameter to Color4B and Color4F constructors
2016-03-16 16:08:49 -06:00
Steve K. Chiu
4769890d4e
Fix calculation of outLength
...
The order of integer arithmetic is important, the original code fail to
calculate the length correctly, e.g. inLength 20 for base64Encode should
output 28, not 30. It is fixed and simplified with this commit.
2016-03-12 15:42:52 +08:00
zilongshanren
5a3a4c356f
Merge pull request #15195 from perminovVS/textfiled-support-cursor-v1.2
...
Textfiled support cursor v1.2
2016-03-11 22:32:55 +08:00
Vladimir Perminov
fa7d9c7163
Remarks zilongshanren
...
Copy constructor remove from StringUTF8
StringUTF8::set change to StringUTF8::replace
TextFieldTTF::setCursorUse change to TextFieldTTF::setCursorEnabled
TextFieldTTF::_cursorUsechange to TextFieldTTF::_cursorEnabled
2016-03-11 15:09:50 +03:00
Ricardo Quesada
9477bfd801
Merge pull request #15135 from dumganhar/ws-close-fix
...
Closes websocket connection by dispatching a 'resetDirector' event.
2016-03-10 17:39:47 -08:00
Vladimir Perminov
6bc36912ae
TextFieldTTF support cursor
...
If TextField active(focused input text) show text cursor( default '|',
change TextFieldTTF::setCursorChar ).
Show/Hide interval CURSOR_TIME_SHOW_HIDE
Change position text cursor control key: KEY_HOME, KEY_END,
KEY_LEFT_ARROW, KEY_RIGHT_ARROW
CC_PLATFORM_MAC, CC_PLATFORM_WIN32, CC_PLATFORM_LINUX default use
cursor( For change state TextFieldTTF::setCursorUse )
Text cursor worked only on LabelType::TTF
2016-03-07 14:22:03 +03:00
Vladimir Perminov
f2a5a5ef6b
StringUTF8 - Utf8 sequence
...
Store each utf8 chars as std::string, for easily manipulated
2016-03-07 13:59:53 +03:00
Ricardo Quesada
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
Ricardo Quesada
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 16:54:04 2016 -0800
Merge branch 'v3' into cmake_android
commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24
Author: Chaoren Lin <chaorenl@google.com>
Date: Thu Feb 11 18:34:46 2016 -0800
Fix module name in Android template to match CMake project.
commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576
Author: Chaoren Lin <chaorenl@google.com>
Date: Thu Feb 11 18:27:45 2016 -0800
Add missing platform specific source file to CMake project.
commit 705389ac6582107a381d0cbc56268eaa98ffc5c3
Author: Chaoren Lin <chaorenl@google.com>
Date: Wed Feb 10 19:21:12 2016 -0800
Find AndroidNdkModules.cmake relative to android.toolchain.cmake.
commit a10075e2cb30af2e1f9a30da99efac880658ad6b
Author: Chaoren Lin <chaorenl@google.com>
Date: Wed Feb 10 19:03:11 2016 -0800
Remove cpp-empty-test from project templates.
commit e070fcbf210b8628f75785e738202a80a95ac0ff
Author: WenhaiLin <wenhai.lin@chukong-inc.com>
Date: Mon Aug 31 09:56:03 2015 +0800
Fix CMake for Android Target
2016-03-02 16:51:54 -08:00
James Chen
48e7d70d9d
Removes unused include in CCDirector.cpp
2016-02-29 18:58:17 +08:00
James Chen
037051d9c4
Closes websocket connection by dispatching a 'resetDirector' event.
2016-02-29 18:55:51 +08:00
mogemimi
2a8d84e7f9
Remove unnecessary const from return types
2016-02-29 16:48:07 +09:00
mogemimi
5de611b4b5
Fix typo of function name in AsyncTaskPool
2016-02-26 00:22:46 +09:00
Ricardo Quesada
37db8407f1
Merge pull request #14867 from dumganhar/refactor-websocket
...
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-02-21 06:59:59 -08:00
pandamicro
7607382440
Merge pull request #15094 from pandamicro/v3
...
Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2016-02-21 20:58:21 +08:00