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
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
1966d1f50e
Fixed #4755 : Fix PhysicsSprite transform not updated issue
2014-04-23 17:11:55 +08:00
d14d3007d0
remove kazmath include file
2014-04-16 14:08:58 +08:00
0dab97919f
add missed line in PhysicSprite.cpp
2014-04-16 10:46:10 +08:00
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +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
867c60a971
remove kmMat4 in PhysicsSprite.cpp
2014-04-11 17:27:55 +08:00
409b696bab
remove kmMat4 interface in class Node
2014-04-08 23:05:33 +08:00
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
5d70170a4b
getNodetoParentTransform getNodeToWorldTransform return Matrix instead of kmMat4
2014-04-04 18:41:29 +08:00
6462c0bfaf
Solve the bug: debug frames are not shown in ChipmunkTest.
2014-03-05 11:41:46 +08:00
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -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
1c20df5ca9
Makes an assert if CC_ENABLE_CHIPMUNK_INTEGRATION was not enabled in PhysicsDebugNode::create.
2014-01-26 20:05:51 +08:00
13cbaf4968
Updates CCPhysicsDebugNode.h/.cpp, don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in header file.
2014-01-26 19:35:21 +08:00
8902359db0
Compilation fix when CC_ENABLE_BOX2D_INTEGRATION is enabled.
2014-01-26 18:32:50 +08:00
e8229ad4e3
Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION or CC_ENABLE_BOX2D_INTEGRATION in CCPhysicsSprite.h.
2014-01-26 17:56:14 +08:00
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
d7593fd0f0
fix wrong judgments of conditional compilation.
2014-01-13 11:24:49 +08:00
fd11791389
add a blank line at the file end.
2014-01-13 10:37:31 +08:00
34a79a02e7
fix compiling error when CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION are zero.
2014-01-13 10:32:34 +08:00
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +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
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
f3f24e3bbd
issue #2905:use - to connect multiple words
2013-10-12 13:54:16 +08:00
Ricardo Quesada