Commit Graph

62 Commits

Author SHA1 Message Date
James Chen 7c5b4be0b1 Warning fixes in ui, getZOrder -> getLocalZOrder 2014-04-11 18:06:53 +08:00
James Chen 39b25c9307 Removed unused comments in GUIDefine.h 2014-04-10 17:15:59 +08:00
James Chen efb443dea0 Merge pull request from dumganhar/iss4729-deprecated-folder
issue : Move deprecated stuff to deprecated folder
2014-04-10 11:17:21 +08:00
Dhilan007 390685ae93 Label:Change setter of system font name. 2014-04-10 10:23:00 +08:00
James Chen 5615717617 issue : NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
Dhilan007 05b8123803 Label:Makes the create functions of Label just do one thing. 2014-04-09 23:31:05 +08:00
Dhilan007 67652357e1 1.Makes the create functions of Label clear. 2014-04-09 21:35:08 +08:00
James Chen 61134426a8 Some fixes detected by xcode analyze 2014-04-09 20:41:09 +08:00
andyque 4b6aa2a22c closed . remove Hungary style 2014-04-04 18:26:53 +08:00
andyque 77aee27f05 issue . refactor ButtonReader 2014-04-04 16:51:07 +08:00
andyque 9bcfea2279 issue . fix some typo 2014-04-03 17:13:24 +08:00
andyque 0875b4e51f closed . Done 2014-04-03 15:56:45 +08:00
andyque ed2c38eb98 issue , finish UITextBMFont 2014-04-03 15:45:06 +08:00
andyque b59beab61a issue , finish UISlider 2014-04-03 15:33:57 +08:00
andyque 48429f5738 issue . finish UILoadingBar 2014-04-03 11:34:06 +08:00
andyque fe33588038 issue . finish UILayout 2014-04-03 11:14:35 +08:00
andyque 1a97ebdcb0 issue . finish UIImageView 2014-04-03 10:42:30 +08:00
andyque 52bdb840ee issue . finish UICheckBox 2014-04-03 10:34:20 +08:00
andyque 10134ccc65 issue . finish button 2014-04-03 10:31:10 +08:00
andyque 0a6b0a4389 issue . refactor Scale9Sprite 2014-04-03 10:07:47 +08:00
andyque b27fe6ecc2 issue . add parameter create method to UITextBMFont 2014-04-03 10:07:46 +08:00
andyque 0b5c10a0fb issue . add parameter create method to UITextAtlas 2014-04-03 10:07:46 +08:00
andyque a03dc76f7d issue , add parameter create method for UILoadingBar 2014-04-03 10:07:46 +08:00
andyque 92945715eb issue . add parameter create function for UIText 2014-04-03 10:07:46 +08:00
andyque 558abf1a6b issue , add parameter create method to UIImageView 2014-04-03 10:07:46 +08:00
andyque 18c072beff issue , replace const char* to const std::string& in UIButton 2014-04-03 10:07:46 +08:00
andyque ba9a605568 issue , add parameter create method to UICheckBox 2014-04-03 10:07:46 +08:00
andyque 1b0583214b issue , add parameter create method to UIButton 2014-04-03 10:07:46 +08:00
minggo 98ed579b34 Merge pull request from pipu/develop_pipu_fixedbugsforeditor_1301
Fixed bugs for Editor
2014-03-31 15:37:45 +08:00
pipu 4c1cbabb5e fixed bugs 2014-03-31 11:34:26 +08:00
Dale Stammen b2d3dbf0fe added wp8 support files and projects 2014-03-28 15:39:20 -07:00
pipu 733b364b51 Fixed bugs for Editor 2014-03-28 18:54:06 +08:00
Dhilan007 fd5a4acddb Remove the old implementation of LabelBMFont. 2014-03-28 10:28:44 +08:00
andyque 928e9def8d closed , add CC_CONSTRUCTOR_ACCESS to CCProtectedNode 2014-03-27 14:27:30 +08:00
James Chen 1dbfc9e10a Merge pull request from andyque/fix_silder_hittest
closed 4560,  fixed slider hitTest position
2014-03-26 19:27:41 +08:00
James Chen cdd7356512 Merge pull request from nutty898/develop_nutty_modifylayout_add_Boxes
closed : Adding HBox, VBox layouts, refactoring 'doLayout' function.
2014-03-26 18:30:17 +08:00
CaiWenzhi a05969c395 Move layout "exe" to cpp 2014-03-26 17:58:53 +08:00
andyque 57d8f155df issue . resolve conflicts 2014-03-26 14:54:50 +08:00
andyque 6449ced0ab closed , fixed UISlider hitTest Point 2014-03-26 14:41:53 +08:00
minggo a374241f65 Merge pull request from MSOpenTech/wp8-3.0-cocos2d-changes
Windows Phone 8,0 cocos2d-x 3.0  changes
2014-03-26 13:58:46 +08:00
James Chen f6c6d428ad Merge pull request from andyque/fix_tests_warnings
issue , remove warnings under win32
2014-03-25 18:17:42 +08:00
CaiWenzhi 243b7e5822 Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
James Chen b40127ea99 Never include '.cpp' files. 2014-03-25 15:32:14 +08:00
James Chen 91347aca0c closed : Removes wrong coments in CCProtectedNode.h. 2014-03-25 15:07:46 +08:00
CaiWenzhi 9a8cf6d813 Modify Windows Project 2014-03-25 14:28:58 +08:00
CaiWenzhi c0b67e6d1b Modify mk files 2014-03-25 14:28:58 +08:00
CaiWenzhi 2dffcb9808 Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
James Chen 8d28884c9f Merge pull request from Dhilan007/develop_reImplementationWithLabel
issue : Uses new label instead of LabelTTF in engine.
2014-03-25 13:46:17 +08:00
andyque f5795c25b6 remove warnings under win32 2014-03-24 10:12:40 +08:00
Dale Stammen 44e6efea64 #pragma mark for ios and mac only 2014-03-22 06:08:05 -07:00