samuele3hu
236b675e21
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-18 23:29:41 +08:00
samuele3hu
78cd3e561e
issue #2404:Move deprecated functions to Deprecated.lua
2013-07-18 23:27:07 +08:00
James Chen
5d2cf143de
Merge pull request #3188 from CocosRobot/updategeneratedsubmodule_1374141232
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 02:59:39 -07:00
CocosRobot
11daa0f769
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 09:53:56 +00:00
minggo
208c1312f4
Merge pull request #3171 from samuele3hu/ScriptHandler
...
issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGL,ScrollView handlers operation
2013-07-18 02:48:37 -07:00
James Chen
b1b8f63168
Merge pull request #3186 from CocosRobot/updategeneratedsubmodule_1374133130
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 00:50:57 -07:00
James Chen
a425dd3dc0
Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes
...
Conflicts:
cocos2dx/actions/CCActionTiledGrid.h
2013-07-18 15:46:14 +08:00
CocosRobot
ca06ed4f2c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 07:38:53 +00:00
James Chen
bf45fa86fe
Merge pull request #3176 from dumganhar/iss2413-overload-virtual
...
closed 2413: Warning fixes for overload virtual functions.
2013-07-18 00:33:53 -07:00
James Chen
90a1dcfdf9
Merge pull request #3185 from dumganhar/iss2404-deprecated
...
issue 2404: Marking CC prefix classes as deprecated.
2013-07-18 00:01:47 -07:00
James Chen
8176f2f178
issue #2404 : Fixing wrong replacement of shape.m_Vertex2F. shape.m_Vertex2F --> shape.m_vertex2
2013-07-18 14:48:18 +08:00
James Chen
12ac3105b7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-deprecated
2013-07-18 13:41:09 +08:00
James Chen
6277ae191b
issue #2404 : Removing duplicated codes in platform/mac/CCImage.mm.
2013-07-18 13:40:32 +08:00
James Chen
c1dd874b9f
issue #2404 : Fixing wrong replace in Box2d.
2013-07-18 13:39:55 +08:00
James Chen
469e13607a
issue #2404 : Marking CC prefix class as deprecated.
2013-07-18 13:38:23 +08:00
Ricardo Quesada
6e25301b43
more best practices fixes
...
- Adds more `const` in getters
- Overriden methods have the `override` keyword
- Reorganizes the structure of the class:
# creators first, then constructor, destructors, init
# then overridden methods
# variables at the end
- removes Hungarian notation from parts of the code
2013-07-17 16:56:19 -07:00
James Chen
d4a3e0a152
Merge pull request #3182 from CocosRobot/updategeneratedsubmodule_1374056513
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 03:22:51 -07:00
CocosRobot
2523e7746b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 10:21:56 +00:00
James Chen
9c36d3072e
Update AUTHORS
2013-07-17 18:12:43 +08:00
James Chen
431a0c46e7
Merge pull request #3180 from dumganhar/colesbury-functions
...
closed 2414: Bindings-generator could bind std::function argument now.
2013-07-17 03:10:57 -07:00
James Chen
d58a7fcce2
closed #2414 : Bindings-generator could bind std::function argument now.
2013-07-17 18:09:49 +08:00
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
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