chengstory
bd9dc274f8
fixed #3482
...
1. add override to virtual functions.
2. replace std::string::npos to filePath.npos.
3. replace std::string to const std::string& .
2014-01-05 12:42:39 +08:00
chengstory
bac600ab9f
fixed #3582
...
1. create Component By component Factory.
2014-01-05 02:22:32 +08:00
chengstory
46c7338008
fixed #3480
...
1. remove unused getnode and setnode interface.
2. add condition test.
3. Modify ComAttribute to support for parse json file.
4. Replace scenereader callback function to C++ 11 implement.
2014-01-03 19:30:47 +08:00
chengstory
77dca5958f
issue #3480 upload Samples resources.
2014-01-03 02:03:05 +08:00
chengstory
6892d8cf6a
issue #3480
...
1. add SceneReader Tests.
2. Modify class member name.
2014-01-03 01:14:12 +08:00
chengstory
faaf6d3f2b
fixed #3457 fixes some bug.
2013-12-27 17:21:13 +08:00
chengstory
774e3d8536
issue #3457
...
1. replace UIAction NULL to nullptr.
2. modify class variable name.
2013-12-26 23:40:50 +08:00
chengstory
8ae7ecff33
Merge branch 'develop' into #3457
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSGUIReader.h
2013-12-26 12:55:52 +08:00
chengstory
19d75cee01
fixed #3647 fixes ComAttribute warning.
2013-12-26 02:18:28 +08:00
yinkaile
d72c9d94d7
upload trigger code.
2013-12-25 17:40:54 +08:00
zhangcheng
2c6f95ecea
issue #3456 replace jsoncpp to rapidjson.
2013-12-24 20:33:55 +08:00
chengstory
6acf422f3b
fixed #3185 support for html5.
2013-11-14 17:03:45 +08:00
chengstory
e9f5e889d6
fixed #3185 replace NULL to nullptr.
2013-11-14 14:05:24 +08:00
chengstory
14d51f9f35
fixed #3185
2013-11-14 13:28:42 +08:00
minggo
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00