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

9748 Commits

Author SHA1 Message Date
Ricardo Quesada dccc4a3814 adds mising tests + cosmetic changes 2013-06-03 22:47:28 -07:00
James Chen 5d89a0cd0c Merge branch 'develop' into update-spine-runtime-develop 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-04 13:46:05 +08:00
Ricardo Quesada cc771da2c2 Merge branch 'develop' into testmenu_sorted 2013-06-03 22:35:55 -07:00
Ricardo Quesada cd52912f66 Main menu from test is sorted alphabetically 
Code was refactored. Now it is super easy to add a new test.
No need to add it in 3 different places
 2013-06-03 22:33:52 -07:00
James Chen b3e00a2105 Merge pull request #2741 from CocosRobot/updategeneratedsubmodule_1370323397 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-03 22:25:33 -07:00
James Chen 22053d4b85 Merge pull request #2742 from dumganhar/master 
fixed #2251: A logical error in CCDrawNode::drawPolygon.
 2013-06-03 22:24:37 -07:00
CocosRobot be08d6c81d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 05:23:21 +00:00
James Chen 0820013740 Update AUTHORS [ci skip] 2013-06-04 13:22:16 +08:00
xyhl515 69ccb9b724 A problem of CCDrawNode::drawPolygon outline 2013-06-04 13:22:06 +08:00
James Chen a4802c3466 Update AUTHORS [ci skip] 2013-06-04 14:17:14 +09:00
James Chen 932d6dfb85 Merge pull request #2726 from xyhl515/develop 
fixed #2251: A logical error in CCDrawNode::drawPolygon.
 2013-06-03 22:15:13 -07:00
James Chen c9b51b5ea1 Merge pull request #2740 from dumganhar/iss2247-proxy-function-master 
fixed #2247: Using functions instead of macros to speeding up building for JSB project.
 2013-06-03 22:05:25 -07:00
James Chen a597323734 Merge pull request #2739 from dumganhar/iss2247-proxy-function-develop 
fixed #2247: Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes].
 2013-06-03 22:02:45 -07:00
James Chen 6cc3ba9a5d fixed #2247: Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes]. 2013-06-04 13:02:02 +08:00
James Chen 64dec0df56 fixed #2247: Using functions instead of macros to speeding up building for JSB project. 2013-06-04 13:01:50 +08:00
minggo 3689c81536 Merge pull request #2738 from minggo/develop-test 
declare _functions as it is initialized
 2013-06-03 21:55:17 -07:00
James Chen 58205ff322 fixed #2247: Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes]. 2013-06-04 12:53:42 +08:00
minggo 6ca56c9526 Merge pull request #2737 from natural-law/develop 
Update the JS binding code for plugin on develop branch
 2013-06-03 21:03:26 -07:00
minggo 1c700157b3 declare _functions as it is initialized 2013-06-04 11:57:32 +08:00
James Chen f94fe559a8 Merge pull request #2736 from CocosRobot/updategeneratedsubmodule_1370316013 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-03 20:56:51 -07:00
minggo 5f8e9afec6 change version 2013-06-04 11:52:35 +08:00
zhangbin 46d83f057f Add support for C++ 11in samples 2013-06-04 11:49:46 +08:00
Ricardo Quesada 7e7e943699 compiles on linux and other machines without C99 support 2013-06-03 20:45:06 -07:00
CocosRobot be8ed6e3a4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 03:20:16 +00:00
zhangbin 3838107389 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-04 11:03:44 +08:00
zhangbin f0f16b3adc Merge branch 'ForReflection' into develop 
Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm
 2013-06-04 11:03:17 +08:00
minggo 4790a46a66 Merge pull request #2735 from natural-law/master 
Update the JS binding code for plugin
 2013-06-03 20:02:32 -07:00
James Chen 0587631926 Merge pull request #2725 from dumganhar/iss2247-refactor-jsb-proxy-develop 
fixed #2247: Using functions instead of macros to speeding up building for JSB project.
 2013-06-03 19:49:31 -07:00
Ben Ward 0f8fa2e5a4 Fixed tabbing. 2013-06-04 10:45:20 +08:00
Ben Ward 73b8050fa1 Fixed linebreaks on Mac OSX 2013-06-04 10:45:07 +08:00
minggo 9ca77def9d Update AUTHORS 
[ci ignore]
 2013-06-04 10:42:18 +08:00
minggo 74b86021e6 Merge pull request #2624 from benjamesward/master 
Fixed linebreaks on Mac OSX
 2013-06-03 19:40:34 -07:00
minggo f9de0d2fbe Merge pull request #2714 from samuele3hu/bind_cocosbuilder 
add cocosbuilder lua_binding
 2013-06-03 19:33:19 -07:00
zhangbin b044486608 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-06-04 10:13:29 +08:00
James Chen de6a531115 Update cocos2dx.ini, don't genergate bindings for CCCallFunc::initWithFunction 2013-06-04 10:13:27 +08:00
zhangbin d83c9b58a5 Merge branch 'ForReflection' 
Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm
 2013-06-04 10:12:41 +08:00
zhangbin 1eb8217edb fixed #2224 : Update the JS binding code for plugin. 2013-06-04 10:06:16 +08:00
James Chen b60faaf19c Disabling native client build in travis-ci. 
Reason: Native client port doesn't support c++ 11 fully, it seems that it doesn't support lambda, please refer to https://github.com/cocos2d/cocos2d-x/blob/develop/samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.cpp#L982
 2013-06-04 10:05:57 +08:00
minggo ef4dd973db Merge pull request #2727 from ricardoquesada/callfunction_cplusplus_11_bis 
Adds std::function support in CCCallFunc
 2013-06-03 18:52:28 -07:00
Ricardo Quesada c6d00a3ccb cc_timeval works on 64bit machines, like OS X 2013-06-03 17:31:59 -07:00
Ricardo Quesada ff43b54b4f ouch... restores bindings/generator repo 2013-06-03 13:51:03 -07:00
Ricardo Quesada 69e8628626 Adds setObject to CCConfiguration 
also adds the test
 2013-06-03 13:49:06 -07:00
Ricardo Quesada fb566426b9 enable C++11 in tojs 2013-06-03 13:09:49 -07:00
Ricardo Quesada 39928d6a80 Adds std::function support in CCCallFunc 
And fixes some minor issues on the iOS and OS X projects
 2013-06-03 12:13:24 -07:00
flaming0 92b1da1fce Merge remote-tracking branch 'refs/remotes/origin/patch-spine' into patch-spine 2013-06-03 20:53:17 +04:00
flaming0 a6c2ad0666 Update for spine runtime. 2013-06-03 20:52:32 +04:00
minggo 45a191c4f0 Merge pull request #2723 from rodrigogolive/linux_fixes 
Removing unused variable
 2013-06-03 07:44:16 -07:00
James Chen bba2d2bbdc fixed #2247: Using functions instead of macros to speeding up building for JSB project. 2013-06-03 22:31:24 +08:00
xyhl515 26e356c33c A problem of CCDrawNode::drawPolygon outline 2013-06-03 22:19:37 +08:00
Rene Klacan c4ec15752a simplified CCKeyboardDispatcher and CCLayer does not inherit from CCKeyboardDelegate 2013-06-03 16:06:33 +02:00