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

30 Commits

Author SHA1 Message Date
mogemimi fc6c612c4c Remove duplicate header includes 2016-05-26 23:25:44 +09:00
mogemimi 1e04cb5950 Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
mogemimi a3ad4cddf8 Fix warnings about signed/unsigned mismatch 2016-04-22 12:20:05 +09:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files 
using the tools/coding-style/include-linter.py with -f options.
 2016-03-20 21:53:44 +08:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
mogemimi 9df30d2454 Fix typos in documentation 2015-10-23 16:59:51 +09:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
pandamicro 7fcea1ccaf Merge pull request #13976 from lsybblll/lsybblll-patch-1 
Update CCPhysics3DComponent.cpp
 2015-09-22 01:44:03 +08:00
lsybblll 84489d322a Update CCPhysics3DComponent.cpp 
there should save old bool.
 2015-09-21 17:11:45 +08:00
songchengjiang f9e9871bcc supplement annotations 2015-08-26 17:24:36 +08:00
songchengjiang 2239b624a8 add annotations 2015-08-26 16:19:30 +08:00
jianglong0156 5d281d45ef recover the physics3DShape initHeightfield api 2015-08-01 18:29:48 +08:00
jianglong0156 bcec599993 Merge branch 'v3' into constructedWith3D_3#12404 2015-08-01 15:38:26 +08:00
jianglong0156 80e812e5a0 add Physics3DShape support constructor 2015-07-31 18:17:35 +08:00
pandamicro 9b5c8d5d12 Merge pull request #12601 from super626/physics3d 
3d physics collider
 2015-07-30 18:19:23 +08:00
yangxiao 8eac67b806 IsTrigger to isTrigger 2015-07-30 18:18:02 +08:00
yangxiao 99a869b588 IsTrigger to isTrigger 2015-07-30 18:14:46 +08:00
jianglong0156 9c6b5730d0 add Physics3DPointToPointConstraint support new 2015-07-27 16:02:13 +08:00
yangxiao 2ed5ee123e improve collider 2015-06-30 14:16:05 +08:00
songchengjiang 7733f0fe19 add interfaces 2015-06-29 17:20:28 +08:00
songchengjiang 070705949b tab format 2015-06-29 11:48:43 +08:00
songchengjiang 7befab0f7b add Physics3DCollider 2015-06-29 10:26:09 +08:00
Ricardo Quesada c17da7e90d Removes not-needed draws 2015-06-15 10:40:47 -07:00
Ricardo Quesada 2a3347dd49 RenderState: default state fixes 
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
 2015-06-12 15:03:48 -07:00
子龙山人 c5ba7eef8b Merge pull request #12019 from super626/v3 
getIntersectionPoint failed when there is no intersection on the terrain
 2015-06-08 11:26:19 +08:00
yangxiao 73d815b0ab rename syncToNode and syncToPhysics 2015-06-04 12:04:41 +08:00
yangxiao 28b9b86b0b get set gravity 2015-05-27 18:07:31 +08:00
yangxiao f2eacc154b use reference param 2015-05-13 10:13:46 +08:00
yangxiao 806d64dced fix wrong indent and add const 2015-05-12 16:13:14 +08:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00