andyque
67ad24e7c1
remove orderOfArrival = 0
2014-09-11 15:44:31 +08:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
minggo
659ba68199
Merge pull request #7942 from andyque/deleteRedundantCode
...
remove dead code
2014-09-04 13:45:12 +08:00
minggo
6539ff293d
Merge pull request #7940 from andyque/fixVs2013CompileError
...
Fix vs2013 compile error
2014-09-04 13:41:15 +08:00
andyque
a1edd4a819
remove dead code
2014-09-04 11:00:48 +08:00
minggo
99f3b371ed
Merge pull request #7744 from lite3/customguireader
...
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
2014-09-04 10:53:00 +08:00
andyque
87af0ecdd6
add back libbox2d and libspine project to our solution
2014-09-03 17:37:34 +08:00
lite3
74d8bf6f27
fix
2014-09-02 10:51:17 +08:00
andyque
85ce801fdd
remove ccscale9sprite , cceditBox
2014-09-01 17:06:22 +08:00
Ricardo Quesada
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
minggo
444b298028
fix compiling error on windows
2014-08-29 16:44:20 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
lite3
2b6bdac05d
Merge branch 'v3' into customguireader
2014-08-28 15:13:10 +08:00
minggo
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
minggo
f0f1bf1b92
Merge pull request #7883 from giginet/set-node-name-via-ccs-scene
...
Add the feature that CCSSceneReader can load name properties as node names.
2014-08-28 11:14:15 +08:00
minggo
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
Dhilan007
837e8665b5
remove redundant LOCAL_STATIC_LIBRARIES
2014-08-28 09:46:09 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
Dhilan007
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
Dhilan007
9135236bb0
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
2014-08-27 21:15:57 +08:00
samuele3hu
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
minggo
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
samuele3hu
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
samuele3hu
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +08:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
giginet
d07903827d
Add the feature that CCSSceneReader can load name properties as node names.
...
When name property of objects on CocosStudio Scene are set.
They will be loaded and set as Node::name property.
Thanks to this commit. We are enable to access to each nodes on scene via its names.
```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
auto object = scene->getChildByName<cocos2d::Sprite *>("objectName");
```
2014-08-27 03:49:07 +09:00
minggo
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
minggo
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
samuele3hu
70cba1f64a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
cocos/Android.mk
2014-08-22 14:01:17 +08:00
samuele3hu
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
minggo
a0b19db670
Merge pull request #7840 from minggo/fix-warning
...
fix warnings
2014-08-22 13:41:31 +08:00
minggo
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
pandamicro
34b93a24ff
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
...
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
2014-08-21 16:07:19 +08:00
pandamicro
9544482058
Fix Android.mk s
2014-08-21 15:40:42 +08:00
pandamicro
485dd1f7da
Update #3897 : Refactor missed protected constructors
2014-08-21 15:40:22 +08:00
lite3
679d525453
Merge branch 'v3' into customguireader
2014-08-21 01:22:07 +08:00
lite3
9f348962c7
Merge branch 'v3' into customguireader
2014-08-21 00:18:30 +08:00
minggo
74fba21fc0
Merge pull request #7825 from 2youyouo2/v3
...
remove cascade color for CorlorFrame
2014-08-20 10:23:15 +08:00
minggo
cdd67be77a
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
2014-08-19 15:29:40 +08:00
kaile.yin
d884054ec9
remove cascade color for CorlorFrame
2014-08-19 15:19:47 +08:00
kaile.yin
6abaf27b14
fixed ArmatureAnimation::setSpeedScale
2014-08-18 16:19:54 +08:00
yangxiao
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
yangxiao
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
yangxiao
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
lite3
8f59d8ac93
add GUIReader::registerTypeAndCallBack for std::function
2014-08-12 17:19:52 +08:00