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

9359 Commits

Author SHA1 Message Date
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 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 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
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
zhangbin 46d83f057f Add support for C++ 11in samples 2013-06-04 11:49:46 +08: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
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
James Chen de6a531115 Update cocos2dx.ini, don't genergate bindings for CCCallFunc::initWithFunction 2013-06-04 10:13:27 +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 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
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
James Chen b8a4c08312 Merge pull request #2719 from dumganhar/develop 
Enabling c++ 11 support for iOS. cocos2dx/proj.ios/cocos2dx.xcodeproj also needs to be updated.
 2013-06-03 01:39:26 -07:00
James Chen 5386dfcbfd Enabling c++ 11 support for iOS. cocos2dx/proj.ios/cocos2dx.xcodeproj also needs to be updated. 2013-06-03 16:34:41 +08:00
James Chen e02d9ef350 Merge pull request #2718 from CocosRobot/updategeneratedsubmodule_1370245785 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-03 00:52:44 -07:00
CocosRobot 8912ff963d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-03 07:49:49 +00:00
James Chen bf9ae3e413 Merge pull request #2716 from dumganhar/iss2244-getEye-develop 
fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values.
 2013-06-03 00:34:36 -07:00
James Chen 86af06c909 fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values. 2013-06-03 15:32:07 +08:00
minggo 97607425b8 Merge pull request #2712 from minggo/enable-cplusplus-11 
issue #2242:use -std=gnu++0x for linux and native client project
 2013-06-02 23:15:13 -07:00
minggo 5c1a408797 issue #2242:use -std=gnu++0x for linux and native client project 2013-06-03 13:50:19 +08:00
James Chen 67cb56b025 Merge pull request #2680 from natural-law/develop 
Refactor the framework of plugin
 2013-06-02 21:03:50 -07:00
James Chen fc816fde84 Merge pull request #2711 from dumganhar/xmlhttprequest-fix-develop 
fixed #2243: XMLHttpRequest don't support non-ascii characters.
 2013-06-02 20:43:45 -07:00
James Chen bb4d52a75c fixed #2243: XMLHttpRequest don't support non-ascii characters. 2013-06-03 11:39:18 +08:00
minggo ec0ba3f369 Merge pull request #2709 from minggo/enable-cplusplus-11 
Enable cplusplus 11
 2013-06-02 20:05:50 -07:00
minggo 0a64e7a041 enable c++11 for linux and natvie client projects 2013-06-03 11:02:54 +08:00
minggo 4f484cbcbf enable c++11 for android projects 2013-06-03 11:02:41 +08:00
minggo 236286829b enable c++11 2013-06-03 11:02:35 +08:00
minggo 2cdb48bc22 enable c++11 for iOS projects 2013-06-03 10:57:06 +08:00
James Chen cf3b79cbec Merge pull request #2696 from dumganhar/websocket 
fixed #1647: Adding WebSocket support for Cpp and JSB [develop]
 2013-06-02 19:38:51 -07:00
James Chen 2fdeab46b1 fixed #1647: [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:12:55 +08:00
James Chen 0ca86db0ff fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 10:12:55 +08:00
flamingo 6f0f53cf84 Update Android.mk 2013-06-02 20:42:48 +04:00
flamingo 6d7e4f5229 Update Makefile 
For nacl (spine runtime)
 2013-06-02 20:19:12 +04:00
flamingo f6495a64fb Update Android.mk 2013-06-02 20:18:27 +04:00
flaming0 b87a89eaa4 Update spine runtime 2013-06-02 19:59:13 +04:00