e81c0f944d
Merge branch 'ricardoquesada-property_synthesize_fixes' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-property_synthesize_fixes
2013-07-22 11:47:08 +08:00
384d3be378
Update AUTHORS
2013-07-22 11:44:39 +08:00
13cec2d859
Merge pull request #3204 from dumganhar/develop
...
Formatting codes with cocos2d-x code style in SimpleAudioEngineOpenAL.cpp.
2013-07-21 20:39:51 -07:00
382fe1a54d
Formatting codes with cocos2d-x code style in SimpleAudioEngineOpenAL.cpp.
2013-07-22 11:36:20 +08:00
ae015a71e1
Merge pull request #3203 from dumganhar/rafaelx-openal-deletebuffers
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3147
2013-07-21 19:56:55 -07:00
8c182d257d
issue #2415 : Formating codes in SimpleAudioEngineOpenAL.cpp.
2013-07-22 10:43:23 +08:00
a60c3eaa20
closed #2415 : [OpenAL] Adding one line to delete SimpleAudioEngine singleton in SimpleAudioEngine::end().
2013-07-22 10:32:48 +08:00
604c30f102
Merge branch 'openal-deletebuffers' of https://github.com/rafaelx/cocos2d-x into rafaelx-openal-deletebuffers
...
Conflicts:
CocosDenshion/include/SimpleAudioEngine.h
samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp
2013-07-22 10:06:14 +08:00
50c280fb9d
Fixing complication errors in CCTextureAtlas.cpp and jsb_cocos2dx_auto.cpp.
2013-07-21 19:10:22 +08:00
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
1f0dac4ed0
Removes CC_PROPERTY / CC_SYNTHESIZE from some parts of the code
...
As agreed previously, CC_PROPERTY_XXX and CC_SYNTHESIZE_XXX should
not be used in the code.
This patch removes some of them. There are still many more to remove
2013-07-19 13:16:38 -07:00
645487d23e
Merge pull request #3200 from CocosRobot/updategeneratedsubmodule_1374247442
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-19 08:32:52 -07:00
476e53b490
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-19 15:24:06 +00:00
4043ca7e23
Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3192
2013-07-19 08:15:39 -07:00
b915ecd0fc
Merge pull request #3196 from pyrasis/tizen_2.2
...
[Tizen] Fix compile error
2013-07-19 00:12:59 -07:00
7356e7c4c0
issue #2407 : Minor fix in CCTMXLayer.h
2013-07-19 15:03:28 +08:00
7c7d21dd03
issue #2407 : more best practices fixes, more getter and const..
2013-07-19 14:57:54 +08:00
980a053e50
[Tizen] Fix compile error.
...
- Tizen SDK doesn't support override keyword yet.
- add class keyword before friend keyword.
2013-07-19 15:16:05 +09:00
8078e8eff7
issue #2407 : SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance().
2013-07-19 13:40:45 +08:00
2dc6a58d2c
Merge branch 'more_more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_more_best_practices_fixes
2013-07-19 11:59:24 +08:00
5af281c5ea
Merge pull request #3195 from dumganhar/iss2404-deprecated
...
issue 2404: return nullptr in Clonable::copy().
2013-07-18 20:57:29 -07:00
9270a28275
issue #2404 : return nullptr in Clonable::copy().
2013-07-19 11:56:01 +08:00
acf3ca4846
Merge pull request #3194 from CocosRobot/updategeneratedsubmodule_1374205846
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 20:52:57 -07:00
f3615b40d5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-19 03:50:49 +00:00
de54c8861f
Merge pull request #3193 from dumganhar/more-getter
...
More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize
2013-07-18 20:43:59 -07:00
6ffac07a81
More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize
2013-07-19 11:08:47 +08:00
ba6ab126c6
More best practices fixes
...
- class order fixes
- static methods (creators) at the beginning
- then constructors / destructors
- then init
- more `const` fixes
- adds some const getters
- some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
2013-07-18 16:30:19 -07:00
c4ef2c9250
Added to various functions a check whether an OpenAL source exists on which OpenAL functions can be called.
...
Playback of background music starts now with the previously set volume, independent of the OpenAL source state.
Added a delete on the SimpleSoundEngine object within CocosDenshionTest::onExit() so that alutExit() gets called to release allocated resources by OpenAL.
2013-07-19 01:00:24 +02:00
7de69edad8
Merge pull request #3187 from dumganhar/ricardoquesada-more_best_practices_fixes
...
Merge https://github.com/cocos2d/cocos2d-x/pull/3183
2013-07-18 08:52:15 -07:00
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
11daa0f769
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 09:53:56 +00:00
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
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
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
ca06ed4f2c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 07:38:53 +00:00
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
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
8176f2f178
issue #2404 : Fixing wrong replacement of shape.m_Vertex2F. shape.m_Vertex2F --> shape.m_vertex2
2013-07-18 14:48:18 +08:00
12ac3105b7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-deprecated
2013-07-18 13:41:09 +08:00
6277ae191b
issue #2404 : Removing duplicated codes in platform/mac/CCImage.mm.
2013-07-18 13:40:32 +08:00
c1dd874b9f
issue #2404 : Fixing wrong replace in Box2d.
2013-07-18 13:39:55 +08:00
469e13607a
issue #2404 : Marking CC prefix class as deprecated.
2013-07-18 13:38:23 +08:00
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
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
2523e7746b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 10:21:56 +00:00
9c36d3072e
Update AUTHORS
2013-07-17 18:12:43 +08:00
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
d58a7fcce2
closed #2414 : Bindings-generator could bind std::function argument now.
2013-07-17 18:09:49 +08:00
86ef8f45e7
Merge branch 'functions' of https://github.com/colesbury/cocos2d-x into colesbury-functions
2013-07-17 17:51:05 +08:00
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
James Chen