Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,644 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

106 Commits

Author SHA1 Message Date
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
boyu0 f2cd5ca630 issue #2771: fix body and joint memory bugs. add removeFormWorld and destroy to PhysicsJoint, and add a destroy param to PhysicsWorld->removeJoint() 2013-11-07 14:17:57 +08:00
boyu0 6c27a0df0b issue #2771: make api more friendly 2013-11-06 15:43:29 +08:00
boyu0 a01fcc6f36 issue #2771: move header definition to first line 2013-11-06 14:51:56 +08:00
boyu0 af129e25f0 issue #2771: change some coding style 2013-11-05 20:02:58 +08:00
boyu0 8c62bf813f issue #2771: enhance API and add Slice demo 2013-11-05 15:54:33 +08:00
Ricardo Quesada ba7ed6e578 Fixes some compiler warnings 
The warnings are related to:

* 64-to-32-bit conversion
* shadow variables
 2013-11-04 16:31:36 -08:00
James Chen 59adba1a6d Updating physics/CMakeLists.txt 2013-11-04 21:03:07 +08:00
James Chen 8676523433 Adding CMakeLists.txt 2013-11-04 21:03:07 +08:00
boyu0 46710c5f06 issue #2771: delay load 2013-11-04 19:26:34 +08:00
boyu0 00acd67ff3 issue #2771: finish OneWayPlatform demo and fix some bugs 2013-11-04 14:36:38 +08:00
boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
boyu0 a2adbff2c8 issue #2771: fix some code style 2013-11-01 16:32:27 +08:00
boyu0 2f67ceb495 issue #2771: fix some code style 2013-11-01 16:26:03 +08:00
boyu0 b2951b70ff issue #2771: enhance Listener use EventListener mechanism 2013-11-01 14:50:06 +08:00
boyu0 2efef34144 issue #2771: fix vs compile errors 2013-10-31 18:18:02 +08:00
boyu0 e8d06496d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-30 17:27:09 +08:00
boyu0 391cda44ef issue #2771: edit listener 2013-10-30 15:53:58 +08:00
boyu0 cae9a3e54f issue #2771: add physics pump demo and fix bugs 2013-10-29 17:31:35 +08:00
boyu0 66d1bbd89f issue #2771: edit physics effect with all bodies and fix some bugs 2013-10-28 16:17:19 +08:00
boyu0 d0d8694091 issue #2771: fix some retain/release bugs 2013-10-28 11:08:41 +08:00
psi 9ecc0c6db8 include climits for UINT_MAX 2013-10-26 13:33:31 +09:00
boyu0 fdcf019665 issue #2771: implement contact callbacks 2013-10-25 10:31:22 +08:00
boyu0 a8ddca81bd issue #2771: fix some compile error in win32 2013-10-23 18:52:09 +08:00
boyu0 912a9a2887 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-23 17:41:52 +08:00
boyu0 899f720efa issue #2771: implement getShapeAtPoint and getShapesAtPoint 2013-10-23 17:28:23 +08:00
minggo 4952df576b Merge pull request #3996 from boyu0/iss2771_physical 
issue #2771: physical
 2013-10-22 20:45:55 -07:00
boyu0 17422c3123 issue #2771: fix some compile error in win32 2013-10-23 11:08:21 +08:00
boyu0 51801d9218 issue #2771: fix some compile error in android and win32 2013-10-23 10:11:08 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
boyu0 24561860f0 issue #2771: add ray cast test 2013-10-22 18:00:24 +08:00
boyu0 e99b80b304 issue #2771: implements rayCast and rectQuery 2013-10-21 23:16:21 +08:00
boyu0 5741a16620 issue #2771: edit some include head file path 2013-10-18 17:47:29 +08:00
boyu0 6aef4476d9 issue #2771: edit some mistake when merge 2013-10-18 15:55:47 +08:00
boyu0 d12ee5f120 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 15:34:13 +08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo 19ee87e29a issue #2905: step2 Box2D -> box2d 2013-10-12 14:03:04 +08:00
minggo 1f38636e84 issue #2905: step1 Box2D -> box2d 2013-10-12 14:02:13 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00