Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,675 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

2368 Commits

Author SHA1 Message Date
boyu0 c99b0a0b6a closed #4150: Fix missing "!" 2014-03-03 01:48:56 +08:00
boyu0 5244cb93ed closed #4150: Delete PhysicsBodyInfo::set/getPosition/Rotation method. 2014-02-28 15:50:38 +08:00
boyu0 015180bf62 issue #4150: Add physics position/rotation test 2014-02-28 15:47:49 +08:00
boyu0 a934d29c57 issue #4150: Correct body position with the node has a parent. Add set/getPosition/Rotation method. 2014-02-28 15:31:25 +08:00
James Chen a96f44f31d Adds override for override functions (onEnter, onExit) in cpp-tests. 2014-02-27 21:10:03 +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
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 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
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
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
Huabing.Xu c7315a2e3e closed #3874: expand textureID bit to 32bits 2014-02-26 15:01:45 +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
CocosRobot 01e37a0000 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-26 03:53:49 +00: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
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 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
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 d139c752fb issue #4118: add _isDamping to PhysicsBody and fix bugs 2014-02-25 15:27:25 +08:00
James Chen 51808b59e9 More const reference love in EventDispatcher. 2014-02-25 14:31:24 +08:00
heliclei 08fa208cae Merge remote-tracking branch 'upstream/develop' into console-simulate-touch 2014-02-25 14:04:23 +08:00
James Chen 93aa506e33 Merge pull request #5435 from heliclei/fix-console-windows-crash 
closed #4098: Fix console crash on windows.
 2014-02-25 12:56:11 +08:00
heliclei e09a72f26d add touch swipe 2014-02-25 11:47:53 +08:00
CocosRobot ef18a6edd1 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-25 03:14:40 +00:00
heliclei 514cd031b3 Merge remote-tracking branch 'upstream/develop' into fix-console-windows-crash 2014-02-25 11:09:58 +08:00
heliclei 786aae2199 add touch move support 2014-02-25 11:04:59 +08:00
boyu0 7a28f93fbf issue #4118: fix bit mask bug 2014-02-25 10:24:20 +08:00
andyque f88e4be4ce rollback gui filename change 2014-02-25 10:18:45 +08:00
andyque 8359ddd4d4 fix lua bindings error 2014-02-25 10:18:45 +08:00
andyque f92301a872 fix jsb munaul bindings error 2014-02-25 10:18:45 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
James Chen 64ec1611a5 compilation error fix for win32. 2014-02-25 09:45:10 +08:00
Ricardo Quesada 18c3a8dd02 little fixes for sprite 2014-02-24 15:18:07 -08:00
James Chen 21fe4f234b Merge pull request #5382 from boyu0/iss4039_tilemap_objectgroup_fix 
closed #4039: fix bug: tilemap <object> x, y, width and height value parse incorrect.
 2014-02-24 22:23:05 +08:00
James Chen dfde6938d2 Merge pull request #5452 from dabingnn/develop_CC_SPRITE_DEBUG_DRAW 
closed #3818: fix CC_SPRITE_DEBUG_DRAW feature
 2014-02-24 21:51:24 +08:00
James Chen b5b9c7f938 Merge pull request #5451 from Dhilan007/develop_movePDC 
closed #4123:fixed thread deadlock if new functions are added in callback.
 2014-02-24 21:43:37 +08:00