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

32305 Commits

Author SHA1 Message Date
pandamicro 89b266d8b5 Auto binding for ctor function support parameter 2015-07-30 12:46:12 +08:00
fusijie ee5e64825a fix Sprite auto-culling bug. 2015-07-30 12:00:57 +08:00
子龙山人 6818a97311 Merge pull request #13104 from fusijie/fix_cpptests_androidstudio_compile 
[ci skip]fix android studio compile error.
 2015-07-30 11:59:05 +08:00
fusijie d2181e137e fix android studio compile error. 2015-07-30 11:55:33 +08:00
子龙山人 815c8d91f0 Merge pull request #13102 from CocosRobot/update_lua_bindings_1438227193 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-30 11:40:32 +08:00
CocosRobot f1adc2ffd2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 03:39:17 +00:00
子龙山人 cbda4bcfaf Merge pull request #13100 from CocosRobot/update_cocosfiles_1438227091 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-30 11:35:44 +08:00
WenhaiLin 964e7103b5 Improve coding style 2015-07-30 11:33:18 +08:00
CocosRobot 12523e2f4e [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-30 03:31:32 +00:00
子龙山人 c039c7a9bd Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix 
Fixed the content size of Label is incorrect with GLOW effect.
 2015-07-30 11:29:48 +08:00
CocosRobot 0ec43fe603 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 01:39:13 +00:00
CocosRobot d86324ac56 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-30 01:32:14 +00:00
pandamicro 0f3a2ca642 Merge pull request #13062 from ZhangMenghe/Docs 
[ci skip]Add framework architecture figure to README
 2015-07-30 09:30:10 +08:00
pandamicro 38760d0279 Merge pull request #13095 from CocosRobot/update_lua_bindings_1438202232 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-30 09:29:27 +08:00
CocosRobot bd867311f1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 20:42:46 +00:00
Ricardo Quesada 642ccac5dc Merge pull request #12927 from ricardoquesada/spine-2.3 
Adds support for Spine runtime 2.3
 2015-07-29 13:33:15 -07:00
Ricardo Quesada 7431acf3e0 Merge pull request #2 from pandamicro/spine 
Fix manual bindings for changed API in spine
 2015-07-29 11:28:42 -07: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 f53ba42b3b Fix test issues and Add audio engine to js templates 2015-07-29 21:22:44 +08:00
pandamicro 9972bfb98c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine 
# Conflicts:
#	tests/js-tests/src/NativeTest/NativeTest.js
 2015-07-29 21:01:56 +08:00
pandamicro 347854e8d3 Add Audio Control test case 2015-07-29 20:48:11 +08:00
pandamicro 07fdea50de Refine C++ test case 2015-07-29 20:47:38 +08:00
pandamicro da4e062614 Add js wrapper for audio engine 2015-07-29 20:47:28 +08:00
pandamicro fa6c6de0b9 Merge pull request #13091 from VisualSJ/v3-13063 
Update js parser (timelineParser-2.x.js)
 2015-07-29 20:42:51 +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
VisualSJ 179266240f Update js parser (timelineParser-2.x.js) 2015-07-29 19:49:54 +08:00
Vincent Yang e1d4d22353 Fixed #12692 : UILayout viewing area cutting position calculation error 2015-07-29 18:43:11 +08:00
pandamicro ff7d01376e Merge pull request #13087 from natural-law/v3 
[ci skip] Move web folder from js template folder to engine folder in Cocos Framework.
 2015-07-29 17:51: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
zhangbin c8ff43133f Move web folder from js template folder to engine folder in Cocos Framework. 2015-07-29 17:22:26 +08:00
pandamicro 3dadc77850 Merge pull request #13086 from natural-law/v3 
[ci skip] Solve the error in .cocos-project.json of js-tests.
 2015-07-29 17:12:38 +08:00
zhangbin e30d84bca0 Solve the error in .cocos-project.json of js-tests. 2015-07-29 17:10:19 +08:00
pandamicro 36b7ba5b75 Merge pull request #13081 from natural-law/v3 
Remove unused config in android project of js-tests.
 2015-07-29 17:00:26 +08:00
Liam c93d40869c fix simulator crash when sprite3d resource is error 2015-07-29 16:52:40 +08:00
WenhaiLin a9f27865d3 Fixed the content size of Label is incorrect with GLOW effect. 2015-07-29 16:30:07 +08:00
子龙山人 2345669a96 Merge pull request #13078 from CocosRobot/update_lua_bindings_1438152852 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-29 16:17:02 +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
子龙山人 9947e69261 Merge pull request #13082 from CocosRobot/update_lua_bindings_1438155589 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-29 15:51:50 +08:00
CocosRobot 8c642d966f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 07:45:19 +00:00
pandamicro 16b03f0ebe Merge pull request #13065 from pandamicro/widget_onEnter 
Ensure C++ classes onEnter, onExit can be safely override in JS
 2015-07-29 15:36:12 +08:00
zhangbin 6fe880bee5 Remove unused config in android project of js-tests. 2015-07-29 15:35:59 +08:00
andyque 6de387b3ac fix Mac system font crash issue 2015-07-29 15:20:31 +08:00
CocosRobot 7a6664ab1f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 06:58:36 +00:00
子龙山人 96d44e1078 Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312 
Label:support font that contains GB2312 char map.
 2015-07-29 14:51:17 +08:00
tangziwen cee43ccebb update terrain again 2015-07-29 14:32:36 +08:00