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
|
e2a24dec84
|
replace Point with Vector2
|
2014-04-15 18:08:29 +08:00 |
boyu0
|
c98f50026f
|
issue $4771: move PhysicsWorld to layer.
|
2014-04-15 03:21:18 +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
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +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 |
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47: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
|
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 |
James Chen
|
165cdf7fe6
|
issue #2790: Deprecates CCArray.
|
2013-12-07 10:48:02 +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
|
2b43e72e7c
|
issue #2771: fix vs compile errors, change project setting
|
2013-11-27 17:33:33 +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
|
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
|
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
|
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
|
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 |
boyu0
|
46710c5f06
|
issue #2771: delay load
|
2013-11-04 19:26:34 +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
|
cae9a3e54f
|
issue #2771: add physics pump demo and fix bugs
|
2013-10-29 17:31:35 +08:00 |
boyu0
|
d0d8694091
|
issue #2771: fix some retain/release bugs
|
2013-10-28 11:08:41 +08:00 |
boyu0
|
fdcf019665
|
issue #2771: implement contact callbacks
|
2013-10-25 10:31:22 +08:00 |
boyu0
|
899f720efa
|
issue #2771: implement getShapeAtPoint and getShapesAtPoint
|
2013-10-23 17:28:23 +08:00 |
boyu0
|
51801d9218
|
issue #2771: fix some compile error in android and win32
|
2013-10-23 10:11:08 +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
|
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
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |