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

330 Commits

Author SHA1 Message Date
Dhilan007 fd5a4acddb Remove the old implementation of LabelBMFont. 2014-03-28 10:28:44 +08:00
andyque 928e9def8d closed #102, add CC_CONSTRUCTOR_ACCESS to CCProtectedNode 2014-03-27 14:27:30 +08:00
James Chen 1dbfc9e10a Merge pull request #5988 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 #5969 from nutty898/develop_nutty_modifylayout_add_Boxes 
closed #4534: 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 #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
andyque 6449ced0ab closed #4560, fixed UISlider hitTest Point 2014-03-26 14:41:53 +08:00
minggo a374241f65 Merge pull request #5924 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 #5926 from andyque/fix_tests_warnings 
issue #4401, 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 #4541: 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 #5806 from Dhilan007/develop_reImplementationWithLabel 
issue #3821: 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
James Chen f51c39c034 closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 
Thank @pandamicro.
 2014-03-21 13:44:29 +08:00
andyque 7ab639ec0f fix lots compile warnings 2014-03-20 16:24:55 +08:00
andyque 8c1bf48357 fixed label font size: from int to float 2014-03-20 15:03:48 +08:00
andyque ca6851f114 fix warnings of font and RichText 2014-03-20 11:58:36 +08:00
andyque 7ae77c9335 fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
Dhilan007 e512235299 Remove the old implementation of LabelTTF 2014-03-14 21:06:40 +08:00
James Chen 177bf4df9d Some warning fixes. 2014-03-14 15:38:43 +08:00
CaiWenzhi b8ce59962a Fixed bug of ScrollView 2014-03-13 10:11:41 +08:00
CaiWenzhi 4d99736e4a Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-12 17:06:48 +08:00
andyque 448b101578 fix linux compile error 2014-03-11 20:46:11 +08:00
andyque 48772fb952 modify android makefile 2014-03-11 18:48:28 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00