calfjohn
|
c2cded367c
|
add document for physics
|
2015-03-19 17:58:08 +08:00 |
calfjohn
|
83e69f4532
|
add comments for PhysicsWorld
|
2015-03-18 16:35:38 +08:00 |
Martin Konopka
|
350b81501d
|
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
|
2015-03-12 23:47:58 +01:00 |
loadrunner
|
1a1c1f1ed0
|
added sensor property to shapes
|
2015-03-01 11:03:01 +02:00 |
minggo
|
dd7d8a61ef
|
Merge pull request #8980 from fspadoni/v3
CCPhysicsWorld.cpp Remove cpArbiterIgnore call from collisionPreSolveCallback
|
2015-02-15 18:58:17 +08:00 |
Wenhai Lin
|
f2335fb3bc
|
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
|
2015-01-27 16:13:45 +08:00 |
Vladimir Timofeev
|
4e25ffbc7f
|
Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences.
|
2015-01-21 12:59:53 +03:00 |
WenhaiLin
|
05e25601fc
|
Fixed fail to query the shapes which add to PhysicsWorld in the current frame
|
2015-01-16 14:22:16 +08:00 |
Wenhai Lin
|
b61adcfdbb
|
Fixed can't get correct position of PhysicsBody after add PhysicsBody to PhysicsWorld in the current frame.
|
2015-01-14 17:01:04 +08:00 |
WenhaiLin
|
c9a8dfb6ee
|
Fixed can't update scale and rotation of static body
|
2015-01-09 09:37:55 +08:00 |
Wenhai Lin
|
61438f7297
|
[Physics]Reduce temporary object creation and save mathematical labor
|
2015-01-08 14:25:06 +08:00 |
Wenhai Lin
|
8524a5fb97
|
Improve performance of physics
|
2015-01-07 17:08:04 +08:00 |
WenhaiLin
|
2847a940ed
|
Update project
|
2015-01-06 14:40:15 +08:00 |
WenhaiLin
|
fdaa0bbfc6
|
Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics
|
2015-01-06 14:40:14 +08:00 |
WenhaiLin
|
ac8e820472
|
Fixed gravity of physics module not work as expected.
|
2015-01-05 22:15:03 +08:00 |
fspadoni
|
13a7d2c4e4
|
FIX: remove cpArbiterIgnore call from collisionPreSolveCallback
|
2014-10-30 13:11:17 +01:00 |
andyque
|
ad1e44a254
|
try to fix ubuntu 12.04 compile error
|
2014-10-10 17:27:15 +08:00 |
martell
|
30240a8a37
|
Multi platform cmake support
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:21:45 +01:00 |
Ricardo Quesada
|
6f3ca63f00
|
Moved base/CCPlatform* -> platform/CCPlatform*
|
2014-09-09 17:17:07 -07:00 |
Chuanren Wu
|
0b58ff7fce
|
introduce substeps for accurate physics
|
2014-09-08 00:14:40 +02:00 |
andyque
|
ff321ba1dc
|
fix chipmunk
|
2014-08-30 21:09:28 +08:00 |
minggo
|
6a8270f33b
|
Merge pull request #7900 from minggo/setposition-optimize
not create Vec as possible for setting position
|
2014-08-28 14:31:54 +08:00 |
minggo
|
9fb977ff99
|
not create Vec as possible for setting position
|
2014-08-28 11:41:18 +08:00 |
Ricardo Quesada
|
3dda35b4ef
|
Adds `std::nothrow` to `new`
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
|
2014-08-27 16:31:57 -07:00 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07:00 |
boyu0
|
790ef9e818
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step
Conflicts:
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
|
2014-08-12 10:20:34 +08:00 |
bo yu
|
517b26e343
|
fix typo
|
2014-08-08 16:56:48 +08:00 |
boyu0
|
ee3a8da13c
|
fix PhysicsBody bitmask bug.
|
2014-08-08 16:38:20 +08:00 |
Huabing.Xu
|
21b3e55339
|
Mac dylib version works now
|
2014-07-17 20:58:50 +08:00 |
Huabing.Xu
|
52ac47aea8
|
Merge branch 'v3' into v3_dll
|
2014-07-17 18:27:36 +08:00 |
boyu0
|
e07215995a
|
Fix the bug: flip scale for physics body make it's size incorrect.
|
2014-07-17 17:21:09 +08:00 |
Huabing.Xu
|
63de5f6acc
|
add CC_DLL
|
2014-07-15 12:00:31 +08:00 |
Huabing.Xu
|
9db59c0046
|
add CC_DLL for Event and Physics
|
2014-07-15 10:55:40 +08:00 |
boyu0
|
91126341bd
|
fix transform for physics.
|
2014-06-27 17:30:21 +08:00 |
boyu0
|
a3f32cf894
|
closed #5537: add setAutoStep, isAutoStep and step method for PhysicsWorld.
|
2014-06-12 12:45:21 +08:00 |
boyu0
|
b6274a469d
|
closed #4944: fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback.
|
2014-05-21 16:07:49 +08:00 |
Ricardo Quesada
|
dc711643cd
|
Squashed commit of the following:
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
|
2014-05-14 10:07:09 -07:00 |
Ricardo Quesada
|
462338879e
|
rolling back physics in layer
|
2014-05-01 16:42:35 -07:00 |
Ricardo Quesada
|
25213c81f6
|
linux cmake improvements
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
|
2014-05-01 13:01:51 -07:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |
Ricardo Quesada
|
81c2d92355
|
yeah... love in includes
<3
|
2014-04-26 10:35:57 -07:00 |
Ricardo Quesada
|
9b118e5e96
|
Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
|
2014-04-26 10:11:22 -07:00 |
Huabing.Xu
|
feec24e3ef
|
Merge branch 'v3' into develop_migrate_math_lib_merge
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
|
2014-04-25 16:20:24 +08:00 |
Huabing.Xu
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
Huabing.Xu
|
e2a24dec84
|
replace Point with Vector2
|
2014-04-15 18:08:29 +08:00 |
Huabing.Xu
|
6686b657a4
|
Migrate getPostion and correspondent member variable to Vector2
|
2014-04-15 16:28:59 +08:00 |
Huabing.Xu
|
071cbc7565
|
migrate setPosition to Vector2
|
2014-04-15 16:16:14 +08:00 |
Huabing.Xu
|
44be9a38ec
|
Node convertToNodeSpace and convertToWorldSpace use Vector2
|
2014-04-15 14:09:46 +08:00 |
boyu0
|
b53961b78d
|
issue $4771: fix lua test and fix some bugs
|
2014-04-15 13:40:44 +08:00 |
boyu0
|
c98f50026f
|
issue $4771: move PhysicsWorld to layer.
|
2014-04-15 03:21:18 +08:00 |
James Chen
|
890dd64d38
|
issue #4729: some warning fixes and compilation error fixes on win32.
|
2014-04-10 01:29:13 +08:00 |
mgcL
|
4f7cb75d2b
|
fix PhysicsShapeEdgeChain::init() always return false
|
2014-04-02 23:52:21 +08:00 |
zukkun
|
e41fd1a29b
|
fixed PhysicsBody::setAngularVelocityLimit incorrect function call
|
2014-04-01 09:34:42 +09:00 |
CaiWenzhi
|
2dffcb9808
|
Add ProtectedNode and remove "addNode"
|
2014-03-25 14:28:58 +08:00 |
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 |