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 |
andyque
|
0875b4e51f
|
closed #4636. Done
|
2014-04-03 15:56:45 +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 |
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 |
andyque
|
10134ccc65
|
issue #4636. finish button
|
2014-04-03 10:31:10 +08:00 |
minggo
|
f998ea058a
|
[ci skip]
|
2014-04-03 10:26:34 +08:00 |
minggo
|
b4225e4626
|
Merge pull request #6124 from koowolf/mid_resume
fix resume not support in midi file in win32
|
2014-04-03 10:22:44 +08:00 |
andyque
|
0a6b0a4389
|
issue #4636. refactor Scale9Sprite
|
2014-04-03 10:07:47 +08:00 |
andyque
|
b27fe6ecc2
|
issue #4636. add parameter create method to UITextBMFont
|
2014-04-03 10:07:46 +08:00 |
andyque
|
0b5c10a0fb
|
issue #4636. add parameter create method to UITextAtlas
|
2014-04-03 10:07:46 +08:00 |
andyque
|
a03dc76f7d
|
issue #4636, add parameter create method for UILoadingBar
|
2014-04-03 10:07:46 +08:00 |
andyque
|
92945715eb
|
issue #4636. add parameter create function for UIText
|
2014-04-03 10:07:46 +08:00 |
andyque
|
558abf1a6b
|
issue #4636, add parameter create method to UIImageView
|
2014-04-03 10:07:46 +08:00 |
andyque
|
18c072beff
|
issue #4636, replace const char* to const std::string& in UIButton
|
2014-04-03 10:07:46 +08:00 |
andyque
|
ba9a605568
|
issue #4636, add parameter create method to UICheckBox
|
2014-04-03 10:07:46 +08:00 |
andyque
|
1b0583214b
|
issue #4636, add parameter create method to UIButton
|
2014-04-03 10:07:46 +08:00 |
koowolf
|
293bd5dc02
|
fix resume not support in midi file in win32
|
2014-04-03 09:55:31 +08:00 |
mgcL
|
4f7cb75d2b
|
fix PhysicsShapeEdgeChain::init() always return false
|
2014-04-02 23:52:21 +08:00 |
James Chen
|
5a1bfaddae
|
Merge pull request #6120 from CocosRobot/update_lua_bindings_1396435283
[AUTO]: updating luabinding automatically
|
2014-04-02 22:10:56 +08:00 |
CocosRobot
|
9799fbdf27
|
[AUTO]: updating luabinding automatically
|
2014-04-02 10:42:38 +00:00 |
James Chen
|
6223b011e8
|
Update CHANGELOG [ci skip]
|
2014-04-02 18:13:41 +08:00 |
James Chen
|
16e51a8489
|
Merge pull request #6110 from dumganhar/iss4639-isfileexist
closed #4639: FileUtils::isFileExist doesn't consider SearchPaths and ResolutionOrders
|
2014-04-02 18:12:29 +08:00 |
James Chen
|
ae0131f917
|
Update CHANGELOG [ci skip]
|
2014-04-02 18:09:13 +08:00 |