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

11366 Commits

Author SHA1 Message Date
James Chen 86ef8f45e7 Merge branch 'functions' of https://github.com/colesbury/cocos2d-x into colesbury-functions 2013-07-17 17:51:05 +08:00
James Chen 37955c8c69 Merge pull request #3179 from CocosRobot/updategeneratedsubmodule_1374054406 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-17 02:50:06 -07:00
CocosRobot e8777b8722 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-17 09:46:49 +00:00
James Chen 7d4b798ae3 Merge pull request #3177 from dumganhar/ricardoquesada-sanityzing_code 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3170
 2013-07-17 02:39:47 -07:00
James Chen a9eea0a887 issue #2407: Updating jsb_deprecated.js and cocos2dx.ini. 2013-07-17 17:38:03 +08:00
boyu0 70140bb4cb refactor CCImage and CCTexture2D 2013-07-17 17:12:04 +08:00
James Chen d6f713a31b Merge branch 'sanityzing_code' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-sanityzing_code 
Conflicts:
	samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h
 2013-07-17 17:06:47 +08:00
samuele3hu 8447341896 issue #2377: Modify LuaWebScoket linux compile error 2013-07-17 16:40:31 +08:00
James Chen f4edc7a922 closed #2413: Warning fixes for overload virtual functions. 2013-07-17 16:25:13 +08:00
James Chen f531923d2e Merge pull request #3175 from CocosRobot/updategeneratedsubmodule_1374044026 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-17 01:16:55 -07:00
CocosRobot 8cc8d56ed2 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-17 06:53:49 +00:00
James Chen eb475174b6 Merge pull request #3174 from dumganhar/iss2407-class-order 
issue 2407: Adds more readability to the class internals for 'ParallaxNode'.
 2013-07-16 23:45:22 -07:00
samuele3hu 847b87b297 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-17 14:45:02 +08:00
samuele3hu c9f0f09dac issue #2377:Del CallFunc and CallFuncN handler operation and Modify LuaWebScoket linux config 2013-07-17 14:44:28 +08:00
James Chen e7452bc912 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2407-class-order 2013-07-17 14:36:55 +08:00
James Chen 7e4e34d992 [ci skip]Update cocos2dx.ini, don't genergate bindings for DrawNode::listenBackToForeground. 2013-07-17 14:36:10 +08:00
James Chen c31e8a8afc issue #2407: Updating SpriteTest.cpp, Don't hide virtual override function. 2013-07-17 14:33:15 +08:00
James Chen b6fda7bf7c issue #2407: Removing unused codes in Box2dTest.h 2013-07-17 14:32:38 +08:00
James Chen 53ace33d26 issue #2407: Adds more readability to the class internals for 'ParallaxNode'. 2013-07-17 14:32:10 +08:00
James Chen 7e107a8841 Update AUTHORS [ci skip] 2013-07-17 14:26:10 +08:00
James Chen d3bf9935cd Merge pull request #3166 from dumganhar/iss2410-blackscreen-android 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3117
 2013-07-16 23:25:01 -07:00
James Chen cd136e6330 issue #2410: [Reverting] Don't use 'ccGLEnableVertexAttribs' when using VAO, use 'glEnableVertexAttribArray' instead. 2013-07-17 13:55:31 +08:00
James Chen 209392085c issue #2410: Reverting some changes about VAO. And adding CC_ENABLE_CACHE_TEXTURE_DATA to 'EVNET_COME_TO_FOREGROUND' in DrawNode. 2013-07-17 13:53:16 +08:00
samuele3hu 3018f5b3d7 issue #2377:Adjust some function places. 2013-07-17 13:43:27 +08:00
James Chen 7b51599cbd closed #2410: Fixing a bug that loading a wrong texture in ShaderCache::loadDefaultShaders. This could fix DrawNode displays nothing when resume. 2013-07-17 12:55:27 +08:00
James Chen 56419b9e90 issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. 
Reset the order of reloading shaders and textures in main.cpp.
 2013-07-17 12:53:30 +08:00
