samuele3hu
550f4dca29
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
2014-04-03 17:03:09 +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
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
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
eda2d0927c
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2014-04-03 10:37:13 +08:00
yinkaile
7177866331
fixed set blend func
2014-04-03 10:34:20 +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
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
CocosRobot
9799fbdf27
[AUTO]: updating luabinding automatically
2014-04-02 10:42:38 +00: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
c8e6f8d3ff
Merge pull request #6106 from pandamicro/AnimLoopFix
...
Fixed #4637 : Add loop parameter to Animation::initWithSpriteFrames
2014-04-02 18:08:03 +08:00
pandamicro
e5bf6c438f
Fixed #4638 : Add loop parameter to Animation::createWithSpriteFrames
2014-04-02 18:06:17 +08:00
CocosRobot
59db1f300d
[AUTO]: updating luabinding automatically
2014-04-02 09:58:03 +00:00
James Chen
4edf923cf8
Merge pull request #6108 from Dhilan007/develop_label
...
Label: Better API order for Label class
2014-04-02 17:47:44 +08:00
James Chen
7f702b3fe4
Merge pull request #6107 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background
...
closed #3509 : Skip one frame when _deltaTime equal to zero.
2014-04-02 16:52:43 +08:00
James Chen
1178d67dd6
issue #4639 : Reverts the definition of FileUtils::isFileExist, remove
...
the second parameter(outFullPath).
2014-04-02 16:33:05 +08:00
James Chen
236695fd08
Merge pull request #6104 from dumganhar/iss4635-constrolswitch
...
closed #4635 : ControlSwitch's marksprite is shown at a wrong place
2014-04-02 15:39:33 +08:00
James Chen
5fa839b16b
closed #4639 : FileUtils::isFileExist doesn't consider SearchPaths and ResolutionOrders
2014-04-02 15:35:09 +08:00
Dhilan007
5aafec462f
Label:Fine tune the declaration order of API.
2014-04-02 14:57:00 +08:00
boyu0
31be60fea7
closed #3509 : Skip one frame when _deltaTime equal to zero.
2014-04-02 14:05:07 +08:00
pandamicro
7019b6e1ab
Fixed #4637 : Add predefined value indication in cpp
2014-04-02 12:03:42 +08:00
pandamicro
9376c7817f
Reverse CONSTRUCTOR_ACCESS to protected
2014-04-02 11:57:23 +08:00
pandamicro
05899d5f6a
Fixed #4637 : Add loop parameter to Animation::initWithSpriteFrames function
2014-04-02 11:48:49 +08:00
James Chen
48839b9d4d
closed #4635 : ControlSwitch's marksprite is shown at a wrong place
2014-04-02 11:26:39 +08:00
Ricardo Quesada
b36ab33281
performance fixes in QuadCommand
2014-04-01 16:13:41 -07:00
James Chen
1a5de6cfa7
Merge pull request #6091 from Dhilan007/develop_label
...
Label:fixed possible appear OpenGL error 0x500.
2014-04-01 15:15:01 +08:00
Dhilan007
c63baa388b
remove unused local variable.
2014-04-01 15:10:24 +08:00
James Chen
70dd83512c
Renames s_isIOS7 to s_isIOS7OrHigher
2014-04-01 15:08:08 +08:00
Dhilan007
540c67f701
Label:fixed possible appear OpenGL error 0x500.
2014-04-01 15:03:17 +08:00
James Chen
47320e7c7c
closed #4383 : Fixed missing letters if using old LabelTTF and running on
...
iphone 64bit simulator(device).
2014-04-01 14:47:52 +08:00
minggo
c3334cb4ac
Merge pull request #6089 from Dhilan007/develop_label
...
Fixed logical error in Label::enableShadow
2014-04-01 14:18:48 +08:00
Dhilan007
eadbca8ee7
1.fixed logical error in Label::enableShadow.
...
2.Add test case for shadow and outline take effect at the same time.
2014-04-01 14:15:35 +08:00
minggo
566fa7110d
Merge pull request #6087 from Dhilan007/develop_label
...
fixed shadow and outline can't take effect at the same time
2014-04-01 14:03:42 +08:00
James Chen
0bb71ce678
Merge pull request #6082 from zukkun/fix_cpbodysetangvellimit
...
fixed incorrect function invocation in PhysicsBody::setAngularVelocityLimit
2014-04-01 11:49:38 +08:00
Dhilan007
3a556c24aa
fixed shadow and outline can't take effect at the same time
2014-04-01 11:37:36 +08:00
CocosRobot
55b87dbad0
[AUTO]: updating luabinding automatically
2014-04-01 03:33:06 +00:00
minggo
7fb5e1f13a
Merge pull request #6066 from minggo/quadcommand-optimize
...
use xxhash to generate material id
2014-04-01 11:27:51 +08:00
CocosRobot
ce10ddd84b
[AUTO]: updating luabinding automatically
2014-04-01 02:09:55 +00:00
James Chen
d7ca1999ab
Merge pull request #5998 from bmanGH/feature/fix_STRING_TEXTURE_label_sortAllChildren_crash
...
closed #4626 : Crash if label's type is STRING_TEXTURE and label->sortAllChildren is called.
2014-04-01 10:02:35 +08:00
koowolf
36aeb88a9d
Merge branch 'quadcommand-optimize' of https://github.com/minggo/cocos2d-x into quadcommand-optimize
...
Conflicts:
cocos/2d/cocos2d_wp8.vcxproj
cocos/2d/cocos2d_wp8.vcxproj.filters
2014-04-01 09:39:03 +08:00
zukkun
e41fd1a29b
fixed PhysicsBody::setAngularVelocityLimit incorrect function call
2014-04-01 09:34:42 +09:00
koowolf
ad653c6cf9
use xxhash in win32 and wp8
2014-03-31 18:38:39 +08:00
James Chen
a93470c67d
Merge pull request #6077 from Dhilan007/develop_label
...
Label:fixed possible blink if label contains shadow.
2014-03-31 18:33:55 +08:00
Dhilan007
f485d3b6d5
Label:fixed possible blink if label contains shadow.
2014-03-31 18:16:08 +08:00
koowolf
75ec817ac5
use xxhash in win32 and wp8
2014-03-31 17:15:04 +08:00
CocosRobot
cf59264dfe
[AUTO]: updating luabinding automatically
2014-03-31 08:52:27 +00:00
James Chen
9e64140f8a
Merge pull request #6067 from Dhilan007/develop_label
...
1) fixed logical error in Label::updateFont.
2) fixed the font file searching strategy, used FileUtils::isFileExist to check whether the font file exist rather than find . letter.
2014-03-31 16:11:59 +08:00
Dhilan007
d39a419eeb
fixed logical error in Label::create.
2014-03-31 16:06:20 +08:00