Nite Luo
|
a3725c2394
|
Merge branch 'develop' into newRenderer
|
2013-11-19 11:08:26 -08:00 |
Nite Luo
|
7ad64ece36
|
Add Transform to DrawNode
|
2013-11-19 11:06:26 -08:00 |
CocosRobot
|
d8ec58831a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-19 09:40:27 +00:00 |
Dhilan007
|
dc42645afe
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
|
2013-11-19 16:49:28 +08:00 |
Dhilan007
|
3929e6070d
|
fix error form overrides a 'final' function
|
2013-11-19 16:27:09 +08:00 |
Dhilan007
|
c307d83b35
|
add miss Deprecated api
|
2013-11-19 16:06:27 +08:00 |
Dhilan007
|
1a65af9d1a
|
fix warn
|
2013-11-19 15:54:54 +08:00 |
Dhilan007
|
f0ab3f9ca1
|
fix some error in layer controller code
|
2013-11-19 15:41:22 +08:00 |
Dhilan007
|
0586c4d275
|
recover controller on layer.
|
2013-11-19 13:56:30 +08:00 |
minggo
|
594450e3f7
|
Merge pull request #4330 from CocosRobot/updategeneratedsubmodule_1384833055
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-18 19:52:09 -08:00 |
CocosRobot
|
0855ff0841
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-19 03:50:57 +00:00 |
minggo
|
2848e0dc3e
|
Merge pull request #4328 from 2youyouo2/develop
[ci skip]update armature
|
2013-11-18 19:46:29 -08:00 |
2youyou2
|
d5478f1ca2
|
fix if last frame has tween effect, armature may display wrong
|
2013-11-19 11:44:17 +08:00 |
minggo
|
bd00e6fabb
|
Merge pull request #4326 from dabingnn/develop_hotFix
[ci skip]Develop hot fix
|
2013-11-18 19:33:07 -08:00 |
Huabing.Xu
|
1fc928df41
|
HotFix: use static cast for format conversion
|
2013-11-19 11:32:12 +08:00 |
yinkaile
|
f308f2f95a
|
fix CCArmature display wrong on mac version
|
2013-11-19 11:22:40 +08:00 |
Huabing.Xu
|
49f34c5339
|
HotFix: fix CCB particle alpha blend-> setBlendAddictive after set texture
|
2013-11-19 11:19:12 +08:00 |
Huabing.Xu
|
fff851a8aa
|
HotFix: change tab to space
|
2013-11-19 11:17:02 +08:00 |
Huabing.Xu
|
458b9b53da
|
HotFix: fix CCB particle alpha blend
|
2013-11-19 11:16:14 +08:00 |
minggo
|
1e8a3fc92f
|
Merge pull request #4322 from dabingnn/develop_hotFix
[ci skip]HotFix: fix bug spine alpha blend error
|
2013-11-18 18:54:16 -08:00 |
minggo
|
fb2c2ec7f2
|
Merge pull request #4323 from Dhilan007/jssubmodule
[ci skip]fix miss bind setGrid\getGrid for JS.
|
2013-11-18 18:53:51 -08:00 |
minggo
|
8e7cce8cea
|
Merge pull request #4324 from CocosRobot/updategeneratedsubmodule_1384828843
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-18 18:53:06 -08:00 |
Huabing.Xu
|
69b38f6e40
|
HotFix: change tab to space
|
2013-11-19 10:42:37 +08:00 |
CocosRobot
|
186b6fd98b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-19 02:40:44 +00:00 |
minggo
|
78f2e0982e
|
Merge pull request #4319 from liamcindy/develop
[ci skip]fixed ui anmation crash when stop animation for develop branch
|
2013-11-18 18:34:16 -08:00 |
Dhilan007
|
ce0a6d5b57
|
fix miss bind setGrid\getGrid for JS.
|
2013-11-19 10:33:11 +08:00 |
Huabing.Xu
|
d9681150fc
|
HotFix: fix bug spine alpha blend error
|
2013-11-19 10:15:12 +08:00 |
Nite Luo
|
abb011f0ef
|
Test clipping node with alpha
|
2013-11-18 15:52:47 -08:00 |
Nite Luo
|
c288e5ef9c
|
Fix Clipping Node
|
2013-11-18 14:58:41 -08:00 |
Nite Luo
|
e5ebcb2845
|
Merge branch 'develop' into newRenderer
|
2013-11-18 10:22:16 -08:00 |
Liam
|
c7932b6181
|
fixed ui anmation crash when stop animation
|
2013-11-19 00:57:22 +08:00 |
James Chen
|
91a57c614d
|
closed #3224: The subthread of CCHttpClient interrupts main thread if timeout signal comes.
|
2013-11-19 00:19:57 +08:00 |
minggo
|
1ed8cfee7c
|
Merge pull request #4297 from liamcindy/develop
[ci skip]Shielded unusefull log for develop branch
|
2013-11-18 07:10:40 -08:00 |
minggo
|
27f35ac3e3
|
Merge pull request #4312 from samuele3hu/developTableView
[ci skip]Hot fix:Repair some lua test samples and modify layer touch listener functions
|
2013-11-18 07:09:57 -08:00 |
minggo
|
0e2ea2971d
|
Merge pull request #4313 from minggo/develop
[ci skip]fix compiling error of js template
|
2013-11-18 06:33:23 -08:00 |
minggo
|
2028cde015
|
fix compiling error of js template
|
2013-11-18 22:32:13 +08:00 |
minggo
|
62bd6453fc
|
Merge pull request #4310 from boyu0/iss2771_physical
[ci skip]issue #2771 physical fix crashes
|
2013-11-18 06:19:49 -08:00 |
samuele3
|
6c88dd34c0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
|
2013-11-18 22:17:47 +08:00 |
samuele3
|
a2e9920288
|
Hot fix:Repair some lua test samples and modify layer touch listener functions
|
2013-11-18 22:16:49 +08:00 |
minggo
|
fc56d9234e
|
Merge pull request #4309 from dabingnn/develop_hotFix
[ci skip]HotFix: fix bug callback retain release error
|
2013-11-18 05:14:41 -08:00 |
Huabing.Xu
|
699dd9518b
|
HotFix: fix bug callback retain release error
|
2013-11-18 21:12:47 +08:00 |
boyu0
|
68b98fc84f
|
issue #2771: change PhysicsContact::create to construct
|
2013-11-18 21:06:05 +08:00 |
CocosRobot
|
853a895c69
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-18 10:57:00 +00:00 |
James Chen
|
060e8413dd
|
Merge pull request #4307 from CocosRobot/updategeneratedsubmodule_1384771216
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-18 02:51:11 -08:00 |
CocosRobot
|
7afb8877c5
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-11-18 10:40:18 +00:00 |
minggo
|
593c0f8946
|
Merge pull request #4304 from Dhilan007/di3223
[ci skip]issue #3223:bind gui and studio
|
2013-11-18 02:28:53 -08:00 |
Dhilan007
|
8b14575d7e
|
bind gui and studio.
|
2013-11-18 16:54:52 +08:00 |
minggo
|
da2158de20
|
Merge pull request #4303 from boyu0/iss2771_physical
[ci skip]issue #2771: physics. rename resetForce to resetForces
|
2013-11-18 00:32:06 -08:00 |
boyu0
|
23c477f15d
|
issue #2771: rename resetForce to resetForces
|
2013-11-18 16:27:23 +08:00 |
minggo
|
c7971bcaad
|
Merge pull request #4300 from minggo/textinput-crash
[ci skip]fix crash of textinput test case
|
2013-11-18 00:23:51 -08:00 |