geron-cn
|
c561f4e2f4
|
fix win can not compile
|
2014-07-01 18:55:09 +08:00 |
andyque
|
5624da5448
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
|
2014-06-23 09:37:39 +08:00 |
zhangbin
|
ec62f05b12
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 10:51:13 +08:00 |
zhangbin
|
0019d9a061
|
Optimize the win32 projects configuration.
|
2014-06-20 10:50:43 +08:00 |
geron-cn
|
12bb7564cd
|
fix cannot compile in windows
|
2014-06-18 14:35:43 +08:00 |
2youyou2
|
5bce6b87ea
|
change ActionTimeline to cocostudio ActionTimeline folder
|
2014-06-13 18:51:32 +08:00 |
2youyou2
|
2031e0e92d
|
change TimelineAction to ActionTimeline
|
2014-06-13 16:03:03 +08:00 |
2youyou2
|
e0f6ae9db4
|
change TimelineAction to cocos/2d folder
|
2014-06-13 13:36:01 +08:00 |
2youyou2
|
b2c5334de1
|
change NodeCache to NodeReader
|
2014-06-12 19:24:27 +08:00 |
2youyou2
|
f536020d26
|
remove unused files
|
2014-06-12 16:21:41 +08:00 |
lvlong
|
742ea7f2df
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
|
2014-06-12 15:53:41 +08:00 |
youyou
|
28ae57c5fc
|
add AsyncReader
|
2014-06-12 00:38:23 +08:00 |
2youyou2
|
09a2ceb7df
|
add TimelineAction
|
2014-06-11 11:10:07 +08:00 |
andyque
|
d089b251db
|
fix other platform compile error
|
2014-06-04 14:56:34 +08:00 |
Mircea Rila
|
b66b4c6f1d
|
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
remove C4005 warnings after upgrading projects
|
2014-05-07 17:41:04 +03:00 |
CaiWenzhi
|
cb5f9ad6dc
|
Modify windows project
|
2014-03-05 22:34:24 +08:00 |
andyque
|
143f5975a6
|
fix cross-platform comiple error
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
|
2014-02-18 14:22:15 +08:00 |
chengstory
|
10fec47b04
|
fixed #3582 update libCocoStudio windows project.
|
2014-01-05 11:38:01 +08:00 |
Dhilan007
|
35246b0810
|
fix compiling error and miss file on vs.
|
2014-01-04 12:25:12 +08:00 |
zhangcheng
|
6a9fbfbc60
|
fixed #3457 update libCocosStudio.vcxproj, add trigger code.
|
2013-12-27 10:24:50 +08:00 |
Liam
|
bc54707893
|
modify coco action with new coding rule
|
2013-12-26 16:29:59 +08:00 |
zhangcheng
|
2c6f95ecea
|
issue #3456 replace jsoncpp to rapidjson.
|
2013-12-24 20:33:55 +08:00 |
Dhilan007
|
39280d55f3
|
new label:add support for distanceField
PerformanceTest:add performance test for label.
|
2013-12-13 12:42:15 +08:00 |
Dhilan007
|
a68d92ff5a
|
perfect vs-project configuration
|
2013-10-31 10:51:38 +08:00 |
Dhilan007
|
232f0d598b
|
issues #2905:add new vs project
|
2013-10-21 22:21:11 +08:00 |