10 Commits

Author	SHA1	Message	Date
pipu	c0170d23c7	fixed warnings	2014-06-12 19:56:15 +08:00
2youyou2	b2c5334de1	change NodeCache to NodeReader	2014-06-12 19:24:27 +08:00
2youyou2	eb2e973e07	change read name	2014-06-12 19:12:05 +08:00
2youyou2	ea7e24ba24	add TimelineActionData	2014-06-12 18:50:37 +08:00
2youyou2	e4f1ac6126	add hd resource	2014-06-12 17:38:26 +08:00
2youyou2	f536020d26	remove unused files	2014-06-12 16:21:41 +08:00
2youyou2	4d1bf0c1a2	Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 ... Conflicts: tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp	2014-06-12 09:42:20 +08:00
youyou	28ae57c5fc	add AsyncReader	2014-06-12 00:38:23 +08:00
2youyou2	aa06fab776	support relative path for reading json	2014-06-11 21:11:22 +08:00
2youyou2	09a2ceb7df	add TimelineAction	2014-06-11 11:10:07 +08:00