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

11660 Commits

Author SHA1 Message Date
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
carlo morgantini 31b40263a7 render and font IOS are no more 2013-07-18 14:14:09 -07:00
carlo morgantini 9c53da22fa some more cleanup 2013-07-18 14:11:12 -07:00
carlo morgantini 5480810a9c clean up and now using FreeType for rendering fonts 2013-07-18 13:13:41 -07: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
boyu0 76e05ee802 Merge https://github.com/cocos2d/cocos2d-x into 2345 2013-07-18 17:47:43 +08: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
carlo morgantini 80247d409b rendering using free type. This commit is a work in progress and should NOT be used 2013-07-17 17:31:28 -07: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
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