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

19341 Commits

Author SHA1 Message Date
James Chen 1ec3f014e8 Merge pull request #6130 from dumganhar/iss4557-set-enabled-listener 
closed #4557: Adds `EventListener::setEnabled/isEnabled`.
 2014-04-03 18:02:44 +08:00
Huabing.Xu f9405e0ea9 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-03 17:47:16 +08:00
James Chen c595dd5dec Merge pull request #6136 from CocosRobot/update_lua_bindings_1396518289 
[AUTO]: updating luabinding automatically
 2014-04-03 17:46:51 +08:00
CocosRobot 279b371031 [AUTO]: updating luabinding automatically 2014-04-03 09:46:03 +00:00
James Chen b174eca9ee Merge pull request #6135 from CocosRobot/update_cocosfiles_1396518155 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-04-03 17:45:15 +08:00
CocosRobot 25b24a62cb [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-03 09:42:36 +00:00
andyque c501aa2dec issue #4636. replace __String with StringUtils::format 2014-04-03 17:42:04 +08:00
Huabing.Xu 1b8e45fe19 remove kmGLFreeAll call 2014-04-03 17:40:14 +08:00
James Chen cb8edabb30 Merge pull request #6133 from samuele3hu/develop_new_label 
fix the error about `draw` of GLNode and modify the related test cases
 2014-04-03 17:34:27 +08:00
Huabing.Xu 14f004b12a remove reference to kmGL in director 2014-04-03 17:32:40 +08:00
Huabing.Xu 67e62ce73d readied director::getMatrix again. remove kmGLgetMatrix 2014-04-03 17:26:06 +08:00
James Chen a2081ea210 issue #4557: Updates comments for EventListener::setPaused. 2014-04-03 17:20:16 +08:00
andyque 9bcfea2279 issue #4636. fix some typo 2014-04-03 17:13:24 +08:00
samuele3hu 550f4dca29 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-03 17:03:09 +08:00
James Chen a3214b7505 issue #4557: Updates comments for EventListener::setEnabled/setPaused. 
Also does whitespace cleanup and untabify codes. Thanks emacs. :)
 2014-04-03 17:02:17 +08:00
samuele3hu b68f6bf65e fix the error about `draw` of GLNode and modify the related test cases 2014-04-03 17:02:14 +08:00
James Chen 7a5dba9eb9 issue #4557: Adds const for `EventListener::isEnabeld`. 2014-04-03 16:46:16 +08:00
James Chen ec56796062 Merge pull request #6125 from 2youyouo2/develop 
Two fixes for armature:
1.fixed set blend func
2.fixed changedisplay does not rebind parent's bone
 2014-04-03 16:23:55 +08:00
James Chen a1e9804da3 Update CHANGELOG [ci skip] 2014-04-03 16:21:57 +08:00
James Chen 405b1c6036 Merge pull request #6122 from mgcL/PhysicsShapeEdgeChain-create-failed 
fix PhysicsShapeEdgeChain::init() always return false
 2014-04-03 16:20:36 +08:00
yinkaile 66e37cf481 remove cc prefix 2014-04-03 16:19:49 +08:00
yinkaile 89cd2a300e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-03 16:19:08 +08:00
andyque c35c006fbd Merge branch 'develop' into feature3636 2014-04-03 16:02:00 +08:00
Huabing.Xu 5e76c6713d migrate cpp-tests to director matrix stack 2014-04-03 15:59:55 +08:00
andyque 0875b4e51f closed #4636. Done 2014-04-03 15:56:45 +08:00
Huabing.Xu bb19e39e37 migrate ScrollView to director matrix stack 2014-04-03 15:55:37 +08:00
andyque 8996ab1956 issue #4636, finish refactorying UITextFieldTest 2014-04-03 15:52:42 +08:00
andyque ed2c38eb98 issue #4636, finish UITextBMFont 2014-04-03 15:45:06 +08:00
andyque 08bf6c27f4 issue #4636. finish UITextAtlasTest 2014-04-03 15:38:52 +08:00
James Chen 89048dd6bd closed #4557: Comment fixes in CCEventListener.h. 2014-04-03 15:35:18 +08:00
andyque b59beab61a issue #4636, finish UISlider 2014-04-03 15:33:57 +08:00
James Chen f6859a3ca9 closed #4557: Adds `EventListener::setEnabled/isEnabled`. 2014-04-03 15:32:16 +08:00
andyque a7a1a6b05b issue #4636, finish UIRichTextTest and UIScrollViewTest 2014-04-03 15:22:23 +08:00
Huabing.Xu 960ac300d5 migrate cocostudio to director matrix stack 2014-04-03 14:55:55 +08:00
Huabing.Xu 67971e9f0b migrate sprite spriteBatchNode to director matrix stack 2014-04-03 14:55:36 +08:00
Huabing.Xu 46b4f1b5d8 migrate Grid, Label, RenderTexture to director matrix stack 2014-04-03 14:32:49 +08:00
James Chen 5ea00e814c Merge pull request #6129 from samuele3hu/develop_new_label 
Synchronize LabelTest of cpp to lua to fix some bug and add more tests
 2014-04-03 13:51:27 +08:00
James Chen c533e3f529 Merge pull request #6128 from lmskater/monitor-queue-build 
[Jenkins][ci skip]: Monitor jenkins queue build
 2014-04-03 12:49:52 +08:00
andyque 8b9af0e94c issue #4636. finish UIPageViewTest 2014-04-03 11:52:35 +08:00
lm 06ba28597c [Jenkins][ci skip]: Fix call method 2014-04-03 11:42:34 +08:00
andyque 48429f5738 issue #4636. finish UILoadingBar 2014-04-03 11:34:06 +08:00
lm 7f1d694f03 [Jenkins][ci skip]: Monitor jenkins queue build 2014-04-03 11:24:44 +08:00
andyque 278e2c3e3b issue #4636. finish UIListViewTest 2014-04-03 11:23:12 +08:00
samuele3hu bff1d6c2a6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-03 11:15:59 +08:00
andyque fe33588038 issue #4636. finish UILayout 2014-04-03 11:14:35 +08:00
samuele3hu b9ff51782f Synchronize LabelTest of cpp to lua to fix some bug and add more tests 2014-04-03 11:08:59 +08:00
andyque 1a97ebdcb0 issue #4636. finish UIImageView 2014-04-03 10:42:30 +08:00
yinkaile eda2d0927c Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2014-04-03 10:37:13 +08:00
andyque 52bdb840ee issue #4636. finish UICheckBox 2014-04-03 10:34:20 +08:00
yinkaile 7177866331 fixed set blend func 2014-04-03 10:34:20 +08:00