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

26572 Commits

Author SHA1 Message Date
minggo 3eba14c8c9 Merge pull request #9888 from Dhilan007/v3-physics-testcase-fix 
Fixed display wrong in LuaTests:Physics:Pump test case
 2015-01-09 13:37:20 +08:00
minggo e0625ad1db Merge pull request #9892 from yinjimmy/bugfix_runtime 
Fix: can not load BYTECODE Lua project
 2015-01-09 13:35:02 +08:00
yinjimmy 2f3270fa0b Fix: can not load Lua project with command `cocos run -p mac -m release` 2015-01-09 12:32:54 +08:00
minggo bfc116d32a Merge pull request #9881 from dualface/add_package_manager_support 
Add package manager support
 2015-01-09 12:03:05 +08:00
dualface 9030e32adc Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support 2015-01-09 11:30:35 +08:00
WenhaiLin 718c400bfa Fixed bodies display wrong in Physics:Pump test case 2015-01-09 10:21:50 +08:00
minggo 3ebf8ef22b Merge pull request #9885 from Dhilan007/v3-physics-fix-scale-rotation 
Fixed can't update scale and rotation of static body
 2015-01-09 09:45:04 +08:00
WenhaiLin c9a8dfb6ee Fixed can't update scale and rotation of static body 2015-01-09 09:37:55 +08:00
minggo ae46980c0a Merge pull request #9882 from yinjimmy/bugfix_executeScriptFile 
Fix: executeScriptFile can not load .luac file when .lua is not exist
 2015-01-09 09:30:27 +08:00
yinjimmy bdac739541 Fix: executeScriptFile can not load .luac file when .lua is not exist 2015-01-09 04:18:41 +08:00
dualface c041787f01 update proj.android for template 2015-01-09 04:14:31 +08:00
dualface 7046f508da update proj.win32 for templates 2015-01-09 03:10:54 +08:00
minggo 01798147d9 Merge pull request #9872 from Dhilan007/v3-fixtypo 
Fixed typo
 2015-01-08 18:27:42 +08:00
WenhaiLin 83cf479cb4 Fixed typo 2015-01-08 16:57:03 +08:00
Huabing.Xu 644e1e3502 Merge pull request #9864 from CocosRobot/update_lua_bindings_1420698630 
[AUTO]: updating luabinding automatically
 2015-01-08 14:37:52 +08:00
CocosRobot 6b67f55ab5 [AUTO]: updating luabinding automatically 2015-01-08 06:32:36 +00:00
Huabing.Xu 5f8d69d447 Merge pull request #9862 from Dhilan007/v3-physics-performance2 
[Physics]Reduce temporary object creation and save mathematical labor
 2015-01-08 14:27:52 +08:00
Wenhai Lin 61438f7297 [Physics]Reduce temporary object creation and save mathematical labor 2015-01-08 14:25:06 +08:00
Huabing.Xu 865ae56d9b Merge pull request #9858 from CocosRobot/update_lua_bindings_1420684648 
[AUTO]: updating luabinding automatically
 2015-01-08 14:25:04 +08:00
minggo d279a3908a Merge pull request #9860 from CocosRobot/update_cocosfiles_1420697145 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-08 14:21:55 +08:00
CocosRobot f6de697bde [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-08 06:05:46 +00:00
Huabing.Xu 4bdd3f0811 Merge pull request #9850 from dabingnn/v3_updatedep31 
update deps to 31
 2015-01-08 14:03:46 +08:00
Huabing.Xu 2919e77532 Merge pull request #9859 from dabingnn/v3_updateChangeLog 
[ci skip] update changelog
 2015-01-08 11:03:57 +08:00
Huabing.Xu 0c4a180c2b [ci skip] update changelog 2015-01-08 11:02:24 +08:00
CocosRobot 822c38b129 [AUTO]: updating luabinding automatically 2015-01-08 02:40:40 +00:00
Huabing.Xu 2b71c57b52 Merge pull request #9840 from Dhilan007/v3-physics-performance 
Improve performance of Physics
 2015-01-08 10:33:51 +08:00
Huabing.Xu b5f8666caf Merge pull request #9855 from huangshiwu/v3_XmlHttpRequest 
Fix XmlHttpRequestTest parsing error of response header on iOS platform
 2015-01-08 10:28:34 +08:00
huangshiwu 108e4d2b41 Add comments and improve code readability for HttpAsynConnection.m 2015-01-08 10:12:45 +08:00
minggo 1b612fd97a Merge pull request #9842 from andyque/improveTextPerformance 
improve ui::Text and ui::TextField creation performance
 2015-01-08 09:31:49 +08:00
minggo f0aaacae5d Merge pull request #9853 from suzukaze/fix-indents 
Replace tab with spaces.
 2015-01-08 09:29:05 +08:00
Huabing.Xu 0f0e54a00b Merge pull request #9839 from yinjimmy/bugfix_executeScriptFile 
Compatibility code for executeScriptFile
 2015-01-08 09:26:47 +08:00
yinjimmy 70e0874add Compatibility code for executeScriptFile 2015-01-08 09:01:39 +08:00
huangshiwu be02233815 Fix XmlHttpRequestTest parsing error of response header on iOS platform 2015-01-08 00:23:27 +08:00
Jun Hiroe ca86bce60d Replace tab with spaces 2015-01-07 23:46:28 +09:00
dualface ecd611d3eb Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support 2015-01-07 21:19:22 +08:00
Huabing.Xu 06d583c5ea update deps to 31 2015-01-07 18:36:59 +08:00
minggo ce0854847d Merge pull request #9847 from CocosRobot/update_lua_bindings_1420624123 
[AUTO]: updating luabinding automatically
 2015-01-07 17:52:47 +08:00
minggo e8b4c12aaf Merge pull request #9846 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-01-07 17:51:49 +08:00
CocosRobot 9253ae99bc [AUTO]: updating luabinding automatically 2015-01-07 09:50:54 +00:00
zhangbin d80830c264 Update the reference of submodule cocos2d-console. 2015-01-07 17:48:10 +08:00
Huabing.Xu b5859114b7 Merge pull request #9778 from samuele3hu/v3_4_bug_xmlhttp 
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
 2015-01-07 17:45:43 +08:00
dualface 8066343c69 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into add_package_manager_support 2015-01-07 17:39:30 +08:00
minggo a76d4e76da Merge pull request #9832 from super626/v3 
Fix warning log when loading sphere.c3b
 2015-01-07 17:28:07 +08:00
minggo c229ee0060 Merge pull request #9831 from CocosRobot/update_lua_bindings_1420600634 
[AUTO]: updating luabinding automatically
 2015-01-07 17:24:14 +08:00
minggo 4c7377480b Merge pull request #9837 from minggo/memory-leak 
fix memory leak
 2015-01-07 17:23:28 +08:00
andyque 0f49bb977d improve ui::Text and ui::TextField creation performance 2015-01-07 17:21:41 +08:00
Wenhai Lin 8524a5fb97 Improve performance of physics 2015-01-07 17:08:04 +08:00
yinjimmy 7d430742f1 Merge branch 'bugfix_executeScriptFile' into combine 2015-01-07 15:33:15 +08:00
yinjimmy cbf9741dfd Compatibility code for executeScriptFile 2015-01-07 15:23:58 +08:00
minggo 1dcdd81fc4 fix memory leak 2015-01-07 15:02:27 +08:00