James Chen
|
7e526f1976
|
Merge pull request #5918 from boyu0/iss4498_refactor_PhysicsDebugDraw
closed #4498: Refactor PhysicsDebugDraw.
|
2014-03-21 16:50:42 +08:00 |
boyu0
|
41f9760f15
|
closed #4498: Refactor PhysicsDebugDraw.
|
2014-03-21 15:49:18 +08:00 |
boyu0
|
9ba9687fc1
|
closed #4424: change name _enable->_enabled, _rotationEnable->_rotationEnabled, _gravityEnable->_gravityEnabled
|
2014-03-20 10:21:59 +08:00 |
boyu0
|
c4aaaf9231
|
closed #4424: fix PhysicsBody::setGravity() doesn't work correctly sometimes.
|
2014-03-18 16:17:43 +08:00 |
boyu0
|
b0b1645190
|
fix some physics bugs.
|
2014-03-13 20:56:51 +08:00 |
boyu0
|
23f42da548
|
closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.
|
2014-03-11 05:09:08 +08:00 |
boyu0
|
d5031f950a
|
closed #4324: fix PhysicsContact::generateContactData() memory leak.
|
2014-03-10 14:51:26 +08:00 |
boyu0
|
b926e4efad
|
closed #4150: fix physics position/rotation tag bug.
|
2014-03-06 17:04:54 +08:00 |
boyu0
|
fdcbfa2eca
|
closed #4150: add const to getPosition/RotationOffset method.
|
2014-03-03 14:35:44 +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 |
boyu0
|
5ff60485a4
|
issue #4118: set body update after physics step.
|
2014-02-27 20:23:23 +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
|
75ec508f0a
|
issue #4118: improve performance. add Node and Sprite physicsSetPosition and physicsSetRotation method.
|
2014-02-27 09:45:35 +08:00 |
boyu0
|
4df1e104f3
|
issue #4118: improve performance.
|
2014-02-26 19:56:52 +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 |
boyu0
|
912dad7a71
|
closed #4144: fix bug: Node::setPhysicsBody doesn't work at the second time.
|
2014-02-26 10:53:41 +08:00 |
boyu0
|
338aa73840
|
issue #4118: change PhysicsBody::updateDamping() to protected.
|
2014-02-25 16:08:16 +08:00 |
boyu0
|
55c679a893
|
issue #4118: rename set/getElasticity to set/getRestitution
|
2014-02-25 15:58:19 +08:00 |
boyu0
|
d139c752fb
|
issue #4118: add _isDamping to PhysicsBody and fix bugs
|
2014-02-25 15:27:25 +08:00 |
boyu0
|
7a28f93fbf
|
issue #4118: fix bit mask bug
|
2014-02-25 10:24:20 +08:00 |
boyu0
|
46abf08a1d
|
issue #4118: add PhysicsBody::setResting()
|
2014-02-24 16:29:14 +08:00 |
boyu0
|
a4cc0edb4a
|
issue #4118: refactor physics update
|
2014-02-24 16:17:42 +08:00 |
James Chen
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +08:00 |
boyu0
|
ea6edd5417
|
closed #3988: fix bug Node::setRotation() moves opposite when node has a physics body.
|
2014-02-11 17:10:27 +08:00 |
boyu0
|
1917ffe8b9
|
issue #3716: refactor physics contact
|
2014-01-28 14:59:34 +08:00 |
boyu0
|
9cf659bb0a
|
Merge branch 'physics_event' of https://github.com/edwardzhou/cocos2d-x into iss3716_refactor_physicscontact
Conflicts:
cocos/physics/CCPhysicsContact.h
|
2014-01-28 14:35:29 +08:00 |
James Chen
|
a4a010465c
|
Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071
|
2014-01-26 16:41:35 +08:00 |
boyu0
|
682a6819cb
|
issue #3401: change getContactData function return value back to pointer.
|
2014-01-26 12:02:42 +08:00 |
Ricardo Quesada
|
d0dbf34319
|
removes "include "cocos2d.h" from cocos2d files
|
2014-01-16 21:35:58 -08:00 |
edwardzhou
|
3f62a87ef7
|
remove the workaround cast
|
2014-01-15 09:46:41 +08:00 |
edwardzhou
|
a71367a7de
|
fix compile error
|
2014-01-14 19:37:07 +08:00 |
edwardzhou
|
b9a7031f92
|
refactor PhysicsContact inherits from EventCustom; simplify emitting collision events
|
2014-01-14 19:21:09 +08:00 |
boyu0
|
de30a9cfea
|
issue #3401: add lua physics slide test, add more banding code, and fix some bugs.
|
2014-01-14 15:48:44 +08:00 |
James Chen
|
f5ae2bbacc
|
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
|
2014-01-06 23:48:47 -08:00 |
James Chen
|
2eb8691f6a
|
Merge pull request #4946 from dumganhar/linux-template-fix
Linux template update
|
2014-01-06 20:57:28 -08:00 |
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47:11 +08:00 |
James Chen
|
c965131a08
|
Uses relative path for kazmath/CMakeLists.txt and physics/CMakeLists.txt.
|
2014-01-06 19:33:28 -08:00 |
boyu0
|
cf146b32cf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
|
2014-01-07 10:16:44 +08:00 |
boyu0
|
eaa3041a97
|
issue #3401: physical lua banding script, add testlua->physics test
|
2014-01-06 22:19:40 +08:00 |
James Chen
|
46153d8c34
|
More warning fixes.
|
2014-01-04 09:17:37 +08:00 |
boyu0
|
0a06d93328
|
issue #3401: physical lua banding script and auto script
|
2014-01-02 11:45:11 +08:00 |
walzer
|
c5e95618d9
|
fixed #3517, make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment
|
2013-12-26 23:55:05 +08:00 |
boyu0
|
69f1834e61
|
issue #2771: fix warning log and fix typo.
|
2013-12-23 14:30:43 +08:00 |
James Chen
|
5852c66e5a
|
closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms.
|
2013-12-20 19:47:11 +08:00 |
minggo
|
53092b359b
|
Merge pull request #4486 from boyu0/iss2771_physical
[ci skip]issue #2771: physical
|
2013-12-15 18:30:48 -08:00 |
boyu0
|
2dbb2d496f
|
issue #2771: add and change some physics API, and add more documents
|
2013-12-13 17:36:58 +08:00 |
boyu0
|
4befb50307
|
issue #2771: add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
|
2013-12-13 16:26:26 +08:00 |
minggo
|
16efe94946
|
fix compiling error after fixing conflicts
|
2013-12-12 14:48:27 +08:00 |
James Chen
|
c2bccbaf98
|
issue #2790: Removes unneeded dynamic_cast in CCPhyicsWorld.cpp.
|
2013-12-11 22:09:59 +08:00 |
James Chen
|
45dabe305f
|
issue #2790: performance improved for PhysicsWorld.
|
2013-12-11 18:08:07 +08:00 |
James Chen
|
cc567a3077
|
issue #2790: Vector::remove —> Vector::erase.
|
2013-12-11 18:08:06 +08:00 |
boyu0
|
083a0eea2a
|
Remove all std::move in function returns.
|
2013-12-10 16:06:05 +08:00 |
James Chen
|
a2e90f1fca
|
issue #2790: Small fixes for physics, uses reference and std::move.
|
2013-12-09 10:54:22 +08:00 |
James Chen
|
16cd61f024
|
issue #2790: Vector<T> for physics and remove lots of unneeded dynamic_cast.
|
2013-12-07 14:28:14 +08:00 |
James Chen
|
165cdf7fe6
|
issue #2790: Deprecates CCArray.
|
2013-12-07 10:48:02 +08:00 |
minggo
|
fa7c97171b
|
fix some warnings
|
2013-12-06 16:32:06 +08:00 |
minggo
|
f02d15d71f
|
initialize static member variable in cpp
|
2013-12-06 11:46:13 +08:00 |
minggo
|
b67d567a79
|
replace long with int or ssize_t
|
2013-12-05 17:22:22 +08:00 |
boyu0
|
98779b0a9f
|
issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h
|
2013-12-04 14:36:32 +08:00 |
boyu0
|
63a4e09c90
|
issue #2771: add more joint tests, add some joint api, fix bugs
|
2013-12-03 12:47:03 +08:00 |
boyu0
|
dba58f6a9b
|
issue #2771: add more joints
|
2013-12-02 18:29:04 +08:00 |
boyu0
|
4615eae22f
|
issue #2771:remove unneeded include “ccConfig.h”
|
2013-11-27 18:30:48 +08:00 |
boyu0
|
72f2d68edd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-11-27 17:47:37 +08:00 |
boyu0
|
2b43e72e7c
|
issue #2771: fix vs compile errors, change project setting
|
2013-11-27 17:33:33 +08:00 |
boyu0
|
8346fe4b4d
|
issue #2771: edit android.mk, CMakeLists.txt, change PHYSICS_CONTACT_POINT_MAX to PhysicsContactData:POINT_MAX
|
2013-11-26 18:22:52 +08:00 |
boyu0
|
0100c05a93
|
issue #2771: fix compile errors
|
2013-11-26 17:29:09 +08:00 |
boyu0
|
99d904363a
|
issue #2771: delete all the box2d implementation in physics parts.
|
2013-11-26 13:47:42 +08:00 |
boyu0
|
df1fca3279
|
issue #2771: refactor some functions and delete PHYSICS_INFINITY macro.
|
2013-11-26 11:38:55 +08:00 |
boyu0
|
09ba28d522
|
issue #2771: refactor PhysicsWorld and PhysicsWorldInfo
|
2013-11-25 17:57:06 +08:00 |
boyu0
|
f2dabe77ec
|
issue #2771: add some method implements with box2d in PhysicsWorld
|
2013-11-25 10:08:52 +08:00 |
Ricardo Quesada
|
b6ddc6d048
|
Uses std::unordered_map<> instead of std::map<>
and more fixes.
|
2013-11-21 13:43:59 -08:00 |
boyu0
|
8e14cdb8d2
|
issue #2771: add assert to joint
|
2013-11-21 14:39:37 +08:00 |
boyu0
|
1743826498
|
issue #2771: fix a careless mistake
|
2013-11-20 16:08:48 +08:00 |
boyu0
|
bde6f5d9eb
|
issue #2771: fix crash bug
|
2013-11-20 15:54:09 +08:00 |
boyu0
|
c945fbd42c
|
issue #2771: add some warning log
|
2013-11-20 10:25:43 +08:00 |
boyu0
|
aec514e3a2
|
issue #2771: fix collision bug cause by dynamic/static cast.
|
2013-11-19 18:30:12 +08:00 |
boyu0
|
68b98fc84f
|
issue #2771: change PhysicsContact::create to construct
|
2013-11-18 21:06:05 +08:00 |
boyu0
|
23c477f15d
|
issue #2771: rename resetForce to resetForces
|
2013-11-18 16:27:23 +08:00 |
boyu0
|
a7d884a63f
|
issue #2771: change debug draw defines to class static const variable
|
2013-11-18 10:10:37 +08:00 |
boyu0
|
8ab64c9fa8
|
issue #2771: fix some api name and code style
|
2013-11-18 03:10:13 +08:00 |
boyu0
|
0710cfa526
|
issue #2771: delete PhysicsSlidingJoint and PhysicsSpringJoint. add joint tests, fix bugs
|
2013-11-18 02:16:20 +08:00 |
boyu0
|
02e5d44955
|
Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into iss2771_physical
|
2013-11-15 16:54:02 +08:00 |
boyu0
|
988630c12f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-11-15 16:38:58 +08:00 |
boyu0
|
0cb45e50f1
|
issue #2771: fix bugs
|
2013-11-15 16:27:43 +08:00 |
boyu0
|
fb04c9e574
|
issue #2770: fix some warning
|
2013-11-13 11:22:34 +08:00 |
boyu0
|
0aa140a6e5
|
issue #2771: add comments
|
2013-11-12 18:13:44 +08:00 |
boyu0
|
9eac5c4a41
|
issue #2771: add comment and improve API
|
2013-11-12 15:28:07 +08:00 |
Ricardo Quesada
|
d6446e9b14
|
calls `delete[]` instead of `delete`
calls `delete[]` instead of `delete`
|
2013-11-11 16:07:46 -08:00 |
boyu0
|
a54603390e
|
issue #2771: change pointQuery implements
|
2013-11-11 16:23:42 +08:00 |
boyu0
|
b3f44a0805
|
issue #2771: edit assert message
|
2013-11-11 15:31:20 +08:00 |
boyu0
|
13efb7e822
|
issue #2771: add pointQuery
|
2013-11-11 15:03:17 +08:00 |
boyu0
|
4efacdbcf3
|
issue #2771: rename PhysicsWorld::create() to PhysicsWorld::construct(), fix some bugs
|
2013-11-08 16:17:56 +08:00 |
boyu0
|
a56dedb41a
|
issue #2771: add class PhysicsDebugDraw
|
2013-11-08 14:25:03 +08:00 |
boyu0
|
e278ad66c8
|
issue #2771: change PhysicsJoint::create() to PhysicsJoint::construct()
|
2013-11-07 17:46:05 +08:00 |
boyu0
|
7363be0697
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-11-07 17:37:33 +08:00 |
boyu0
|
ef5440f738
|
issue #2771: change rayCast and rectQuery callback class to std::function
|
2013-11-07 16:23:50 +08:00 |
boyu0
|
eb508e4728
|
issue #2771: fix PhysicsWorld functions name readadd/removexxx -> doadd/removexxx delayTestAdd/Removexxx -> add/removexxxOrDelay
|
2013-11-07 15:12:13 +08:00 |
boyu0
|
a02fd7c6da
|
issue #2771: fix PhysicsWorld some bugs
|
2013-11-07 14:40:09 +08:00 |