James Chen
|
833b5b1be8
|
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
Conflicts:
cocos2dx/base_nodes/CCNode.cpp
cocos2dx/sprite_nodes/CCSprite.cpp
samples/TestCpp/Classes/TouchesTest/Ball.cpp
samples/TestCpp/Classes/VisibleRect.cpp
samples/TestCpp/Classes/VisibleRect.h
|
2012-11-12 10:20:04 +08:00 |
|
Mat Hopwood
|
2b265929e2
|
Marmalade Sample data removed and merged changes
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
|
2012-10-25 21:40:37 +01:00 |
|
James Chen
|
62f7b25df2
|
issue #1521: Using relative coordinates in TestCpp.
|
2012-10-23 17:48:50 +08:00 |
|
James Chen
|
39a4af57cc
|
issue #1486: Using relative position for ActionsTest and Box2dView.
|
2012-10-14 22:21:57 +08:00 |
|
Donald Alan Morrison
|
3eb3ebc67a
|
Fixed VS2010 Warning C4800: 'void *' : forcing value to bool 'true' or
'false' (performance warning).
|
2012-08-24 11:20:23 -07:00 |
|
James Chen
|
e7d7ff99c7
|
fixed #1386: PauseResumeActionsTest crashes.
|
2012-07-24 11:21:08 +08:00 |
|
Walzer
|
685b70e6fb
|
fixed #1402, résolve conflicting "create" functions
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
|
2012-07-23 22:49:11 +08:00 |
|
James Chen
|
77f1fba566
|
issue #1399: Adjust folder structure, made it built successfully on win32.
|
2012-07-20 14:05:52 +08:00 |