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

9238 Commits

Author SHA1 Message Date
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
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
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
James Chen 3583e5b185 Merge pull request #2706 from dumganhar/develop 
Moving JS bytecode generated tool (jsbcc) from 'tools/jsbcc' to 'cocos2d-console'.
 2013-06-01 19:57:03 -07:00
James Chen c7fd3a3483 Adding submodule of cocos2d-console to 'tools' folder. 2013-06-02 10:53:46 +08:00
James Chen 89b397f1d1 Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console. 2013-06-02 10:53:34 +08:00
James Chen 7b25d61824 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into websocket 2013-06-01 23:33:01 +08:00
James Chen f8ce155e36 Merge pull request #2686 from folecr/androidx86 
Spidermonkey for Android/x86
 2013-06-01 08:23:42 -07:00
James Chen 62f4e40e4a Updating JS-Test. 2013-06-01 19:51:59 +08:00
James Chen 8e15cdf5fd WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-01 19:51:10 +08:00
James Chen d5f45466a9 issue # 1647: Fix include, 'Websocket.h' -> 'WebSocket.h' since linux is case sensitive. 2013-06-01 07:58:23 +08:00
James Chen ad05363265 fixed #1647: Updating JS-test. 2013-05-31 23:27:59 +08:00
James Chen 669066b954 fixed #1647: Adding missing files. 2013-05-31 23:25:01 +08:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
minggo 57600783c4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-05-31 10:29:39 +08:00
Ricardo Quesada 3cbb6c4abb uses the cocos2d.x namespace for "cocos2d x" configuration values 2013-05-31 10:25:55 +08:00
Ricardo Quesada 3383fc5f04 CCConfiguration supports default values in the query 
Adds tests for the new API as well
 2013-05-31 10:25:34 +08:00
folecr c7ce3d10d3 Spidermonkey for Android/x86 2013-05-30 17:18:17 -07:00
zhangbin 34fbcad467 Merge branch 'ForReflection' into develop 
Conflicts:
	plugin/protocols/platform/ios/PluginUtilsIOS.mm
 2013-05-30 17:42:37 +08:00
zhangbin 01ca1805e8 issue #2224 : Modify the implementation of plugin flurry & umeng on iOS for the new framework. 2013-05-30 14:57:39 +08:00
zhangbin 50747530e0 issue #2224 : Implement reflection in plugin on iOS. 2013-05-30 14:50:21 +08:00