Commit Graph

10666 Commits

Author SHA1 Message Date
carlo morgantini 97363c9382 some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
carlo morgantini 98bb0c26f3 working on the new label stuff 2013-07-22 14:43:45 -07:00
carlo morgantini 98c52cd98d new FontCache 2013-07-22 13:08:37 -07:00
carlo morgantini 5668607e0e merging with Ricardo stuff and fixin the new Label 2013-07-22 11:40:39 -07:00
carlo morgantini 005c492f37 Merge remote-tracking branch 'ricorigin/merge_new_label' into developNewLabelForRiq
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
2013-07-22 11:38:37 -07:00
carlo morgantini f8fb2a068c new label 2013-07-22 11:17:51 -07:00
carlo morgantini 15076ad249 more cleanup 2013-07-22 11:08:24 -07:00
Ricardo Quesada 2219bde542 bmfont sample working
...still TTF working OK
2013-07-19 16:49:51 -07:00
Ricardo Quesada 88928fff99 Merge branch 'developNewLabelMerge' into merge_new_label
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/textures/CCTexture2D.h
	samples/Javascript/Shared
2013-07-19 16:04:23 -07:00
carlo morgantini c977e6c3fa Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge
Conflicts:
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontDefinition.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	cocos2dx/label_nodes/CCStringTTF.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-07-19 12:24:25 -07:00
carlo morgantini 9f629835de some more cleanup 2013-07-19 11:19:35 -07:00
carlo morgantini 5068622c04 working on the new atlas stuff 2013-07-19 10:33:26 -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
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
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
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
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
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
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
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