samuele3hu 6ce5bbf09a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-17 10:16:11 +08:00
samuele3hu 0f1ac9983f issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGl,Scrollview handlers operation. 2013-07-17 10:15:25 +08:00
Ricardo Quesada 5d499d351d Some more changes to make the code more c++ friendly: 
- nodeToParentTransform -> getNodeToParentTransform() (the same for its friends)
   - Deprecates the old methods
   - adds 'consts' to those methods
- boundingBox() -> getBoundingBox()
   - the new one is const
   - Deprecates the old method.
- Adds overrides keywords in CCNodeRGBA and CCArmature
- AffineMatrix are mutables
 2013-07-16 18:16:04 -07:00
Sam Gross 96c15efb66 Add JSFunctionWrapper in preparation for bindings-generator changes. 2013-07-16 19:30:47 -04:00
carlo morgantini 9cfe1b7823 new stuff for FreeType 2013-07-16 15:18:39 -07:00
James Chen d37161a143 Merge pull request #3167 from CocosRobot/updategeneratedsubmodule_1373968198 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-07-16 07:13:42 -07:00
CocosRobot 1ea10c75c3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-16 09:50:03 +00:00
James Chen 80590dcfc1 Merge pull request #3132 from samuele3hu/ScriptHandler 
issue 2377:Add scriptHandlerMgr to manager lua script handler
 2013-07-16 02:40:50 -07:00
minggo 52a27c5fc9 Merge pull request #3118 from jotel/text-shadow-opacity-fix 
Now opacity option for shadow in CCLabelTTF works.
 2013-07-16 02:39:36 -07:00
James Chen 84d520c7f9 Update AUTHORS [ci skip] 2013-07-16 17:37:50 +08:00
James Chen b71e9d83e1 Merge pull request #3165 from sunzhuoshi/master 
Fixed bad js constant names and added config macro for "spine" extension
 2013-07-16 02:36:49 -07:00
James Chen 5b06824036 closed #2410: Formatting codes in Texture2D::initWithString. 2013-07-16 16:47:35 +08:00
samuele3hu 596eb9df3e issue #2377:Modify tojs/cocos2dx.ini and a function name 2013-07-16 16:45:57 +08:00
minggo c6c50eb55a Merge pull request #3110 from sergey-shambir/opensl_fix 
CocosDenshion: fixed wrong assertion in android OpenSL engine
 2013-07-16 01:39:01 -07:00
James Chen 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
 2013-07-16 16:33:02 +08:00
sunzhuoshi ec7456a43c Removed config macro for "spine" extension 2013-07-16 16:19:20 +08:00
James Chen 617a763413 Merge pull request #3164 from dumganhar/develop 
Updating JS-test to the latest version.
 2013-07-16 00:37:34 -07:00
James Chen b543de648c [iOS, Mac]Adding jsb_deprecated.js to resource folder for JSB projects. 2013-07-16 15:35:13 +08:00
James Chen f09cf35dba Updating JS-test to the latest version. 2013-07-16 15:31:23 +08:00
James Chen 8c75416f4f Merge pull request #3163 from dumganhar/develop 
closed 2307: Adding cc.PhysicsSprite.prototype.getBody in jsb_cocos2d_extension.
 2013-07-16 00:08:48 -07:00
James Chen 63bd5cf10b closed #2307: Adding cc.PhysicsSprite.prototype.getBody in jsb_cocos2d_extension. 
The issue was fixed at https://github.com/cocos2d/cocos2d-x/pull/2869 .
Reported at http://www.cocos2d-x.org/boards/20/topics/25430?r=31702
 2013-07-16 15:06:36 +08:00
sunzhuoshi 6d0f7dfe88 Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x 2013-07-16 15:04:51 +08:00
sunzhuoshi 8cad37a8d8 Fixed javascript constant names auto-generated 2013-07-16 14:47:47 +08:00
samuele3hu 241c01bec3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-16 14:47:46 +08:00