Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,870 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

32870 Commits

Author SHA1 Message Date
子龙山人 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
Jeff Wang 4d0adf4435 Merge pull request #1 from cocos2d/v3 
keep synced
 2015-08-05 07:05:13 +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
jianglong0156 979700e343 there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program 2015-08-04 11:30:30 +08:00
pandamicro a8a0516bf4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-08-04 11:22:54 +08:00
pandamicro 731f7b8fc1 Merge pull request #13185 from pandamicro/v3.7.1 
[ci skip]Add remote debugger support in JS templates
 2015-08-04 11:21:52 +08:00
pandamicro a89a3c0c56 Merge pull request #13184 from pandamicro/v3.7.1 
[ci skip]Add remote debugger support in JS templates
 2015-08-04 11:18:18 +08:00
pandamicro 06bd3b8868 Add remote debugger support in JS templates 2015-08-04 11:16:58 +08:00
pandamicro d20052cc22 Fix line wrapper in CCDevice 2015-08-04 11:07:04 +08:00
pandamicro f9249f0e49 Merge pull request #13180 from sridher/mac_dpi_fix 
getDPI for Mac Implemented
 2015-08-04 10:49:14 +08:00
子龙山人 9cc3232cdf Merge pull request #13183 from fusijie/fix_spellingmistake 
[ci skip]fix spelling mistake.
 2015-08-04 09:38:35 +08:00
fusijie 8d2da20e5f fix spelling mistake. 2015-08-04 09:36:33 +08:00
pandamicro 8d836dade6 Merge pull request #13181 from pandamicro/v3 
Sync Cocos2d-x v3.7.1
 2015-08-03 22:12:05 +08:00
pandamicro 25cb0d2896 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	web
 2015-08-03 19:47:56 +08:00
pandamicro 6d3a00ad67 Merge pull request #13173 from geron-cn/3.7.1 
fix bug: crash when use bone after erase it form Vector.
 2015-08-03 19:45:54 +08:00
Sridher Jakku f48a9fb9f0 getDPI for Mac Implemented 2015-08-03 17:12:52 +05:30
pandamicro f012cc68f8 Merge pull request #13179 from pandamicro/v3.7.1 
[ci skip]Update web engine
 2015-08-03 18:38:58 +08:00
pandamicro d6baad0963 Update web engine 2015-08-03 18:38:33 +08:00
pandamicro 6a2440d6f1 Merge pull request #13176 from VisualSJ/v3-boneTest 
[ci skip][js-tests] add Change skin tests
 2015-08-03 18:13:08 +08:00
pandamicro 7802e409da Merge pull request #13175 from CocosRobot/update_lua_bindings_1438596255 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-03 18:10:44 +08:00
VisualSj 479676cbd8 [js-tests] add Change skin tests 2015-08-03 18:10:31 +08:00
CocosRobot 3e71ce33c8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 10:09:10 +00:00
pandamicro 4b7b85f113 Merge pull request #12889 from fusijie/fix_clippingRectangle_bug 
remove CCClippingRectangleNode transform error support.
 2015-08-03 18:01:01 +08:00
geron-cn d00e54ad8a remove comment in test case 2015-08-03 16:55:55 +08:00
geron-cn e4c47c811f remove EMSCRIPTEN draw 2015-08-03 16:53:08 +08:00
geron-cn cfc8da579f fix bug: crash when use bone after erase it form Vector. move the operation after erase, make sure bone ref* is not realeaed 2015-08-03 16:47:54 +08:00
pandamicro 80a207ae43 Merge pull request #13172 from jianglong0156/addEmotionTest 
add emotion bug test current nothing will show
 2015-08-03 16:36:47 +08:00
pandamicro f10994c20b Merge pull request #12467 from MagicTavern/v3_fix_websocket 
fix a problem where WebSocket messages may pile up
 2015-08-03 16:25:56 +08:00
jianglong0156 f9b6d6b670 add emotion bug test 2015-08-03 16:09:45 +08:00
pandamicro cdf58c9fc1 Merge pull request #13171 from CocosRobot/update_lua_bindings_1438587682 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-03 16:03:37 +08:00
CocosRobot dbb8792630 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 07:46:25 +00:00
pandamicro b13fddb18e Merge pull request #13162 from super626/v3 
Terrain: Add light map support
 2015-08-03 15:37:42 +08:00