cc3a9d0737
fix crash caused by std::regex()
2014-07-01 16:09:25 +08:00
4f79176da2
Merge pull request #7234 from boyu0/iss5614_physics_transform
...
closed #5614 : add transform support for physics
2014-06-29 17:23:20 +08:00
91126341bd
fix transform for physics.
2014-06-27 17:30:21 +08:00
66703addb2
fixed #4693 : override addChild by name
2014-06-25 11:27:48 +08:00
f2ecb31958
closed #5541 : add more warning for unsupported functions.
2014-06-24 10:33:21 +08:00
c40c461848
closed #5541 : add warning code and comment.
2014-06-23 13:55:52 +08:00
6ecca08340
Merge pull request #7039 from minggo/get-child-by-name
...
issue #4693 : add getName(), setName() and getChildByName()
2014-06-18 11:30:14 +08:00
4da24dfade
issue #4693 : correct comment
2014-06-17 16:21:24 +08:00
53963a2441
issue #4693:enumerateChildren() support regular expression
2014-06-17 11:43:03 +08:00
7ccff325b6
Issue #5554 : Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage
2014-06-13 10:29:40 +08:00
05a65a68bb
issue #4693 : added enumerateChildren()
2014-06-12 10:41:08 +08:00
8a5bfb9840
issue #4693 : add getName(), setName() and getChildByName()
2014-06-11 16:57:43 +08:00
b24c674d25
Little fixes for setNormalized
2014-05-30 21:50:39 -07:00
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
2e7865a4f6
coding style fix
2014-05-28 17:41:34 +08:00
d875f27c67
Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst
...
Conflicts:
cocos/ui/UIListView.h
cocos/ui/UIPageView.h
2014-05-17 10:40:36 +03:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
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
2014-05-14 10:07:09 -07:00
249dffa346
getter always must be a const method.
2014-05-13 23:28:04 +03:00
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
580ebf939f
working Ok with new API
2014-05-08 15:43:12 -07:00
462338879e
rolling back physics in layer
2014-05-01 16:42:35 -07:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
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
b053a9145a
Compiles on Windows32
2014-04-25 22:03:25 -07:00
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
30dec564e6
remove kazmath/kazmath.h include
2014-04-15 23:50:28 +08:00
9c33b48b50
remove Point in CCNode.h and CCSprite.h
2014-04-15 17:09:18 +08:00
511e868ac4
migrate getAnchorPoint, getAnchorPointInPoints and relative member variable to Vector2
2014-04-15 16:59:16 +08:00
e351b778c1
migrate setAnchorPoint to Vector2
2014-04-15 16:47:29 +08:00
6686b657a4
Migrate getPostion and correspondent member variable to Vector2
2014-04-15 16:28:59 +08:00
071cbc7565
migrate setPosition to Vector2
2014-04-15 16:16:14 +08:00
ec2ef0f64b
migrate convertXXXX to Vector2 step2
2014-04-15 14:41:09 +08:00
633173005b
migrate convertXXXX to Vector2
2014-04-15 14:29:12 +08:00
44be9a38ec
Node convertToNodeSpace and convertToWorldSpace use Vector2
2014-04-15 14:09:46 +08:00
b53961b78d
issue $4771: fix lua test and fix some bugs
2014-04-15 13:40:44 +08:00
c98f50026f
issue $4771: move PhysicsWorld to layer.
2014-04-15 03:21:18 +08:00
1670e07300
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
43d6e1176a
issue #4729 : Compilation error fixes for linux
2014-04-10 00:36:42 +08:00
409b696bab
remove kmMat4 interface in class Node
2014-04-08 23:05:33 +08:00
fcff284fd5
getParentToNodeTransform return Matrix
2014-04-08 22:13:59 +08:00
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
b9af100493
visit() using Matrix instead of kmMat4
2014-04-08 21:45:54 +08:00
5d70170a4b
getNodetoParentTransform getNodeToWorldTransform return Matrix instead of kmMat4
2014-04-04 18:41:29 +08:00
49de7511f5
migrate Vertex3f to Vector3
2014-04-02 15:06:16 +08:00
57d8f155df
issue #4401 . resolve conflicts
2014-03-26 14:54:50 +08:00
a374241f65
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
...
Windows Phone 8,0 cocos2d-x 3.0 changes
2014-03-26 13:58:46 +08:00
45b98e7dc0
issue #4541 : s_globalOrderOfArrival is an static variable of Node class.
2014-03-25 15:07:11 +08:00
44e6efea64
#pragma mark for ios and mac only
2014-03-22 06:08:05 -07:00
f51c39c034
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
...
Thank @pandamicro.
2014-03-21 13:44:29 +08:00
c26b103b23
remove node name related features from v3.0
2014-03-13 10:45:02 +08:00
2a3cb0847e
refactor api name
2014-03-12 18:10:45 +08:00
a907580d0a
use lambda callback
2014-03-12 14:15:45 +08:00
80417f0f35
correct naming convetion
2014-03-11 15:27:28 +08:00
8db680b9ee
add EnumChildNodesByName, walk node tree with callback
2014-03-11 13:58:43 +08:00
63292b5ba6
Merge pull request #5544 from heliclei/node-string-tag
...
CCNode:Add String tag, to support runtime manipulation
2014-03-10 18:26:51 +08:00
83c4d5b479
fix comments
2014-03-10 18:21:53 +08:00
77d19e9bc2
better doctrings
...
improved documentation for Node
2014-03-06 14:04:19 -08:00
73a3011b11
fix comments
2014-03-06 10:31:29 +08:00
55080d713b
refactor string tag to name
2014-03-05 17:03:25 +08:00
cbec0f9a15
CCNode:Add String tag, to support runtime manipulation
2014-03-05 00:15:01 +08:00
8bdfce9bbe
Merge branch 'develop' into visit_draw_improved
2014-03-03 17:31:29 -08:00
81f5254e15
Removes setNormalizedPosition
...
This funciton is useful, but the code is buggy.
In should check the parents' position instead of Director::Size()
Let's do it correctly, and then re-add this function
2014-03-03 16:08:30 -08:00
c386f88e32
Merge branch 'develop' into visit_draw_improved
...
Conflicts:
CHANGELOG
cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
cdc19eea1c
Nodes: setAdditionalTransform() receives a pointer
...
and not a const reference.
If the pointer is `NULL`, then it won't use the additionalTransform
2014-03-01 08:26:54 -08:00
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
6920bec6ef
transform object returns the MV
...
code cleaner.
the kmGL code is altogether
2014-02-28 11:20:53 -08:00
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
eb66ddd931
visit and draw improved.
...
`visit()` and `draw()` are improved.
they both receive:
- `Renderer`
- `kmMat4` for transformation
- `bool` whether or not the transform changed from the previous frame
Although `draw` and `visit` are not using the 3 new parameters,
they will start using it in the coming days (or weeks, or months).
Those parameters are needed for:
- `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer
- we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that.
- whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that.
We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.
2014-02-27 21:43:54 -08:00
a4cc0edb4a
issue #4118 : refactor physics update
2014-02-24 16:17:42 +08:00
04460750b8
culling working for both 2d and 3d projections
2014-02-23 01:09:52 -08:00
fe1160cd8c
changes in API to support 3D
2014-02-22 19:16:42 -08:00
0d8846d876
closed #4097 : Adds a macro to disable inserting script binding relevant codes.
2014-02-20 16:40:46 +08:00
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
7a8707cb08
Merge branch 'develop' into local_z_Order_fixes
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/CCNode.h
2014-01-21 10:10:50 -08:00
f1444a26a1
Improves documentation with local z order
2014-01-21 09:26:58 -08:00
0f9c3fa59c
closed #3789 : EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case.
2014-01-21 10:23:05 +08:00
5fcbf42356
GlobalZOrder is used for render priority...
...
...and not vertexZ
Node::setGlobalZOrder() is used to change that.
Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
f2c3d2f3ae
Camera and Node fixes
...
OrbitCamera: added getters (public). Setters moved from `protected` to `public
: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
: Setters receives `kmVec3` as well. Old API is still supported
Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
Instead, once the additional transform is set, in order to remove it the user needs to pass
the identity matrix
2014-01-13 12:52:07 -08:00
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
9baa64f274
Merge pull request #4688 from walzer/develop
...
make CC_USE_PHYSICS can ACTUALLY be switch off
2013-12-27 04:04:48 -08:00
e45c2a8601
Modify manager of some widgets' children
2013-12-27 16:01:03 +08:00
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
3344c5243c
change some const char* to const std::string&
2013-12-24 10:51:47 +08:00
4f435a8613
Adds getScene() to Node
...
helper function to get the Scene containing the Node
2013-12-21 12:28:49 -08:00
d8ad5291f4
Nore camera
2013-12-20 16:33:31 -08:00
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
d51ad36613
Merge branch 'develop' into develop_gridNode
...
* develop: (67 commits)
Adds const in ShaderTest2.h
Skew works again!
[AUTO] : updating submodule reference to latest autogenerated bindings
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts submodule.
Updates submodule of bindings-generator.
Adds `std::for_each` test in invocation
Reverts bindings-generator.
fixed not render
iterator in Sprite fixes
update vs project for removes unneeded files
getNodeToParentTransform fixes
Node cleanup
[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest
[AUTO] : updating submodule reference to latest autogenerated bindings
Android and Linux fixes
removes `using namespace std` from header file
Removes unneeded files
change play arguments
...
Conflicts:
cocos/2d/CCNode.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-19 17:20:22 +08:00
ef54ed3c15
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
...
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
2013-12-19 17:05:59 +08:00
e07c4ffec1
Change NULL to nullptr, edit hungarian notation.
2013-12-18 17:47:20 +08:00
25fc3d3c2a
Merge branch 'develop' into develop_gridNode
...
* develop: (105 commits)
update armature to new render
iOS & Mac project fix.
[AUTO] : updating submodule reference to latest autogenerated bindings
use size_t replace unsigned int for record redeque::size returned value.
issue #2171 : Updates CMakeLists.txt.
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
issue #2171 : Adds header files of renderer in cocos2d.h.
issue #2171 : Reorder renderer files for iOS & mac project.
issue #2171 : small fix in ccTypes.h
issue #2171 : Don’t ‘using namespace std;’ in header file.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2171 : Ignores Director::getFrustum.
issue #2171 : Fixing compilation errors for Linux port.
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
issue #2171 : [New Renderer] Fixing compilation errors for Android.
[Win32] fix argument type. - argument of interface is ssize_t.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Add mouse scrolling support for extension test
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/cocos2d.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
b1eacd52cb
Merge branch 'develop' into develop_gridNode
...
* develop:
fix compile error related to ssize_t.
issue #2771 : add and change some physics API, and add more documents
[AUTO] : updating submodule reference to latest autogenerated bindings
Some fixes for XXX:getDescription.
Reverts CCSpriteBatchNode.h
size_t —> ssize_t in CCTMXLayer.cpp
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
[AUTO] : updating submodule reference to latest autogenerated bindings
More renames of description() to getDescription()
getDescription() works as expected
fix compiling error after fixing conflicts
fix compiling error after fixing conflicts
use ssize_t for index
use ssize_t for index and capacity
use ssize_t for capacity and index in containers
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-16 10:43:49 +08:00
f9f816caf9
issue #3162 : change log to cpp file
2013-12-16 03:42:54 +08:00
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
bb5ef615dd
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479
...
Conflicts:
cocos/2d/CCSpriteBatchNode.h
2013-12-13 16:44:22 +08:00
d4c8fb0be6
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 10:47:52 +08:00
c8c0e2270e
issue #3162 : deprecated RGBAProtocol, NodeRGBA and LayerRGBA
2013-12-13 10:10:49 +08:00
61cc365d9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCGLProgram.h
cocos/2d/CCLabelTTF.h
2013-12-12 14:41:42 -08:00
a8c317bd83
getDescription() works as expected
...
renames `description` to `getDescription`. Adds `virtual` to it.
Adds `getDescription` to missing nodes.
2013-12-12 14:30:22 -08:00
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
5509bd48ef
remove _grid
2013-12-12 16:21:21 +08:00
09a9b1f557
remove setGrid getGrid in class Node
2013-12-12 15:15:43 +08:00
1e9c763b40
use ssize_t for index and capacity
2013-12-12 14:48:26 +08:00
be9bb6998b
issue #2790 : Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes.
...
Also renames Map::remove to Map::erase.
2013-12-11 18:08:06 +08:00
2cda34d59a
issue #2790 : Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class .
2013-12-11 18:08:05 +08:00
463ae20ce6
issue #3162 : Add layer cascade color and cascade opacity test, fix bugs
2013-12-11 15:57:20 +08:00
0222c6544e
Migration to Mat4x4
...
Armature not migrated yet
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
d6d7923134
closed #3162 : add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them
2013-12-09 11:32:28 +08:00
ee0ef6bf46
ProgressTimer works OK
...
Adds _modelViewTransform as ivar of Node (temporary fix)
2013-12-06 17:42:16 -08:00
4d0e3dbd8d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-06 18:16:26 +08:00
af5f496861
issue #3162 : Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
2013-12-06 18:07:16 +08:00
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
d4d864216b
issue #2790 : Deletes Vector::init, adds Vector::setCapacity.
2013-12-04 16:00:18 +08:00
90062b656d
issue #2790 : Node::_children is Vector<Node*> now.
2013-12-04 16:00:17 +08:00
92b180080c
Merge pull request #4409 from mlepage/develop
...
[ci skip]Fix typos
2013-12-03 19:13:23 -08:00
fd68dc4f9f
issue #2771 : add condition test to updatePhysicsTransform
2013-12-03 16:28:18 +08:00
940b0ffd56
Fix typos
2013-11-29 12:09:38 -05:00
72f2d68edd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-27 17:47:37 +08:00
99d904363a
issue #2771 : delete all the box2d implementation in physics parts.
2013-11-26 13:47:42 +08:00
cd0ba6850c
Merge branch 'develop' into constructors_are_protected
2013-11-14 11:57:18 -08:00
d590986e73
Constructors are protected
2013-11-13 15:55:36 -08:00
6b29391212
Adds markdown comments in the doxstrings
...
Since Doxygen 1.8.0 (we are already using it), it is possible to
add markdown comments in the doxygen strings.
This will make our comments easier to read.
This patch only adds markdown to CCNode.h as a test.
If you like, I'll keep adding markdown comments as I see them.
Please, encourage the rest of the team to do the same.
2013-11-11 20:21:01 -08:00
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
48ce5e39fe
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
2013-10-26 15:04:01 +08:00
1f3863e787
Event Dispatcher refactor commit. TestCpp could run.
2013-10-25 10:53:45 +08:00
f7e2c63230
Refactor event dispatcher. Remove non-node relative member variables.
2013-10-25 10:53:45 +08:00
cfaef2a01a
Adding onEnterHook, onXXXHook for Node.
2013-10-25 10:53:45 +08:00
d12ee5f120
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-18 15:34:13 +08:00
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
49d7bbd600
issue #2905 : remove sub folders except platform
2013-10-12 15:41:45 +08:00
minggo