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
James Chen
f97f109fbc
Update CHANGELOG [ci skip]
2014-02-26 11:44:05 +08:00
James Chen
5e315273f9
Merge pull request #5467 from boyu0/bug4144_node_setphysicsbody
...
closed #4144 : fix bug: Can not use Node::setPhysicsBody to reset a physics body.
2014-02-26 11:43:19 +08:00
James Chen
8fa27bf8f3
Merge pull request #5468 from CocosRobot/updategeneratedsubmodule_1393386076
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-26 11:43:00 +08:00
James Chen
67361fc834
Update CHANGELOG [ci skip]
2014-02-26 11:41:20 +08:00
CocosRobot
e6104f9649
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-02-26 03:41:20 +00:00
James Chen
2b2979551e
Merge pull request #5460 from boyu0/iss4118_physical_performance_improve
...
issue #4118 : Physical performance improve.
2014-02-26 11:37:13 +08:00
andyque
e7de92a54f
fixed #3868 . when singleton delted, it should dispatch callbacks.
2014-02-26 10:59:56 +08:00
boyu0
912dad7a71
closed #4144 : fix bug: Node::setPhysicsBody doesn't work at the second time.
2014-02-26 10:53:41 +08:00
James Chen
364a6f8ef6
Update CHANGELOG [ci skip]
2014-02-25 18:32:18 +08:00
James Chen
a0192591fd
Merge pull request #5462 from heliclei/console-simulate-touch
...
closed #4146 : Simulate touch events(tap,swipe) via CCConsole
2014-02-25 18:30:40 +08:00
heliclei
1dc6d1ad21
merge begin & end with one 'tap' command
2014-02-25 18:17:43 +08:00
heliclei
6848e6dde0
use atof instead of stof to fix compile error on android
2014-02-25 16:31:21 +08:00
boyu0
338aa73840
issue #4118 : change PhysicsBody::updateDamping() to protected.
2014-02-25 16:08:16 +08:00
heliclei
7f3aab2bfd
fix touchEnd lambda
2014-02-25 15:59:43 +08:00
boyu0
55c679a893
issue #4118 : rename set/getElasticity to set/getRestitution
2014-02-25 15:58:19 +08:00
heliclei
f1376e7caf
fix help typo
2014-02-25 15:55:01 +08:00
heliclei
a7d636f7bf
support touch swipe directive
2014-02-25 15:52:37 +08:00
boyu0
c727512023
reset project.pbxproj
2014-02-25 15:45:01 +08:00
Wilhansen Li
a1b7beb400
Fix spine::Skeleton not updating on re-entry.
...
Could be done in a tighter manner by scheduling updates in
spine::SkeletonAnimation instead and listening for animation events.
However, this may need a more robust interface on scheduleUpdate and
unscheduleUpdate to work correctly.
2014-02-25 15:36:57 +08:00
James Chen
a6b89f1fcc
Merge pull request #5459 from dumganhar/develop
...
More const reference loves in EventDispatcher.
2014-02-25 15:30:22 +08:00
boyu0
2397aaf24d
issue #4118 : add physics contact test.
2014-02-25 15:28:13 +08:00
boyu0
d139c752fb
issue #4118 : add _isDamping to PhysicsBody and fix bugs
2014-02-25 15:27:25 +08:00