axmol

Author	SHA1	Message	Date
CaiWenzhi	72f02f47a0	Modify version	2013-09-26 14:16:22 +08:00
signmotion	7d139a3bc3	Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false').	2013-09-22 23:50:54 +03:00
CaiWenzhi	0b48552f04	Modify scene reader	2013-09-16 21:07:11 +08:00
James Chen	208f705845	Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop Conflicts: cocos2d_libs.xcodeproj/project.pbxproj samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h	2013-09-16 18:18:23 +08:00
CaiWenzhi	cf4b8c0163	Add guy loading of scene	2013-09-16 17:12:15 +08:00
2youyou2	a08ce3df73	change singleton class get method to getInstance	2013-09-16 15:16:05 +08:00
zhangcheng	d4496ac02d	1. replace "CCFileUtils" to "FileUtils".	2013-09-16 12:16:11 +08:00
2youyou2	db4813f161	1.remove CC from class name 2.fix async loading	2013-09-15 19:08:45 +08:00
zhangcheng	0121943c11	1. Adds SceneEditorTest hd version	2013-09-14 16:34:26 +08:00
yinkaile	74bd8b09d6	update armature	2013-09-13 18:07:37 +08:00
chengstory	669de88e73	1. remove any unused functions.	2013-09-10 11:02:50 +08:00
zhangcheng	1115d0d3f9	1. merge scenereader Armature merge to cocos2dx 3.0.	2013-09-09 19:51:26 +08:00