pandamicro
1b53d5b3d5
Merge pull request #13246 from VisualSJ/v3.7.1-13214
...
Add loader tests
2015-08-07 09:33:50 +08:00
ZhangMenghe
0ddd4e4a5b
UIScene testcase modification
2015-08-07 09:30:22 +08:00
ZhangMenghe
ed1a4b9ebb
Modify framework architecture graph
2015-08-07 09:20:20 +08:00
andyque
211dde38e9
Fix improper touch intercept event propagation.
...
When the container widget is disabled, it shouldn't intercept touch.
https://github.com/cocos2d/cocos2d-x/issues/8316
2015-08-06 22:50:53 +08:00
pandamicro
934764af83
Merge pull request #13250 from xiaofeng11/v3.7.1
...
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
2015-08-06 22:23:40 +08:00
pandamicro
1bd948dcde
Merge pull request #13247 from liamcindy/v3.7.1_reader
...
fix particle3d crash with error file
2015-08-06 22:03:42 +08:00
geron-cn
3ae3020d61
fix crash when fore call remove child bone from a bone which already removed from a skeleton.
2015-08-06 19:43:11 +08:00
VisualSj
ca82f41c1b
Add loader tests
2015-08-06 19:03:26 +08:00
XiaoFeng
91c88ec535
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
2015-08-06 18:12:08 +08:00
Liam
8b2747c53b
fix particle3D file error
2015-08-06 18:03:50 +08:00
pandamicro
0d778386f4
Merge pull request #13208 from dabingnn/v3_fixViewportCompile
...
Make viewport constructor more compile friendly
2015-08-06 17:45:23 +08:00
pandamicro
d6df8ae238
Merge pull request #13225 from CocosRobot/update_cocosfiles_1438772880
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-08-06 17:38:57 +08:00
pandamicro
7a758bb961
Merge pull request #13243 from jianglong0156/fixExitButton
...
[ci skip]fix the close button function in main list frame
2015-08-06 17:33:47 +08:00
pandamicro
ad4c349800
Merge pull request #13245 from ZhangMenghe/v3-1586bugfix
...
Fix offset on retina screen in shaderTest
2015-08-06 17:27:47 +08:00
pandamicro
a170b1caf1
Made SocketIO events correctly fired when compile in release mode
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13248
Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode.
Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually.
I also did the following in this commit:
- Correct the coding style in jsb_socketio.cpp
- Remove android.mk in the Xcode project
2015-08-06 17:20:04 +08:00
ZhangMenghe
91ae9e07b6
Fix offset on retina screen in shaderTest
2015-08-06 15:14:13 +08:00
Liam
34000f4bde
fix particle3d crash with error file
2015-08-06 15:13:54 +08:00
子龙山人
a0a34deb78
Merge pull request #13242 from WenhaiLin/v3.8-cpptests-freeze
...
CppTests: Avoid freeze when the program crashed on Android.
2015-08-06 15:03:30 +08:00
jianglong0156
482b8f3583
fix the close button function in main list frame
2015-08-06 14:14:52 +08:00
WenhaiLin
ffda8ace82
CppTests: Avoid freeze when the program crashed on Android.
2015-08-06 13:50:15 +08:00
子龙山人
41afa9695c
Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost
...
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-06 11:01:35 +08:00
fusijie
9b148b08cd
Fixed SpriteBatchNode setFlipped bug.
2015-08-06 10:53:22 +08:00
pandamicro
c4046591f7
Merge pull request #13238 from CocosRobot/update_cocosfiles_1438825122
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-08-06 09:52:15 +08:00
pandamicro
3066fb40a5
Merge pull request #13227 from geron-cn/3.7.1
...
delete useless code
2015-08-06 09:46:57 +08:00
CocosRobot
a0b0c020f8
[AUTO][ci skip]: updating cocos2dx_files.json
2015-08-06 01:38:44 +00:00
pandamicro
69c0d15e12
Merge pull request #13223 from natural-law/v3
...
Move the framework-compile tools into cocos2d-console.
2015-08-06 09:36:34 +08:00
Vladimir Perminov
7cacdaeaf1
Add getFileExtension to FileUtils
...
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.
More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )
And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
2015-08-05 22:21:16 +03:00
WenhaiLin
e81d5af12d
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-05 23:46:41 +08:00
geron-cn
ee6253319a
delete useless code
2015-08-05 23:07:42 +08:00
CocosRobot
49dd429c2a
[AUTO][ci skip]: updating cocos2dx_files.json
2015-08-05 11:08:02 +00:00
pandamicro
6831e24deb
Merge pull request #13198 from ZhangMenghe/v3-UItestcase
...
[ci skip]Modify UItestcase structure
2015-08-05 19:06:11 +08:00
zhangbin
91b2191988
Move the framework-compile tools into cocos2d-console.
2015-08-05 17:54:32 +08:00
pandamicro
881adf6f36
Merge pull request #13217 from jianglong0156/fixTextFieldBug
...
fix textfield and editbox can not input emoticon
2015-08-05 17:41:19 +08:00
子龙山人
47fe470647
Merge pull request #13213 from jianglong0156/improUtfFunction
...
add api getStringUTFCharsJNI newStringUTFJNI
2015-08-05 17:26:52 +08:00
pandamicro
822981e60f
Merge pull request #13212 from CocosRobot/update_cocosfiles_1438761081
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-08-05 17:18:28 +08:00
jianglong0156
42ed314463
fix textfield and editbox can not input emoticon
...
fix textfield and editbox can not input emoticon and improve the api comments
2015-08-05 17:03:06 +08:00
子龙山人
05e88ad279
Merge pull request #13211 from fusijie/v3
...
[ci skip]fixed title.
2015-08-05 16:59:37 +08:00
子龙山人
5aaf9aa1ef
Merge pull request #13210 from WenhaiLin/v3.8-FontAtlasCache-crash-fix
...
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 16:57:57 +08:00
pandamicro
8ed053775f
Merge pull request #13215 from natural-law/v3
...
[ci skip] Optimize the lua & js templates.
2015-08-05 16:56:04 +08:00
zhangbin
9fd88d6587
Optimize the lua & js templates.
...
The changes are used for generating templates of Cocos Framework.
2015-08-05 16:51:33 +08:00
pandamicro
dae4385b61
Merge pull request #13214 from pandamicro/skeleton-fix
...
Make BoneNodes ordered in Skeleton
2015-08-05 16:36:18 +08:00
geron-cn
9980397081
Make BoneNodes ordered in Skeleton
...
1. Order skins differently than bones and draw them with unified local z order
2. Check children has been remove when its ansester remove
3. Checkout cocos2d::map exists iter before remove
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13191
2015-08-05 16:33:32 +08:00
jianglong0156
9a257d8136
fix lua pai error
2015-08-05 16:15:22 +08:00
jianglong0156
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
CocosRobot
5e6dfae083
[AUTO][ci skip]: updating cocos2dx_files.json
2015-08-05 07:51:23 +00:00
pandamicro
5faf7a9d76
Merge pull request #13209 from ZhangMenghe/v3-textfield
...
[ci skip]textField cc.vertext to cc.p
2015-08-05 15:48:16 +08:00
fusijie
6072cf9a9d
[ci skip]fixed title.
2015-08-05 15:47:59 +08:00
WenhaiLin
2c220092e6
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 14:12:02 +08:00
ZhangMenghe
88cb3ab711
textField cc.vertext to cc.p
2015-08-05 11:59:36 +08:00
Huabing.Xu
5f9a3b97fb
fix viewport constructor error in old compiler to make it more compatible.
2015-08-05 10:57:27 +08:00