RongHong
|
64016e8a57
|
Merge branch 'master' of http://github.com/cocos2d/cocos2d-x
|
2011-07-08 16:33:38 +08:00 |
minggo
|
4e5306a46b
|
fixed #596
|
2011-07-08 16:27:13 +08:00 |
Walzer
|
dead4cd717
|
fixed #593 CocosDenshion
|
2011-07-08 16:08:54 +08:00 |
natural-law
|
cba538d5d0
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-08 15:58:14 +08:00 |
natural-law
|
602c5f1894
|
fixed #595
|
2011-07-08 15:57:46 +08:00 |
RongHong
|
de7150214c
|
Merge branch 'master' of http://github.com/cocos2d/cocos2d-x
|
2011-07-08 15:40:27 +08:00 |
RongHong
|
7b74372cac
|
fix #592
|
2011-07-08 15:38:32 +08:00 |
minggo
|
39a3b715cd
|
fixed #589
|
2011-07-08 15:28:13 +08:00 |
natural-law
|
810cf3f8c3
|
fixed #591
|
2011-07-08 15:02:46 +08:00 |
minggo
|
f0ea58651b
|
fixed #586
|
2011-07-08 15:01:51 +08:00 |
Walzer
|
5c8b04bc25
|
fixed #585
|
2011-07-08 14:48:25 +08:00 |
natural-law
|
134a3a0fcf
|
fixed #590
|
2011-07-08 14:32:09 +08:00 |
Walzer
|
08b26402d5
|
fixed #594, but find a new bug #597
|
2011-07-08 14:27:37 +08:00 |
natural-law
|
db6a5fce23
|
fixed #588.
|
2011-07-08 14:16:10 +08:00 |
natural-law
|
5db1719302
|
fixed #587
|
2011-07-08 14:15:51 +08:00 |
minggo
|
f9cfaa1a5d
|
Merge pull request #366 from natural-law/master
fixed #574
|
2011-07-07 20:28:05 -07:00 |
natural-law
|
0cb3b0ce06
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-08 11:23:03 +08:00 |
natural-law
|
ca4281904a
|
fixed #574, Add bugs test case.
|
2011-07-08 11:22:35 +08:00 |
Walzer
|
b91f046157
|
Merge pull request #365 from axmx/master
[airplay] incorrect calculation of the bit depth
|
2011-07-07 18:50:44 -07:00 |
Max Aksenov
|
90564fac49
|
[airplay] fix : incorrect calculation of the bit depth
|
2011-07-07 08:40:29 -07:00 |
minggo
|
b0416adaf2
|
Merge pull request #364 from minggo/master
upgrade to rc3
|
2011-07-07 01:06:27 -07:00 |
minggo
|
96289b20c4
|
upgrade to rc3
|
2011-07-07 16:03:03 +08:00 |
minggo
|
ae466898b0
|
Merge pull request #363 from minggo/master
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
|
2011-07-07 00:49:31 -07:00 |
minggo
|
b08788d810
|
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
|
2011-07-07 15:41:42 +08:00 |
minggo
|
df7642902a
|
Merge pull request #362 from minggo/master
fixed #569: change the free sequence to avoid bug
|
2011-07-07 00:23:46 -07:00 |
minggo
|
8ca8f4d9bc
|
fixed #569: change the free sequence to avoid bug
|
2011-07-07 15:20:13 +08:00 |
natural-law
|
26513d6b7e
|
issue #574, Add DirectorTest for win32.
|
2011-07-07 14:55:11 +08:00 |
Walzer
|
94ac50bad0
|
fixed #582, use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution.
|
2011-07-07 14:45:59 +08:00 |
minggo
|
b84d0e62e5
|
Merge pull request #360 from minggo/master
fix some compiling warnings
|
2011-07-06 20:31:15 -07:00 |
minggo
|
8e370eeb10
|
fix some compiling warnings
|
2011-07-07 11:27:45 +08:00 |
minggo
|
a0e10ec8c4
|
Merge pull request #358 from natural-law/master
Resolve the bug of some particle test cases can't be shown.
|
2011-07-06 20:04:42 -07:00 |
minggo
|
7e5c8eb311
|
Merge pull request #359 from minggo/master
add animation to a test case of SpriteTest
|
2011-07-06 20:04:25 -07:00 |
natural-law
|
2bc8427b3c
|
Resolve the bug of some particle test cases can't be shown.
|
2011-07-07 11:02:47 +08:00 |
minggo
|
211878dc44
|
add animation
|
2011-07-07 10:24:01 +08:00 |
Walzer
|
348a05a329
|
fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference
|
2011-07-07 08:23:31 +08:00 |
Walzer
|
72dfb3f919
|
fixed #576, replace std::string to _KeyT in CCMutableDictionary class template
|
2011-07-07 08:19:29 +08:00 |
minggo
|
e804b864b5
|
Merge pull request #357 from minggo/master
fixed #579: change zorder to int
|
2011-07-06 05:52:38 -07:00 |
minggo
|
3dc1967f6c
|
fixed #579: change zorder to int
|
2011-07-06 20:48:56 +08:00 |
minggo
|
5fa7577a19
|
Merge pull request #356 from minggo/master
fixe #580
|
2011-07-06 05:00:37 -07:00 |
minggo
|
e56547b9f5
|
fixed #580: use int or it will loop for ever
|
2011-07-06 19:54:25 +08:00 |
minggo
|
4f419f3a61
|
Merge pull request #355 from minggo/master
Fix some bugs when upgrading to rc3
|
2011-07-06 03:22:21 -07:00 |
minggo
|
6cb945a8ca
|
fix bug of particle_node when upgrade to rc3
|
2011-07-06 18:16:19 +08:00 |
minggo
|
f894e00f27
|
fix a bug of CCProgressTimer when upgrade to rc3
|
2011-07-06 16:29:56 +08:00 |
minggo
|
6129e33794
|
Merge pull request #354 from minggo/iss577
[android] fixed #577: init member variable to default value
|
2011-07-06 00:25:38 -07:00 |
minggo
|
980ce79ead
|
[android] fixed #577: init member variable to default value
|
2011-07-06 15:22:25 +08:00 |
minggo
|
59ed71df03
|
Merge pull request #353 from minggo/master
upgrade to 1.0.0-rc3
|
2011-07-06 00:02:45 -07:00 |
minggo
|
ff50997eb0
|
issue #574
|
2011-07-06 14:56:05 +08:00 |
Walzer
|
ac700583cc
|
fixed #573, init m_tColor & m_tBlendFunc in CCLayerColor constructor
|
2011-07-05 15:39:50 +08:00 |
minggo
|
7603665165
|
fix merging confict of CCDirector.cpp
|
2011-07-05 14:54:41 +08:00 |
minggo
|
7adb140439
|
fixed #568
|
2011-07-05 14:51:17 +08:00 |