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

30953 Commits

Author SHA1 Message Date
pandamicro 3066fb40a5 Merge pull request #13227 from geron-cn/3.7.1 
delete useless code
 2015-08-06 09:46:57 +08:00
geron-cn ee6253319a delete useless code 2015-08-05 23:07:42 +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
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
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
XiaoFeng 0f90999419 Remove file error notice label from TextBMFontReader to keep consistency with other components 2015-08-04 11:45:29 +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 06bd3b8868 Add remote debugger support in JS templates 2015-08-04 11:16:58 +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
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
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 330eaf5239 Merge pull request #13161 from xiaofeng11/v3.7.1 
Fix 3d particle can not show in simulator
 2015-08-03 11:11:39 +08:00
XiaoFeng 17a5d07183 Fix 3d particle can not show in simulator 2015-08-03 09:53:16 +08:00
pandamicro f995ed8634 Merge pull request #13079 from zilongshanren/v3.7.1 
fix Mac system font crash issue
 2015-08-01 15:27:36 +08:00
pandamicro 3524af1ad6 Merge pull request #13059 from geron-cn/3.7.1 
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's vi…
 2015-07-30 20:31:34 +08:00
geron-cn 0955b0f9de fix comment by pandamicro 2015-07-30 19:28:00 +08:00
pandamicro 3605eb8ae9 Merge pull request #13093 from pandamicro/v3.7.1 
[ci skip]Update web ref
 2015-07-29 21:34:59 +08:00
pandamicro e57b285f24 Merge pull request #13088 from dualface/v3.7.1 
add ActionTime lua test
 2015-07-29 21:33:20 +08:00
pandamicro 9e356e04d2 Update web ref 2015-07-29 21:31:05 +08:00
pandamicro 6aae63a8a9 Merge pull request #13085 from liamcindy/v3.7.1_reader 
fix simulator crash when sprite3d resource is error
 2015-07-29 20:39:39 +08:00
dualface ea594b92b4 add ActionTime lua test 2015-07-29 17:50:50 +08:00
dualface 938a706daa Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-29 17:49:50 +08:00
dualface 184225519e add ActionTime lua test 2015-07-29 17:36:54 +08:00
Liam c93d40869c fix simulator crash when sprite3d resource is error 2015-07-29 16:52:40 +08:00
子龙山人 a814076d93 Merge pull request #24 from WenhaiLin/v3.7.1-sf-macfix 
Label:The texture of system font should be cropped when the height is not enough to show the entire string on Mac.
 2015-07-29 16:16:25 +08:00
WenhaiLin 20d445ad1a Label:The texture of system font should be cropped if the height of label is not enough to show the entire string on Mac. 2015-07-29 16:11:27 +08:00
andyque 6de387b3ac fix Mac system font crash issue 2015-07-29 15:20:31 +08:00
geron-cn 7e05538521 ADD SKELETON NEST TEST CASE 2015-07-29 10:23:03 +08:00
pandamicro dc931db932 Merge pull request #13069 from dmurtagh/debug_draw_patch 
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
 2015-07-29 09:51:43 +08:00
dualface d9c5600f41 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-29 09:17:53 +08:00
geron-cn fa5d70fc04 add SkeletonNode Nest test case 2015-07-28 23:49:25 +08:00
pandamicro 9f39134669 Merge pull request #13058 from CocosRobot/update_cocosfiles_1438067509 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-28 22:49:53 +08:00
pandamicro f9df68a2fd Merge pull request #13063 from xiaofeng11/v3.7.1 
Fix parser compatible for layer project file
 2015-07-28 22:49:19 +08:00
geron-cn d2de5b1c85 add test case for bug: #13060 and #13005 2015-07-28 19:18:58 +08:00
XiaoFeng faee3e7807 Fix parser compatible for layer project file 2015-07-28 18:11:07 +08:00
geron-cn 0275e3b773 fix set visible 2015-07-28 17:25:40 +08:00
geron-cn c9991aea81 fix bug: BoneNode 's debugdraw can not be controlled by ancestor's visible 2015-07-28 16:31:06 +08:00
CocosRobot 6e7c3c636f [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-28 07:11:50 +00:00
pandamicro 2d805b052b Merge pull request #13057 from natural-law/v3.7.1 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-07-28 15:10:15 +08:00
zhangbin 8bc96a10b4 Update the reference of submodule cocos2d-console. 2015-07-28 15:06:28 +08:00
pandamicro 605f181a4d Merge pull request #13056 from natural-law/v3.7.1 
[ci skip] Solve the error in lua template.
 2015-07-28 14:58:11 +08:00
zhangbin 4d46a03797 Solve the error : the VS release configuration of lua template cause `cocos run` error. 2015-07-28 14:54:42 +08:00
Damien 7fb4dabcb7 Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on 2015-07-27 14:46:15 -07:00
dualface 6d16d1674d Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1 2015-07-27 11:50:14 +08:00
pandamicro 8ac75f6c6c Merge pull request #13029 from pandamicro/v3.7.1 
[ci skip] Update web ref
 2015-07-27 11:19:17 +08:00