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

11059 Commits

Author SHA1 Message Date
James Chen 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
James Chen 8c182d257d issue #2415: Formating codes in SimpleAudioEngineOpenAL.cpp. 2013-07-22 10:43:23 +08:00
James Chen a60c3eaa20 closed #2415: [OpenAL] Adding one line to delete SimpleAudioEngine singleton in SimpleAudioEngine::end(). 2013-07-22 10:32:48 +08:00
James Chen 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
samuele3hu eed0297c59 Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc 2013-07-22 09:39:57 +08:00
samuele3hu 1f5f6e8fa2 issue #2404:Modify configs 2013-07-22 09:36:00 +08:00
James Chen 50c280fb9d Fixing complication errors in CCTextureAtlas.cpp and jsb_cocos2dx_auto.cpp. 2013-07-21 19:10:22 +08:00
Ricardo Quesada 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
Ricardo Quesada 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
James Chen 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
CocosRobot 476e53b490 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-19 15:24:06 +00:00
James Chen 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
samuele3hu 4eb6d7aea4 issue #2404:Modify a comment 2013-07-19 15:38:17 +08:00
samuele3hu 18fa6f2fbd issue #2404:Modify a comment 2013-07-19 15:29:36 +08:00
James Chen b915ecd0fc Merge pull request #3196 from pyrasis/tizen_2.2 
[Tizen] Fix compile error
 2013-07-19 00:12:59 -07:00
James Chen 7356e7c4c0 issue #2407: Minor fix in CCTMXLayer.h 2013-07-19 15:03:28 +08:00
James Chen 7c7d21dd03 issue #2407: more best practices fixes, more getter and const.. 2013-07-19 14:57:54 +08:00
samuele3hu 90af254fac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc 2013-07-19 14:57:38 +08:00
samuele3hu 3b97353e14 issue #2404:Modify Deprecated.lua and set platform config 2013-07-19 14:57:02 +08:00
Lee, Jae-Hong 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
minggo 687c088b51 issue #2412:remove blackberry and marmalade port because they don't support c++11 2013-07-19 13:55:03 +08:00
minggo 7704ab9161 issue #2412:remove platform.cpp/.h 2013-07-19 13:42:45 +08:00
James Chen 8078e8eff7 issue #2407: SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance(). 2013-07-19 13:40:45 +08:00
James Chen 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
James Chen 5af281c5ea Merge pull request #3195 from dumganhar/iss2404-deprecated 
issue 2404: return nullptr in Clonable::copy().
 2013-07-18 20:57:29 -07:00
James Chen 9270a28275 issue #2404: return nullptr in Clonable::copy(). 2013-07-19 11:56:01 +08:00
James Chen 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
CocosRobot f3615b40d5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-19 03:50:49 +00:00
James Chen 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
James Chen 6ffac07a81 More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize 2013-07-19 11:08:47 +08:00
zhangbin ff29d08c4b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-19 10:07:42 +08:00
zhangbin 8a82b4b87a Rename the library file name of uc SDK. 2013-07-19 10:06:28 +08:00
Ricardo Quesada 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
rafael.x 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
James Chen 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
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