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

32709 Commits

Author SHA1 Message Date
Joachim Grill c49b60ae40 SpriteFrameCache: added plist file format documentation, fixed broken link 2015-10-01 10:36:18 +02:00
Joachim Grill 9a0ea79b61 remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue 2015-09-30 15:20:53 +02:00
Joachim Grill 79656ffe13 fixed typo, indentation 2015-09-29 16:50:14 +02:00
Joachim Grill b14b251628 added Sprite performance test: load sprite from sprite sheet, with rectangular frame as well as with polygon outline 2015-09-29 15:45:48 +02:00
Joachim Grill 80ca579a01 added Sprite test case which loads PolygonInfo of sprite from plist file 2015-09-29 15:44:13 +02:00
Joachim Grill ac24612e98 extend SpriteFrameCache to load PolygonInfo from plist file 2015-09-29 15:42:04 +02:00
pandamicro 4a2edc8ce8 Merge pull request #14044 from CocosRobot/update_cocosfiles_1443517693 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-29 17:09:52 +08:00
CocosRobot 0fc077d196 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-29 09:08:15 +00:00
pandamicro ec3660fd22 Merge pull request #14041 from natural-law/v3 
Solve the crash of performance-tests on windows.
 2015-09-29 17:06:28 +08:00
pandamicro b91b35971b Merge pull request #14043 from CocosRobot/update_lua_bindings_1443512424 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-29 15:46:12 +08:00
CocosRobot 246fa7ffd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-29 07:45:48 +00:00
pandamicro fb34fe585e Merge pull request #14042 from CocosRobot/update_cocosfiles_1443512343 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-29 15:41:32 +08:00
CocosRobot ebee5e9a26 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-29 07:39:05 +00:00
pandamicro b918a0f3e2 Merge pull request #14040 from pandamicro/v3 
Fix mistaken uploaded lua bindings
 2015-09-29 15:37:11 +08:00
zhangbin f715a93521 Solve the crash of performance-tests on windows. 2015-09-29 15:32:51 +08:00
pandamicro 4f6bdd6d74 Fix mistaken uploaded lua bindings 2015-09-29 14:52:47 +08:00
pandamicro 0abe235323 Merge pull request #14030 from CocosRobot/update_lua_bindings_1443367205 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-27 23:30:14 +08:00
CocosRobot b082620d85 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-27 15:24:49 +00:00
pandamicro 0af7f29cfd Merge pull request #14024 from TheCodez/fix_refptr_testcase 
Fix : RefPtr test wasn't executed even in debug build
 2015-09-27 23:16:27 +08:00
pandamicro 17c78ad3b1 Merge pull request #14018 from natural-law/v3 
Solve the crash of performance-tests on windows.
 2015-09-27 23:11:19 +08:00
pandamicro a43f56e9da Merge pull request #14027 from CocosRobot/update_cocosfiles_1443366641 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-27 23:11:01 +08:00
CocosRobot 4185715c06 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-27 15:10:43 +00:00
pandamicro 45fc337733 Merge pull request #14023 from pandamicro/script-component2 
Script Component
 2015-09-27 23:08:57 +08:00
pandamicro 7b85211cfe Remove ScriptComponent 
Because windows platform can't successfully compile in previous architecture
 2015-09-27 22:18:59 +08:00
Michael Kösel 744b7f54c9 Fix wrong debug check 2015-09-26 16:58:26 +02:00
WenhaiLin f4c56e8605 Fixed compile errors 2015-09-26 19:43:36 +08:00
pandamicro 2a3526a3fd Fix lua project 2015-09-26 19:43:36 +08:00
pandamicro 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +08:00
pandamicro a1bbd43f9f Add component test to lua-tests and remove it from lua empty test 2015-09-26 19:43:36 +08:00
pandamicro ddb636a022 Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
pandamicro 7e2b8c71a7 Improve lua script component 2015-09-26 19:43:35 +08:00
minggo 26632ec69a linjia demo finish 2015-09-26 19:43:35 +08:00
minggo 3d1318fdf1 enemy can run 2015-09-26 19:43:35 +08:00
minggo 7326369ed2 pass dt to lua update 2015-09-26 19:43:35 +08:00
minggo 63af026769 can use any lua type to extend component 2015-09-26 19:43:35 +08:00
minggo 3f066d156a lua script can access c++'s functions 2015-09-26 19:43:35 +08:00
minggo 85c297f53b temple save 2015-09-26 19:43:35 +08:00
minggo 10427fb7ae add lua component 2015-09-26 19:43:35 +08:00
pandamicro 72483eb75c Merge pull request #14015 from CocosRobot/update_lua_bindings_1443170285 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-25 22:50:47 +08:00
zhangbin 6697cad212 Solve the crash of performance-tests on windows. 2015-09-25 18:23:13 +08:00
CocosRobot c135587962 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-25 08:43:00 +00:00
pandamicro 970300c3e2 Merge pull request #14012 from jianglong0156/customSpine 
add custom spine skeletonAnimation test
 2015-09-25 16:34:57 +08:00
pandamicro c05e4fe5c9 Merge pull request #14014 from yangws/v3 
Fix bug: FileUtils::GetFileSize can't treat multi-char path.
 2015-09-25 16:32:42 +08:00
Vincent Yang 5c0d6691ca Fix bug: FileUtils::GetFileSize can't treat multi-char path. 2015-09-25 14:50:20 +08:00
江龙 9eb05707fb add custom spine skeletonAnimation test 2015-09-25 13:36:48 +08:00
pandamicro e16404c280 Merge pull request #14008 from thuydx55/fix_android_compile_script_load_pluginx 
Fix loading pluginx lib when compile Android with --compile-script flag
 2015-09-24 14:08:46 +08:00
pandamicro 718f5c7b88 Merge pull request #14006 from CocosRobot/update_cocosfiles_1443058624 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-24 14:07:52 +08:00
pandamicro d82906d5ff Merge pull request #14007 from ZhangMenghe/v3-buttonOpacity 
[ci skip] button Opacity setting testcase
 2015-09-24 14:07:04 +08:00
pandamicro 95379c5dc2 Merge pull request #13995 from xiaofeng11/v3 
Fix issue http://punchbox.info:3000/issues/23146
 2015-09-24 13:03:59 +08:00
Nick 003920f826 fix loading pluginx when compile Android with --compile-script flag 2015-09-24 11:41:18 +07:00