Commit Graph

32197 Commits

Author SHA1 Message Date
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
pandamicro 8cdcade07a Merge pull request #13186 from jianglong0156/addEmotionTest
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
子龙山人 9b6e8621c6 Merge pull request #13201 from WenhaiLin/v3.8-label-batch
Label:support auto batch with bitmap font or char map.
2015-08-05 09:44:43 +08:00
WenhaiLin b9edd6fc29 Fixed transform 2015-08-05 00:21:06 +08:00
WenhaiLin 2363622a67 Label:support auto batch with bitmap font or char map. 2015-08-04 21:49:14 +08:00
ZhangMenghe f01f21d06f Modify UItestcase structure 2015-08-04 17:13:17 +08:00
pandamicro a06421b753 Merge pull request #13196 from chengstory/UpdateSimulator
Node, Skeleton needs to show at the middle of the simulator.
2015-08-04 17:00:25 +08:00
jianglong0156 3230ca154d improve the code. fix network error 2015-08-04 16:42:16 +08:00
jianglong0156 00b7e98c89 improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak. 2015-08-04 16:24:08 +08:00
pandamicro 8e5c205e4e Merge pull request #13197 from VisualSJ/v3.7.1-21475
[ci skip] Update JSON parser
2015-08-04 16:14:41 +08:00
VisualSj b9b565e64a Update JSON parser 2015-08-04 16:04:35 +08:00
zhangcheng 613a6f48a9 Node, Skeleton needs to show at the middle of the simulator. 2015-08-04 15:41:12 +08:00
pandamicro 744fa0b565 Merge pull request #13194 from VisualSJ/v3-boneTest
[ci skip] Update JSON parser
2015-08-04 15:35:27 +08:00
VisualSj 04465ac4f4 Update JSON parser 2015-08-04 15:15:46 +08:00
pandamicro 276933c2ac Merge pull request #13189 from pandamicro/v3
Fix AssetsManager crash by protecting Downloader with shared_ptr
2015-08-04 15:07:23 +08:00
pandamicro a747553b83 Merge pull request #13192 from natural-law/v3
[ci skip] Update the reference of submodule cocos2d-console.
2015-08-04 14:37:37 +08:00
zhangbin d11605aa37 Update the reference of submodule cocos2d-console. 2015-08-04 14:35:56 +08:00
pandamicro b9602127a4 Merge pull request #13187 from xiaofeng11/v3.7.1
Remove file error notice label from TextBMFontReader
2015-08-04 13:38:17 +08:00
pandamicro 37030a427c Fix AssetsManager crash by protect Downloader with shared_ptr 2015-08-04 12:45:49 +08:00
XiaoFeng 0f90999419 Remove file error notice label from TextBMFontReader to keep consistency with other components 2015-08-04 11:45:29 +08:00
jianglong0156 ee7e7d237f improve the test case 2015-08-04 11:40:10 +08:00
jianglong0156 36e8e9740a improve the test case 2015-08-04 11:30:55 +08:00