James Chen
cd35bc17e8
Update CHANGELOG [ci skip]
2014-02-27 21:53:31 +08:00
James Chen
4277509966
Merge pull request #5463 from andyque/refactor3877
...
closed #3877 . make fadeIn and fadeOut behaviours correct
2014-02-27 21:49:38 +08:00
heliclei
5531cae2ec
Merge remote-tracking branch 'upstream/develop' into console-upload-file
2014-02-27 21:35:53 +08:00
James Chen
ab9f030b11
Merge pull request #5487 from dumganhar/develop
...
Adds 'override' keyword for override functions (onEnter, onExit) in cpp-tests.
2014-02-27 21:21:10 +08:00
James Chen
a96f44f31d
Adds override for override functions (onEnter, onExit) in cpp-tests.
2014-02-27 21:10:03 +08:00
andyque
32d3bf03bd
fixed #3877 . make fadeIn and fadeOut behaviours correct
2014-02-27 21:00:25 +08:00
minggo
2d0032c825
Merge pull request #5479 from boyu0/iss4118_physical_performance_improve
...
issue #4118 : improve physical performance.
2014-02-27 20:51:41 +08:00
boyu0
5ff60485a4
issue #4118 : set body update after physics step.
2014-02-27 20:23:23 +08:00
boyu0
8c536589df
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss4118_physical_performance_improve
2014-02-27 20:04:04 +08:00
James Chen
e117687a92
Merge pull request #5485 from dumganhar/develop
...
Fix travis build fails.
2014-02-27 16:24:21 +08:00
James Chen
7e9a120e25
Fix travis build fails.
2014-02-27 16:23:38 +08:00
minggo
c3bcfffc08
Merge pull request #5480 from natural-law/develop
...
Remove the music & effects controlling in AppDelegate.cpp of TestCpp
2014-02-27 15:32:04 +08:00
minggo
94c7043976
Merge pull request #5484 from minggo/remove-unneeded-files
...
remove unneeded tools
2014-02-27 15:30:25 +08:00
zhangbin
03ea69d074
Merge branch 'develop' of https://github.com/natural-law/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-02-27 15:29:31 +08:00
minggo
8eea655ae3
remove unneeded tools
2014-02-27 15:29:12 +08:00
minggo
2438842de6
Merge pull request #5483 from minggo/node-optimize
...
return immediately when no changing
2014-02-27 15:15:35 +08:00
minggo
8d47d5f16a
return immediately when no changing
2014-02-27 15:12:57 +08:00
boyu0
b63641c7a5
issue #4118 : delete physicsSetPosition/Rotation method and add physics position/rotation tag.
2014-02-27 14:36:09 +08:00
boyu0
f400c1ac68
issue #4118 : edit contact test and fix node setPhysicsBody bug
2014-02-27 13:35:37 +08:00
James Chen
f6ae27a136
Merge pull request #5481 from CocosRobot/update_cocosfiles_1393468152
...
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-27 11:46:57 +08:00
andyque
d4b9544365
fixed #3868 . when the singleton destoryed, the cocos thread may later than that which will cause the s_responseQueue to be nil.
2014-02-27 11:25:44 +08:00
CocosRobot
4ff894e9e0
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
2014-02-27 02:29:12 +00:00
James Chen
dc6eca19c0
Merge pull request #5476 from dumganhar/iss4116-split
...
closed #4116 : Remove script-bindings codes, move it to 'cocos2d/cocos2d-js' and 'cocos2d/cocos2d-lua' repo.
2014-02-27 10:27:48 +08:00
zhangbin
8afd23a001
closed #3727 , In project "TestCpp", not pause/resume background music & effects when it's going to background/foreground.
2014-02-27 10:18:49 +08:00
James Chen
c994b4ac72
Update CHANGELOG [ci skip]
2014-02-27 10:09:56 +08:00
James Chen
f7d0b463af
Merge pull request #5472 from dabingnn/develop_glTextureLinuxAndroid
...
closed #3874 : expand textureID bit to 32bits
2014-02-27 09:57:29 +08:00
boyu0
75ec508f0a
issue #4118 : improve performance. add Node and Sprite physicsSetPosition and physicsSetRotation method.
2014-02-27 09:45:35 +08:00
Huabing.Xu
cd7b075900
closed #3874 : fix bug, blendID should be shifted by 50 bits
2014-02-27 09:27:33 +08:00
heliclei
186259b0b1
fix andriod compile error
2014-02-27 00:25:37 +08:00
heliclei
49b971867b
fix win32 compile error
2014-02-27 00:13:17 +08:00
heliclei
fe574616f3
fix console loop
2014-02-26 23:51:45 +08:00
heliclei
31a13a6262
remove unused function
2014-02-26 23:46:07 +08:00
heliclei
9d6be63171
CCConsole:support file upload via telnet console
2014-02-26 23:41:47 +08:00
James Chen
801e981286
issue #4116 : Updates iOS / Mac projects.
2014-02-26 22:27:38 +08:00
James Chen
e49b7572e3
issue #4116 : Updates jenkins scripts.
2014-02-26 21:47:23 +08:00
James Chen
e4837e7f94
issue #4116 : Removes script-bindings codes.
2014-02-26 21:34:06 +08:00
James Chen
c2acfea633
issue #4116 : Delete non-scripting files.
2014-02-26 21:17:17 +08:00
boyu0
4df1e104f3
issue #4118 : improve performance.
2014-02-26 19:56:52 +08:00
minggo
30a29070fd
Merge pull request #5475 from minggo/release-note
...
use correct format for table
2014-02-26 17:11:11 +08:00
minggo
924abda956
use correct format for table
2014-02-26 17:10:16 +08:00
minggo
db333232fa
Merge pull request #5474 from minggo/release-note
...
update tabel of content
2014-02-26 17:07:58 +08:00
minggo
e3f3f0302f
update tabel of content
2014-02-26 17:07:06 +08:00
minggo
31ca646b7e
Merge pull request #5473 from minggo/release-note
...
update releate note
2014-02-26 16:49:27 +08:00
minggo
31189c8bdd
update releate note
2014-02-26 16:41:47 +08:00
Huabing.Xu
c7315a2e3e
closed #3874 : expand textureID bit to 32bits
2014-02-26 15:01:45 +08:00
James Chen
c86aeda15e
Update CHANGELOG [ci skip]
2014-02-26 11:59:08 +08:00
James Chen
ffb815d5e6
Merge pull request #5466 from andyque/bug3868
...
closed #3868 . when singleton deleted, it should not dispatch callbacks. This PR resolves: Possible crash on repeat running between HttpClientTest, WebSocketTest, SocketIOTest.
2014-02-26 11:56:33 +08:00
James Chen
d5a58bcb15
Merge pull request #5470 from CocosRobot/updategeneratedsubmodule_1393386827
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-26 11:54:52 +08:00
CocosRobot
01e37a0000
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-26 03:53:49 +00:00
zhangbin
24ba47a43a
closed #3991 , Add method to reload cached texture & update the nodes used the texture.
2014-02-26 11:44:54 +08:00