Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/build/cocos2d_tests.xcodeproj/project.pbxproj

9109 lines
716 KiB
Plaintext
Raw Normal View History

issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
A035ACBB1782469700987F6C /* build all tests Mac */ = {
isa = PBXAggregateTarget;
buildConfigurationList = A035ACBC1782469800987F6C /* Build configuration list for PBXAggregateTarget "build all tests Mac" */;
buildPhases = (
);
dependencies = (
1ADA8BA418CF277400AE24B9 /* PBXTargetDependency */,
1ADA8BA618CF277400AE24B9 /* PBXTargetDependency */,
1ADA8BA818CF277400AE24B9 /* PBXTargetDependency */,
A035ACC0178246BD00987F6C /* PBXTargetDependency */,
);
name = "build all tests Mac";
productName = "build-all-tests";
};
A07A517B1783A1CC0073F6A7 /* build all tests iOS */ = {
isa = PBXAggregateTarget;
buildConfigurationList = A07A517C1783A1CC0073F6A7 /* Build configuration list for PBXAggregateTarget "build all tests iOS" */;
buildPhases = (
);
dependencies = (
1ADA8BAC18CF277C00AE24B9 /* PBXTargetDependency */,
1ADA8BAE18CF277C00AE24B9 /* PBXTargetDependency */,
1ADA8BB018CF277C00AE24B9 /* PBXTargetDependency */,
A07A526D1783AB980073F6A7 /* PBXTargetDependency */,
);
name = "build all tests iOS";
productName = "build-all-tests iOS";
};
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
1503FAB318DA8B6C00F6518C /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAA918DA8B6C00F6518C /* ftp.lua */; };
1503FAB418DA8B6C00F6518C /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAA918DA8B6C00F6518C /* ftp.lua */; };
1503FAB518DA8B6C00F6518C /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAA18DA8B6C00F6518C /* headers.lua */; };
1503FAB618DA8B6C00F6518C /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAA18DA8B6C00F6518C /* headers.lua */; };
1503FAB718DA8B6C00F6518C /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAB18DA8B6C00F6518C /* http.lua */; };
1503FAB818DA8B6C00F6518C /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAB18DA8B6C00F6518C /* http.lua */; };
1503FAB918DA8B6C00F6518C /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAC18DA8B6C00F6518C /* ltn12.lua */; };
1503FABA18DA8B6C00F6518C /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAC18DA8B6C00F6518C /* ltn12.lua */; };
1503FABB18DA8B6C00F6518C /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAD18DA8B6C00F6518C /* mbox.lua */; };
1503FABC18DA8B6C00F6518C /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAD18DA8B6C00F6518C /* mbox.lua */; };
1503FABD18DA8B6C00F6518C /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAE18DA8B6C00F6518C /* mime.lua */; };
1503FABE18DA8B6C00F6518C /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAE18DA8B6C00F6518C /* mime.lua */; };
1503FABF18DA8B6C00F6518C /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAF18DA8B6C00F6518C /* smtp.lua */; };
1503FAC018DA8B6C00F6518C /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAF18DA8B6C00F6518C /* smtp.lua */; };
1503FAC118DA8B6C00F6518C /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB018DA8B6C00F6518C /* socket.lua */; };
1503FAC218DA8B6C00F6518C /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB018DA8B6C00F6518C /* socket.lua */; };
1503FAC318DA8B6C00F6518C /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
1503FAC418DA8B6C00F6518C /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
1503FAC518DA8B6C00F6518C /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
1503FAC618DA8B6C00F6518C /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B79198B879900DC375D /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; };
15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */; };
Fix the actionTimelineTest crash on mac platform
2014-07-17 17:38:53 +08:00
156EAE071977D0BD00F53709 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
15AE17DB19A7235300C27E9E /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
15AE17DC19A725A000C27E9E /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
Add VideoPlayer Test for Lua
2014-06-27 13:56:39 +08:00
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
Upate templates project setting
2014-06-27 14:52:32 +08:00
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
Add Lua binding for ActionTimeline related and related test cases
2014-06-26 09:51:32 +08:00
15B0870D195AD52000D6F62B /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C64825165F3934007D4F18 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; };
15C64827165F394E007D4F18 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; };
15C64829165F396B007D4F18 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64828165F396B007D4F18 /* OpenAL.framework */; };
15C6482B165F3979007D4F18 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482A165F3979007D4F18 /* ApplicationServices.framework */; };
15C6482D165F3988007D4F18 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; };
15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; };
15C64833165F3AFD007D4F18 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
15C90B3718E66BE000D69802 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAA918DA8B6C00F6518C /* ftp.lua */; };
15C90B3A18E66BE200D69802 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAA918DA8B6C00F6518C /* ftp.lua */; };
15C90B3B18E66BEB00D69802 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAA18DA8B6C00F6518C /* headers.lua */; };
15C90B3C18E66BEC00D69802 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAA18DA8B6C00F6518C /* headers.lua */; };
15C90B3D18E66BF100D69802 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAB18DA8B6C00F6518C /* http.lua */; };
15C90B3E18E66BF200D69802 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAB18DA8B6C00F6518C /* http.lua */; };
15C90B3F18E66C0C00D69802 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAC18DA8B6C00F6518C /* ltn12.lua */; };
15C90B4018E66C0D00D69802 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAC18DA8B6C00F6518C /* ltn12.lua */; };
15C90B4118E66C1100D69802 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAD18DA8B6C00F6518C /* mbox.lua */; };
15C90B4218E66C1200D69802 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAD18DA8B6C00F6518C /* mbox.lua */; };
15C90B4318E66C1700D69802 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAE18DA8B6C00F6518C /* mime.lua */; };
15C90B4418E66C1800D69802 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAE18DA8B6C00F6518C /* mime.lua */; };
15C90B4518E66C1E00D69802 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAF18DA8B6C00F6518C /* smtp.lua */; };
15C90B4618E66C1F00D69802 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAAF18DA8B6C00F6518C /* smtp.lua */; };
15C90B4718E66C2400D69802 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB018DA8B6C00F6518C /* socket.lua */; };
15C90B4818E66C2500D69802 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB018DA8B6C00F6518C /* socket.lua */; };
15C90B4918E66C2A00D69802 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
15C90B4A18E66C2B00D69802 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
15C90B4B18E66C2F00D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
15C90B4C18E66C3100D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA9AF196EE80B005877BB /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F01960FEFE00DE83F5 /* fonts */; };
15CBA9B0196EE80B005877BB /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F11960FEFE00DE83F5 /* ipad */; };
15CBA9B1196EE80B005877BB /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F21960FEFE00DE83F5 /* ipadhd */; };
15CBA9B2196EE80B005877BB /* iphone in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F31960FEFE00DE83F5 /* iphone */; };
15CBA9B3196EE824005877BB /* src in Resources */ = {isa = PBXBuildFile; fileRef = 15CBA9A4196EE6B1005877BB /* src */; };
15CBA9B4196EE8A0005877BB /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA08B196EE66D005877BB /* AppDelegate.cpp */; };
15CBA9B7196EE8D9005877BB /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA53F196EE671005877BB /* AppController.mm */; };
15CBA9B8196EE8D9005877BB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA54C196EE671005877BB /* main.m */; };
15CBA9B9196EE8D9005877BB /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA54E196EE671005877BB /* RootViewController.mm */; };
15CBA9CF196EE9FB005877BB /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C2196EE951005877BB /* AVFoundation.framework */; };
15CBA9D0196EEA05005877BB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C4196EE962005877BB /* UIKit.framework */; };
15CBA9D1196EEA1D005877BB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C0196EE943005877BB /* Foundation.framework */; };
15CBA9D2196EEA33005877BB /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C6196EE971005877BB /* OpenGLES.framework */; };
15CBA9D4196EEA33005877BB /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9D3196EEA33005877BB /* OpenAL.framework */; };
15CBA9D5196EEA43005877BB /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C8196EE97F005877BB /* CoreGraphics.framework */; };
15CBA9D7196EEA63005877BB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9D6196EEA63005877BB /* AudioToolbox.framework */; };
15CBA9D9196EEA7D005877BB /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9D8196EEA7D005877BB /* QuartzCore.framework */; };
15CBA9DB196EEA90005877BB /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9DA196EEA90005877BB /* CoreMotion.framework */; };
15CBA9DD196EEAA6005877BB /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9DC196EEAA6005877BB /* libz.dylib */; };
15CBA9DE196EEAF8005877BB /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E61773C1960FBD100DE83F5 /* GameController.framework */; };
15CBA9E0196EEBD4005877BB /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
15CBA9ED196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */; };
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCEC1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; };
15D1FCED1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; };
15D1FCEE1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; };
15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; };
15D1FCF01998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; };
15D1FCF11998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; };
15D1FCF21998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; };
15D1FCF31998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; };
15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; };
15D1FCF51998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; };
15D1FCF61998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; };
15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; };
15D1FCF81998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; };
15D1FCF91998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; };
15D1FCFA1998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; };
15D1FCFB1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; };
15D1FCFC1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; };
15D1FCFD1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; };
15D1FCFE1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; };
15D1FCFF1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; };
15D1FD001998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; };
15D1FD011998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; };
15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; };
15D1FD031998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; };
15D1FD041998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; };
15D1FD051998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; };
15D1FD061998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; };
15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; };
15D1FD081998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; };
15D1FD091998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; };
15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; };
15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; };
15D1FD0C1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; };
15D1FD0D1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; };
15D1FD0E1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; };
15D1FD0F1998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; };
15D1FD101998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; };
15D1FD111998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; };
15D1FD121998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; };
15D1FD131998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; };
15D1FD141998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; };
15D1FD151998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; };
15D1FD161998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; };
15D1FD171998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; };
15D1FD181998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; };
15D1FD191998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; };
15D1FD1A1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; };
15D1FD1B1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; };
15D1FD1C1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; };
15D1FD1D1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; };
15D1FD1E1998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; };
15D1FD1F1998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; };
15D1FD201998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; };
15D1FD211998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; };
15D1FD221998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; };
15D1FD231998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; };
15D1FD241998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; };
15D1FD251998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; };
15D1FD261998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; };
15D1FD271998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; };
15D1FD281998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; };
15D1FD291998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; };
15D1FD2A1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; };
15D1FD2B1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; };
15D1FD2C1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; };
15D1FD2D1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; };
15D1FD2E1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; };
15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; };
15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; };
15D1FD311998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; };
15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */; };
15D1FD35199863BA00302043 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */; };
15D1FD36199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */; };
15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */; };
15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD38199863CA00302043 /* AudioEngine.lua */; };
15D1FD3C199863CA00302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD38199863CA00302043 /* AudioEngine.lua */; };
15D1FD3D199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */; };
15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */; };
15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; };
15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; };
15D1FD45199863E800302043 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD41199863E800302043 /* CocoStudio.lua */; };
15D1FD46199863E800302043 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD41199863E800302043 /* CocoStudio.lua */; };
15D1FD47199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */; };
15D1FD48199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */; };
15D1FD49199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */; };
15D1FD4A199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */; };
15D1FD4B199863E800302043 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD44199863E800302043 /* StudioConstants.lua */; };
15D1FD4C199863E800302043 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD44199863E800302043 /* StudioConstants.lua */; };
15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; };
15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; };
15D1FD53199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */; };
15D1FD54199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */; };
15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */; };
15D1FD56199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */; };
15D1FD57199863F900302043 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD50199863F900302043 /* ExtensionConstants.lua */; };
15D1FD58199863F900302043 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD50199863F900302043 /* ExtensionConstants.lua */; };
15D1FD5D1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; };
15D1FD5E1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; };
15D1FD5F1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; };
15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; };
15D1FD611998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; };
15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; };
15D1FD631998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; };
15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; };
15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; };
15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; };
15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; };
15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; };
15D1FD691998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; };
15D1FD6A1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; };
15D1FD6B1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; };
15D1FD6C1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; };
15D1FD711998642800302043 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */; };
15D1FD721998642800302043 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */; };
15D1FD731998642800302043 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */; };
15D1FD741998642800302043 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */; };
15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */; };
15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */; };
15D1FD771998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; };
15D1FD781998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; };
issue #5255:Remove Sprite3D effect test
2014-05-22 10:22:10 +08:00
15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
Move `setSearchPat` operation from cpp to script
2014-05-22 14:00:39 +08:00
15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
15EE465B19A7200300AF29F1 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EE465A19A7200300AF29F1 /* libcurl.a */; };
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */; };
15EFA270198B25B9000C57D3 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
15EFA273198B265A000C57D3 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */; };
15EFA666198B34D7000C57D3 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; };
15EFA68B198B3AD8000C57D3 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; };
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; };
1A0EE2A818CDF6DA004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
1A0EE2A918CDF6DA004CD58F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; };
1A0EE2AA18CDF6DA004CD58F /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482A165F3979007D4F18 /* ApplicationServices.framework */; };
1A0EE2AB18CDF6DA004CD58F /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64828165F396B007D4F18 /* OpenAL.framework */; };
1A0EE2AC18CDF6DA004CD58F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; };
1A0EE2AD18CDF6DA004CD58F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; };
1A0EE2AE18CDF6DA004CD58F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
1A0EE2C918CDF733004CD58F /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
1A0EE2CA18CDF733004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA36018CD9AC00087CE3A /* libz.dylib */; };
1A0EE2CB18CDF733004CD58F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
1A0EE2CC18CDF733004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28B18CD91510087CE3A /* Foundation.framework */; };
1A0EE2CD18CDF733004CD58F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35C18CD9A9E0087CE3A /* AudioToolbox.framework */; };
1A0EE2CE18CDF733004CD58F /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35A18CD9A950087CE3A /* ApplicationServices.framework */; };
1A0EE2CF18CDF733004CD58F /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35818CD9A8F0087CE3A /* OpenAL.framework */; };
1A0EE2D018CDF733004CD58F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35618CD9A890087CE3A /* QuartzCore.framework */; };
1A0EE2D118CDF733004CD58F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35418CD9A820087CE3A /* OpenGL.framework */; };
1A0EE2D718CDF733004CD58F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
1A0EE40318CDF775004CD58F /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE40618CDF775004CD58F /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
1A0EE40718CDF775004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; };
1A0EE40818CDF775004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
1A0EE40918CDF775004CD58F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; };
1A0EE40A18CDF775004CD58F /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64828165F396B007D4F18 /* OpenAL.framework */; };
1A0EE40B18CDF775004CD58F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; };
1A0EE40C18CDF775004CD58F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52BB1783AEB80073F6A7 /* CoreGraphics.framework */; };
1A0EE40D18CDF775004CD58F /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B91783AE900073F6A7 /* OpenGLES.framework */; };
1A0EE40E18CDF775004CD58F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B71783AE6D0073F6A7 /* UIKit.framework */; };
1A0EE40F18CDF775004CD58F /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52C11783B01F0073F6A7 /* AVFoundation.framework */; };
1A0EE42C18CDF799004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3AF18CDA06D0087CE3A /* libz.dylib */; };
1A0EE42D18CDF799004CD58F /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
1A0EE42E18CDF799004CD58F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A818CD9F130087CE3A /* AudioToolbox.framework */; };
1A0EE42F18CDF799004CD58F /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A618CD9F0D0087CE3A /* OpenAL.framework */; };
1A0EE43018CDF799004CD58F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A418CD9F060087CE3A /* QuartzCore.framework */; };
1A0EE43118CDF799004CD58F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A218CD9EFE0087CE3A /* CoreGraphics.framework */; };
1A0EE43218CDF799004CD58F /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */; };
1A0EE43318CDF799004CD58F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */; };
1A0EE43418CDF799004CD58F /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; };
1A0EE43518CDF799004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
Lua xcode project fix
2014-05-08 14:58:53 +08:00
1A1645A6191B6281008C7C7F /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
1A1645A9191B6283008C7C7F /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
1A221C9C191771E300FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
1A221C9D191771E400FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1ABCA28718CD91510087CE3A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
1ABCA2C318CD92420087CE3A /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1ABCA2CE18CD93580087CE3A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
1ABCA35518CD9A820087CE3A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35418CD9A820087CE3A /* OpenGL.framework */; };
1ABCA35718CD9A890087CE3A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35618CD9A890087CE3A /* QuartzCore.framework */; };
1ABCA35918CD9A8F0087CE3A /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35818CD9A8F0087CE3A /* OpenAL.framework */; };
1ABCA35B18CD9A950087CE3A /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35A18CD9A950087CE3A /* ApplicationServices.framework */; };
1ABCA35D18CD9A9E0087CE3A /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35C18CD9A9E0087CE3A /* AudioToolbox.framework */; };
1ABCA35E18CD9AA50087CE3A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28B18CD91510087CE3A /* Foundation.framework */; };
1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA36018CD9AC00087CE3A /* libz.dylib */; };
1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; };
1ABCA39D18CD9ED80087CE3A /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; };
1ABCA39F18CD9EE50087CE3A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */; };
1ABCA3A118CD9EF60087CE3A /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */; };
1ABCA3A318CD9EFE0087CE3A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A218CD9EFE0087CE3A /* CoreGraphics.framework */; };
1ABCA3A518CD9F060087CE3A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A418CD9F060087CE3A /* QuartzCore.framework */; };
1ABCA3A718CD9F0D0087CE3A /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A618CD9F0D0087CE3A /* OpenAL.framework */; };
1ABCA3A918CD9F130087CE3A /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A818CD9F130087CE3A /* AudioToolbox.framework */; };
1ABCA3AA18CD9F1A0087CE3A /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
1ABCA3B018CDA06D0087CE3A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3AF18CDA06D0087CE3A /* libz.dylib */; };
1AC358C018CEC1BF00F37B72 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC358BB18CEC1BF00F37B72 /* AppDelegate.cpp */; };
1AC358C118CEC1BF00F37B72 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC358BB18CEC1BF00F37B72 /* AppDelegate.cpp */; };
1AC358C218CEC1BF00F37B72 /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC358BE18CEC1BF00F37B72 /* HelloWorldScene.cpp */; };
1AC358C318CEC1BF00F37B72 /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC358BE18CEC1BF00F37B72 /* HelloWorldScene.cpp */; };
1AC358DA18CEC1CB00F37B72 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC358C618CEC1CA00F37B72 /* AppController.mm */; };
1AC358DB18CEC1CB00F37B72 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358C718CEC1CA00F37B72 /* Default-568h@2x.png */; };
1AC358DC18CEC1CB00F37B72 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358C818CEC1CA00F37B72 /* Default.png */; };
1AC358DD18CEC1CB00F37B72 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358C918CEC1CA00F37B72 /* Default@2x.png */; };
1AC358DF18CEC1CB00F37B72 /* Icon-100.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358CC18CEC1CB00F37B72 /* Icon-100.png */; };
1AC358E018CEC1CB00F37B72 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358CD18CEC1CB00F37B72 /* Icon-114.png */; };
1AC358E118CEC1CB00F37B72 /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358CE18CEC1CB00F37B72 /* Icon-120.png */; };
1AC358E218CEC1CB00F37B72 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358CF18CEC1CB00F37B72 /* Icon-144.png */; };
1AC358E318CEC1CB00F37B72 /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358D018CEC1CB00F37B72 /* Icon-152.png */; };
1AC358E418CEC1CB00F37B72 /* Icon-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358D118CEC1CB00F37B72 /* Icon-40.png */; };
1AC358E518CEC1CB00F37B72 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358D218CEC1CB00F37B72 /* Icon-57.png */; };
1AC358E618CEC1CB00F37B72 /* Icon-58.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358D318CEC1CB00F37B72 /* Icon-58.png */; };
1AC358E718CEC1CB00F37B72 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358D418CEC1CB00F37B72 /* Icon-72.png */; };
1AC358E818CEC1CB00F37B72 /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358D518CEC1CB00F37B72 /* Icon-76.png */; };
1AC358E918CEC1CB00F37B72 /* Icon-80.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358D618CEC1CB00F37B72 /* Icon-80.png */; };
1AC358EA18CEC1CB00F37B72 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AC358D718CEC1CB00F37B72 /* main.m */; };
1AC358EB18CEC1CB00F37B72 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC358D918CEC1CB00F37B72 /* RootViewController.mm */; };
1AC358F518CEC1D400F37B72 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358ED18CEC1D400F37B72 /* InfoPlist.strings */; };
1AC358F618CEC1D400F37B72 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358EF18CEC1D400F37B72 /* MainMenu.xib */; };
1AC358F818CEC1D400F37B72 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358F318CEC1D400F37B72 /* Icon.icns */; };
1AC358F918CEC1D400F37B72 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC358F418CEC1D400F37B72 /* main.cpp */; };
1AC3590318CEC1FB00F37B72 /* bang.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358FE18CEC1FB00F37B72 /* bang.png */; };
1AC3590418CEC1FB00F37B72 /* bang.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358FE18CEC1FB00F37B72 /* bang.png */; };
1AC3590518CEC1FB00F37B72 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358FF18CEC1FB00F37B72 /* fonts */; };
1AC3590618CEC1FB00F37B72 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC358FF18CEC1FB00F37B72 /* fonts */; };
1AC3590718CEC1FB00F37B72 /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3590018CEC1FB00F37B72 /* ipad */; };
1AC3590818CEC1FB00F37B72 /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3590018CEC1FB00F37B72 /* ipad */; };
1AC3590918CEC1FB00F37B72 /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3590118CEC1FB00F37B72 /* ipadhd */; };
1AC3590A18CEC1FB00F37B72 /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3590118CEC1FB00F37B72 /* ipadhd */; };
1AC3590B18CEC1FB00F37B72 /* iphone in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3590218CEC1FB00F37B72 /* iphone */; };
1AC3590C18CEC1FB00F37B72 /* iphone in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3590218CEC1FB00F37B72 /* iphone */; };
1AC35B2118CECF0C00F37B72 /* ActionManagerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3592918CECF0A00F37B72 /* ActionManagerTest.cpp */; };
1AC35B2218CECF0C00F37B72 /* ActionManagerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3592918CECF0A00F37B72 /* ActionManagerTest.cpp */; };
1AC35B2318CECF0C00F37B72 /* ActionsEaseTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3592C18CECF0A00F37B72 /* ActionsEaseTest.cpp */; };
1AC35B2418CECF0C00F37B72 /* ActionsEaseTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3592C18CECF0A00F37B72 /* ActionsEaseTest.cpp */; };
1AC35B2518CECF0C00F37B72 /* ActionsProgressTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3592F18CECF0A00F37B72 /* ActionsProgressTest.cpp */; };
1AC35B2618CECF0C00F37B72 /* ActionsProgressTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3592F18CECF0A00F37B72 /* ActionsProgressTest.cpp */; };
1AC35B2718CECF0C00F37B72 /* ActionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593218CECF0A00F37B72 /* ActionsTest.cpp */; };
1AC35B2818CECF0C00F37B72 /* ActionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593218CECF0A00F37B72 /* ActionsTest.cpp */; };
1AC35B2918CECF0C00F37B72 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593418CECF0A00F37B72 /* AppDelegate.cpp */; };
1AC35B2A18CECF0C00F37B72 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593418CECF0A00F37B72 /* AppDelegate.cpp */; };
1AC35B2B18CECF0C00F37B72 /* BaseTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593618CECF0A00F37B72 /* BaseTest.cpp */; };
1AC35B2C18CECF0C00F37B72 /* BaseTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593618CECF0A00F37B72 /* BaseTest.cpp */; };
1AC35B2D18CECF0C00F37B72 /* Box2dTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593918CECF0A00F37B72 /* Box2dTest.cpp */; };
1AC35B2E18CECF0C00F37B72 /* Box2dTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593918CECF0A00F37B72 /* Box2dTest.cpp */; };
1AC35B2F18CECF0C00F37B72 /* Box2dView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593C18CECF0A00F37B72 /* Box2dView.cpp */; };
1AC35B3018CECF0C00F37B72 /* Box2dView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593C18CECF0A00F37B72 /* Box2dView.cpp */; };
1AC35B3118CECF0C00F37B72 /* GLES-Render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593E18CECF0A00F37B72 /* GLES-Render.cpp */; };
1AC35B3218CECF0C00F37B72 /* GLES-Render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3593E18CECF0A00F37B72 /* GLES-Render.cpp */; };
1AC35B3318CECF0C00F37B72 /* Test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3594018CECF0A00F37B72 /* Test.cpp */; };
1AC35B3418CECF0C00F37B72 /* Test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3594018CECF0A00F37B72 /* Test.cpp */; };
1AC35B3518CECF0C00F37B72 /* TestEntries.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3594218CECF0A00F37B72 /* TestEntries.cpp */; };
1AC35B3618CECF0C00F37B72 /* TestEntries.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3594218CECF0A00F37B72 /* TestEntries.cpp */; };
1AC35B3718CECF0C00F37B72 /* Bug-1159.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3597718CECF0B00F37B72 /* Bug-1159.cpp */; };
1AC35B3818CECF0C00F37B72 /* Bug-1159.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3597718CECF0B00F37B72 /* Bug-1159.cpp */; };
1AC35B3918CECF0C00F37B72 /* Bug-1174.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3597918CECF0B00F37B72 /* Bug-1174.cpp */; };
1AC35B3A18CECF0C00F37B72 /* Bug-1174.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3597918CECF0B00F37B72 /* Bug-1174.cpp */; };
1AC35B3B18CECF0C00F37B72 /* Bug-350.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3597B18CECF0B00F37B72 /* Bug-350.cpp */; };
1AC35B3C18CECF0C00F37B72 /* Bug-350.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3597B18CECF0B00F37B72 /* Bug-350.cpp */; };
1AC35B3D18CECF0C00F37B72 /* Bug-422.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3597D18CECF0B00F37B72 /* Bug-422.cpp */; };
1AC35B3E18CECF0C00F37B72 /* Bug-422.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3597D18CECF0B00F37B72 /* Bug-422.cpp */; };
1AC35B3F18CECF0C00F37B72 /* Bug-458.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598018CECF0B00F37B72 /* Bug-458.cpp */; };
1AC35B4018CECF0C00F37B72 /* Bug-458.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598018CECF0B00F37B72 /* Bug-458.cpp */; };
1AC35B4118CECF0C00F37B72 /* QuestionContainerSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598218CECF0B00F37B72 /* QuestionContainerSprite.cpp */; };
1AC35B4218CECF0C00F37B72 /* QuestionContainerSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598218CECF0B00F37B72 /* QuestionContainerSprite.cpp */; };
1AC35B4318CECF0C00F37B72 /* Bug-624.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598418CECF0B00F37B72 /* Bug-624.cpp */; };
1AC35B4418CECF0C00F37B72 /* Bug-624.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598418CECF0B00F37B72 /* Bug-624.cpp */; };
1AC35B4518CECF0C00F37B72 /* Bug-886.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598618CECF0B00F37B72 /* Bug-886.cpp */; };
1AC35B4618CECF0C00F37B72 /* Bug-886.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598618CECF0B00F37B72 /* Bug-886.cpp */; };
1AC35B4718CECF0C00F37B72 /* Bug-899.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598818CECF0B00F37B72 /* Bug-899.cpp */; };
1AC35B4818CECF0C00F37B72 /* Bug-899.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598818CECF0B00F37B72 /* Bug-899.cpp */; };
1AC35B4918CECF0C00F37B72 /* Bug-914.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598A18CECF0B00F37B72 /* Bug-914.cpp */; };
1AC35B4A18CECF0C00F37B72 /* Bug-914.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598A18CECF0B00F37B72 /* Bug-914.cpp */; };
1AC35B4B18CECF0C00F37B72 /* BugsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598C18CECF0B00F37B72 /* BugsTest.cpp */; };
1AC35B4C18CECF0C00F37B72 /* BugsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598C18CECF0B00F37B72 /* BugsTest.cpp */; };
1AC35B4D18CECF0C00F37B72 /* ChipmunkTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598F18CECF0B00F37B72 /* ChipmunkTest.cpp */; };
1AC35B4E18CECF0C00F37B72 /* ChipmunkTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3598F18CECF0B00F37B72 /* ChipmunkTest.cpp */; };
1AC35B4F18CECF0C00F37B72 /* ClickAndMoveTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599218CECF0B00F37B72 /* ClickAndMoveTest.cpp */; };
1AC35B5018CECF0C00F37B72 /* ClickAndMoveTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599218CECF0B00F37B72 /* ClickAndMoveTest.cpp */; };
1AC35B5118CECF0C00F37B72 /* ClippingNodeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599518CECF0B00F37B72 /* ClippingNodeTest.cpp */; };
1AC35B5218CECF0C00F37B72 /* ClippingNodeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599518CECF0B00F37B72 /* ClippingNodeTest.cpp */; };
1AC35B5318CECF0C00F37B72 /* CocosDenshionTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599818CECF0B00F37B72 /* CocosDenshionTest.cpp */; };
1AC35B5418CECF0C00F37B72 /* CocosDenshionTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599818CECF0B00F37B72 /* CocosDenshionTest.cpp */; };
1AC35B5518CECF0C00F37B72 /* ConfigurationTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599B18CECF0B00F37B72 /* ConfigurationTest.cpp */; };
1AC35B5618CECF0C00F37B72 /* ConfigurationTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599B18CECF0B00F37B72 /* ConfigurationTest.cpp */; };
1AC35B5718CECF0C00F37B72 /* ConsoleTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599E18CECF0B00F37B72 /* ConsoleTest.cpp */; };
1AC35B5818CECF0C00F37B72 /* ConsoleTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3599E18CECF0B00F37B72 /* ConsoleTest.cpp */; };
1AC35B5918CECF0C00F37B72 /* controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359A018CECF0B00F37B72 /* controller.cpp */; };
1AC35B5A18CECF0C00F37B72 /* controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359A018CECF0B00F37B72 /* controller.cpp */; };
1AC35B5B18CECF0C00F37B72 /* CurlTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359A318CECF0B00F37B72 /* CurlTest.cpp */; };
1AC35B5C18CECF0C00F37B72 /* CurlTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359A318CECF0B00F37B72 /* CurlTest.cpp */; };
1AC35B5D18CECF0C00F37B72 /* CurrentLanguageTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359A618CECF0B00F37B72 /* CurrentLanguageTest.cpp */; };
1AC35B5E18CECF0C00F37B72 /* CurrentLanguageTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359A618CECF0B00F37B72 /* CurrentLanguageTest.cpp */; };
1AC35B5F18CECF0C00F37B72 /* DataVisitorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359A918CECF0B00F37B72 /* DataVisitorTest.cpp */; };
1AC35B6018CECF0C00F37B72 /* DataVisitorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359A918CECF0B00F37B72 /* DataVisitorTest.cpp */; };
1AC35B6118CECF0C00F37B72 /* DrawPrimitivesTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359AC18CECF0B00F37B72 /* DrawPrimitivesTest.cpp */; };
1AC35B6218CECF0C00F37B72 /* DrawPrimitivesTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359AC18CECF0B00F37B72 /* DrawPrimitivesTest.cpp */; };
1AC35B6318CECF0C00F37B72 /* EffectsAdvancedTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359AF18CECF0B00F37B72 /* EffectsAdvancedTest.cpp */; };
1AC35B6418CECF0C00F37B72 /* EffectsAdvancedTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359AF18CECF0B00F37B72 /* EffectsAdvancedTest.cpp */; };
1AC35B6518CECF0C00F37B72 /* EffectsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359B218CECF0B00F37B72 /* EffectsTest.cpp */; };
1AC35B6618CECF0C00F37B72 /* EffectsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359B218CECF0B00F37B72 /* EffectsTest.cpp */; };
1AC35B6718CECF0C00F37B72 /* AnimationsTestLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359B818CECF0B00F37B72 /* AnimationsTestLayer.cpp */; };
1AC35B6818CECF0C00F37B72 /* AnimationsTestLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359B818CECF0B00F37B72 /* AnimationsTestLayer.cpp */; };
1AC35B6918CECF0C00F37B72 /* ButtonTestLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359BB18CECF0B00F37B72 /* ButtonTestLayer.cpp */; };
1AC35B6A18CECF0C00F37B72 /* ButtonTestLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359BB18CECF0B00F37B72 /* ButtonTestLayer.cpp */; };
1AC35B6B18CECF0C00F37B72 /* CocosBuilderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359BE18CECF0B00F37B72 /* CocosBuilderTest.cpp */; };
1AC35B6C18CECF0C00F37B72 /* CocosBuilderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359BE18CECF0B00F37B72 /* CocosBuilderTest.cpp */; };
1AC35B6D18CECF0C00F37B72 /* HelloCocosBuilderLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359C118CECF0B00F37B72 /* HelloCocosBuilderLayer.cpp */; };
1AC35B6E18CECF0C00F37B72 /* HelloCocosBuilderLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359C118CECF0B00F37B72 /* HelloCocosBuilderLayer.cpp */; };
1AC35B6F18CECF0C00F37B72 /* MenuTestLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359C818CECF0B00F37B72 /* MenuTestLayer.cpp */; };
1AC35B7018CECF0C00F37B72 /* MenuTestLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359C818CECF0B00F37B72 /* MenuTestLayer.cpp */; };
1AC35B7118CECF0C00F37B72 /* TestHeaderLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359D518CECF0B00F37B72 /* TestHeaderLayer.cpp */; };
1AC35B7218CECF0C00F37B72 /* TestHeaderLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359D518CECF0B00F37B72 /* TestHeaderLayer.cpp */; };
1AC35B7318CECF0C00F37B72 /* TimelineCallbackTestLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359DA18CECF0B00F37B72 /* TimelineCallbackTestLayer.cpp */; };
1AC35B7418CECF0C00F37B72 /* TimelineCallbackTestLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359DA18CECF0B00F37B72 /* TimelineCallbackTestLayer.cpp */; };
1AC35B7518CECF0C00F37B72 /* ArmatureScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359DD18CECF0B00F37B72 /* ArmatureScene.cpp */; };
1AC35B7618CECF0C00F37B72 /* ArmatureScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359DD18CECF0B00F37B72 /* ArmatureScene.cpp */; };
1AC35B7718CECF0C00F37B72 /* ComponentsTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E018CECF0B00F37B72 /* ComponentsTestScene.cpp */; };
1AC35B7818CECF0C00F37B72 /* ComponentsTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E018CECF0B00F37B72 /* ComponentsTestScene.cpp */; };
1AC35B7918CECF0C00F37B72 /* EnemyController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E218CECF0B00F37B72 /* EnemyController.cpp */; };
1AC35B7A18CECF0C00F37B72 /* EnemyController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E218CECF0B00F37B72 /* EnemyController.cpp */; };
1AC35B7B18CECF0C00F37B72 /* GameOverScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E418CECF0B00F37B72 /* GameOverScene.cpp */; };
1AC35B7C18CECF0C00F37B72 /* GameOverScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E418CECF0B00F37B72 /* GameOverScene.cpp */; };
1AC35B7D18CECF0C00F37B72 /* PlayerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E618CECF0B00F37B72 /* PlayerController.cpp */; };
1AC35B7E18CECF0C00F37B72 /* PlayerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E618CECF0B00F37B72 /* PlayerController.cpp */; };
1AC35B7F18CECF0C00F37B72 /* ProjectileController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E818CECF0B00F37B72 /* ProjectileController.cpp */; };
1AC35B8018CECF0C00F37B72 /* ProjectileController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359E818CECF0B00F37B72 /* ProjectileController.cpp */; };
1AC35B8118CECF0C00F37B72 /* SceneController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359EA18CECF0B00F37B72 /* SceneController.cpp */; };
1AC35B8218CECF0C00F37B72 /* SceneController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC359EA18CECF0B00F37B72 /* SceneController.cpp */; };
1AC35BDB18CECF0C00F37B72 /* SceneEditorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A5918CECF0B00F37B72 /* SceneEditorTest.cpp */; };
1AC35BDC18CECF0C00F37B72 /* SceneEditorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A5918CECF0B00F37B72 /* SceneEditorTest.cpp */; };
1AC35BDD18CECF0C00F37B72 /* acts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A5C18CECF0B00F37B72 /* acts.cpp */; };
1AC35BDE18CECF0C00F37B72 /* acts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A5C18CECF0B00F37B72 /* acts.cpp */; };
1AC35BDF18CECF0C00F37B72 /* cons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A5E18CECF0B00F37B72 /* cons.cpp */; };
1AC35BE018CECF0C00F37B72 /* cons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A5E18CECF0B00F37B72 /* cons.cpp */; };
1AC35BE118CECF0C00F37B72 /* CCControlButtonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6318CECF0B00F37B72 /* CCControlButtonTest.cpp */; };
1AC35BE218CECF0C00F37B72 /* CCControlButtonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6318CECF0B00F37B72 /* CCControlButtonTest.cpp */; };
1AC35BE318CECF0C00F37B72 /* CCControlColourPickerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6618CECF0B00F37B72 /* CCControlColourPickerTest.cpp */; };
1AC35BE418CECF0C00F37B72 /* CCControlColourPickerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6618CECF0B00F37B72 /* CCControlColourPickerTest.cpp */; };
1AC35BE518CECF0C00F37B72 /* CCControlPotentiometerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6918CECF0B00F37B72 /* CCControlPotentiometerTest.cpp */; };
1AC35BE618CECF0C00F37B72 /* CCControlPotentiometerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6918CECF0B00F37B72 /* CCControlPotentiometerTest.cpp */; };
1AC35BE718CECF0C00F37B72 /* CCControlScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6B18CECF0B00F37B72 /* CCControlScene.cpp */; };
1AC35BE818CECF0C00F37B72 /* CCControlScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6B18CECF0B00F37B72 /* CCControlScene.cpp */; };
1AC35BE918CECF0C00F37B72 /* CCControlSceneManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6D18CECF0B00F37B72 /* CCControlSceneManager.cpp */; };
1AC35BEA18CECF0C00F37B72 /* CCControlSceneManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A6D18CECF0B00F37B72 /* CCControlSceneManager.cpp */; };
1AC35BEB18CECF0C00F37B72 /* CCControlSliderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7018CECF0B00F37B72 /* CCControlSliderTest.cpp */; };
1AC35BEC18CECF0C00F37B72 /* CCControlSliderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7018CECF0B00F37B72 /* CCControlSliderTest.cpp */; };
1AC35BED18CECF0C00F37B72 /* CCControlStepperTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7318CECF0B00F37B72 /* CCControlStepperTest.cpp */; };
1AC35BEE18CECF0C00F37B72 /* CCControlStepperTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7318CECF0B00F37B72 /* CCControlStepperTest.cpp */; };
1AC35BEF18CECF0C00F37B72 /* CCControlSwitchTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7618CECF0B00F37B72 /* CCControlSwitchTest.cpp */; };
1AC35BF018CECF0C00F37B72 /* CCControlSwitchTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7618CECF0B00F37B72 /* CCControlSwitchTest.cpp */; };
1AC35BF118CECF0C00F37B72 /* EditBoxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7918CECF0B00F37B72 /* EditBoxTest.cpp */; };
1AC35BF218CECF0C00F37B72 /* EditBoxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7918CECF0B00F37B72 /* EditBoxTest.cpp */; };
1AC35BF318CECF0C00F37B72 /* ExtensionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7B18CECF0B00F37B72 /* ExtensionsTest.cpp */; };
1AC35BF418CECF0C00F37B72 /* ExtensionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7B18CECF0B00F37B72 /* ExtensionsTest.cpp */; };
1AC35BF518CECF0C00F37B72 /* HttpClientTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7E18CECF0B00F37B72 /* HttpClientTest.cpp */; };
1AC35BF618CECF0C00F37B72 /* HttpClientTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A7E18CECF0B00F37B72 /* HttpClientTest.cpp */; };
1AC35BF718CECF0C00F37B72 /* SocketIOTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8018CECF0B00F37B72 /* SocketIOTest.cpp */; };
1AC35BF818CECF0C00F37B72 /* SocketIOTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8018CECF0B00F37B72 /* SocketIOTest.cpp */; };
1AC35BF918CECF0C00F37B72 /* WebSocketTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8218CECF0B00F37B72 /* WebSocketTest.cpp */; };
1AC35BFA18CECF0C00F37B72 /* WebSocketTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8218CECF0B00F37B72 /* WebSocketTest.cpp */; };
1AC35BFB18CECF0C00F37B72 /* NotificationCenterTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8518CECF0B00F37B72 /* NotificationCenterTest.cpp */; };
1AC35BFC18CECF0C00F37B72 /* NotificationCenterTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8518CECF0B00F37B72 /* NotificationCenterTest.cpp */; };
1AC35BFD18CECF0C00F37B72 /* Scale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8818CECF0B00F37B72 /* Scale9SpriteTest.cpp */; };
1AC35BFE18CECF0C00F37B72 /* Scale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8818CECF0B00F37B72 /* Scale9SpriteTest.cpp */; };
1AC35BFF18CECF0C00F37B72 /* CustomTableViewCell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8B18CECF0B00F37B72 /* CustomTableViewCell.cpp */; };
1AC35C0018CECF0C00F37B72 /* CustomTableViewCell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8B18CECF0B00F37B72 /* CustomTableViewCell.cpp */; };
1AC35C0118CECF0C00F37B72 /* TableViewTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8D18CECF0B00F37B72 /* TableViewTestScene.cpp */; };
1AC35C0218CECF0C00F37B72 /* TableViewTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A8D18CECF0B00F37B72 /* TableViewTestScene.cpp */; };
1AC35C0318CECF0C00F37B72 /* FileUtilsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9018CECF0B00F37B72 /* FileUtilsTest.cpp */; };
1AC35C0418CECF0C00F37B72 /* FileUtilsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9018CECF0B00F37B72 /* FileUtilsTest.cpp */; };
1AC35C0518CECF0C00F37B72 /* FontTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9318CECF0B00F37B72 /* FontTest.cpp */; };
1AC35C0618CECF0C00F37B72 /* FontTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9318CECF0B00F37B72 /* FontTest.cpp */; };
1AC35C0718CECF0C00F37B72 /* MouseTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9618CECF0B00F37B72 /* MouseTest.cpp */; };
1AC35C0818CECF0C00F37B72 /* MouseTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9618CECF0B00F37B72 /* MouseTest.cpp */; };
1AC35C0918CECF0C00F37B72 /* IntervalTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9918CECF0B00F37B72 /* IntervalTest.cpp */; };
1AC35C0A18CECF0C00F37B72 /* IntervalTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9918CECF0B00F37B72 /* IntervalTest.cpp */; };
1AC35C0F18CECF0C00F37B72 /* LabelTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */; };
1AC35C1018CECF0C00F37B72 /* LabelTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */; };
1AC35C1118CECF0C00F37B72 /* LabelTestNew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AA418CECF0C00F37B72 /* LabelTestNew.cpp */; };
1AC35C1218CECF0C00F37B72 /* LabelTestNew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AA418CECF0C00F37B72 /* LabelTestNew.cpp */; };
1AC35C1318CECF0C00F37B72 /* LayerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AA718CECF0C00F37B72 /* LayerTest.cpp */; };
1AC35C1418CECF0C00F37B72 /* LayerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AA718CECF0C00F37B72 /* LayerTest.cpp */; };
1AC35C1518CECF0C00F37B72 /* MenuTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AAA18CECF0C00F37B72 /* MenuTest.cpp */; };
1AC35C1618CECF0C00F37B72 /* MenuTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AAA18CECF0C00F37B72 /* MenuTest.cpp */; };
1AC35C1718CECF0C00F37B72 /* MotionStreakTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AAD18CECF0C00F37B72 /* MotionStreakTest.cpp */; };
1AC35C1818CECF0C00F37B72 /* MotionStreakTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AAD18CECF0C00F37B72 /* MotionStreakTest.cpp */; };
1AC35C1918CECF0C00F37B72 /* MutiTouchTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AB018CECF0C00F37B72 /* MutiTouchTest.cpp */; };
1AC35C1A18CECF0C00F37B72 /* MutiTouchTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AB018CECF0C00F37B72 /* MutiTouchTest.cpp */; };
1AC35C1B18CECF0C00F37B72 /* NewEventDispatcherTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AB318CECF0C00F37B72 /* NewEventDispatcherTest.cpp */; };
1AC35C1C18CECF0C00F37B72 /* NewEventDispatcherTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AB318CECF0C00F37B72 /* NewEventDispatcherTest.cpp */; };
1AC35C1D18CECF0C00F37B72 /* NewRendererTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AB618CECF0C00F37B72 /* NewRendererTest.cpp */; };
1AC35C1E18CECF0C00F37B72 /* NewRendererTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AB618CECF0C00F37B72 /* NewRendererTest.cpp */; };
1AC35C1F18CECF0C00F37B72 /* NodeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AB918CECF0C00F37B72 /* NodeTest.cpp */; };
1AC35C2018CECF0C00F37B72 /* NodeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AB918CECF0C00F37B72 /* NodeTest.cpp */; };
1AC35C2118CECF0C00F37B72 /* ParallaxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ABC18CECF0C00F37B72 /* ParallaxTest.cpp */; };
1AC35C2218CECF0C00F37B72 /* ParallaxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ABC18CECF0C00F37B72 /* ParallaxTest.cpp */; };
1AC35C2318CECF0C00F37B72 /* ParticleTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ABF18CECF0C00F37B72 /* ParticleTest.cpp */; };
1AC35C2418CECF0C00F37B72 /* ParticleTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ABF18CECF0C00F37B72 /* ParticleTest.cpp */; };
1AC35C2518CECF0C00F37B72 /* PerformanceAllocTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AC218CECF0C00F37B72 /* PerformanceAllocTest.cpp */; };
1AC35C2618CECF0C00F37B72 /* PerformanceAllocTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AC218CECF0C00F37B72 /* PerformanceAllocTest.cpp */; };
1AC35C2718CECF0C00F37B72 /* PerformanceContainerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AC418CECF0C00F37B72 /* PerformanceContainerTest.cpp */; };
1AC35C2818CECF0C00F37B72 /* PerformanceContainerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AC418CECF0C00F37B72 /* PerformanceContainerTest.cpp */; };
1AC35C2918CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AC618CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp */; };
1AC35C2A18CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AC618CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp */; };
1AC35C2B18CECF0C00F37B72 /* PerformanceLabelTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AC818CECF0C00F37B72 /* PerformanceLabelTest.cpp */; };
1AC35C2C18CECF0C00F37B72 /* PerformanceLabelTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AC818CECF0C00F37B72 /* PerformanceLabelTest.cpp */; };
1AC35C2D18CECF0C00F37B72 /* PerformanceNodeChildrenTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ACA18CECF0C00F37B72 /* PerformanceNodeChildrenTest.cpp */; };
1AC35C2E18CECF0C00F37B72 /* PerformanceNodeChildrenTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ACA18CECF0C00F37B72 /* PerformanceNodeChildrenTest.cpp */; };
1AC35C2F18CECF0C00F37B72 /* PerformanceParticleTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ACC18CECF0C00F37B72 /* PerformanceParticleTest.cpp */; };
1AC35C3018CECF0C00F37B72 /* PerformanceParticleTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ACC18CECF0C00F37B72 /* PerformanceParticleTest.cpp */; };
1AC35C3118CECF0C00F37B72 /* PerformanceRendererTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ACE18CECF0C00F37B72 /* PerformanceRendererTest.cpp */; };
1AC35C3218CECF0C00F37B72 /* PerformanceRendererTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ACE18CECF0C00F37B72 /* PerformanceRendererTest.cpp */; };
1AC35C3318CECF0C00F37B72 /* PerformanceScenarioTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD018CECF0C00F37B72 /* PerformanceScenarioTest.cpp */; };
1AC35C3418CECF0C00F37B72 /* PerformanceScenarioTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD018CECF0C00F37B72 /* PerformanceScenarioTest.cpp */; };
1AC35C3518CECF0C00F37B72 /* PerformanceSpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD218CECF0C00F37B72 /* PerformanceSpriteTest.cpp */; };
1AC35C3618CECF0C00F37B72 /* PerformanceSpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD218CECF0C00F37B72 /* PerformanceSpriteTest.cpp */; };
1AC35C3718CECF0C00F37B72 /* PerformanceTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD418CECF0C00F37B72 /* PerformanceTest.cpp */; };
1AC35C3818CECF0C00F37B72 /* PerformanceTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD418CECF0C00F37B72 /* PerformanceTest.cpp */; };
1AC35C3918CECF0C00F37B72 /* PerformanceTextureTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD618CECF0C00F37B72 /* PerformanceTextureTest.cpp */; };
1AC35C3A18CECF0C00F37B72 /* PerformanceTextureTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD618CECF0C00F37B72 /* PerformanceTextureTest.cpp */; };
1AC35C3B18CECF0C00F37B72 /* PerformanceTouchesTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD818CECF0C00F37B72 /* PerformanceTouchesTest.cpp */; };
1AC35C3C18CECF0C00F37B72 /* PerformanceTouchesTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AD818CECF0C00F37B72 /* PerformanceTouchesTest.cpp */; };
1AC35C3D18CECF0C00F37B72 /* PhysicsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ADB18CECF0C00F37B72 /* PhysicsTest.cpp */; };
1AC35C3E18CECF0C00F37B72 /* PhysicsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ADB18CECF0C00F37B72 /* PhysicsTest.cpp */; };
1AC35C3F18CECF0C00F37B72 /* ReleasePoolTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ADE18CECF0C00F37B72 /* ReleasePoolTest.cpp */; };
1AC35C4018CECF0C00F37B72 /* ReleasePoolTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35ADE18CECF0C00F37B72 /* ReleasePoolTest.cpp */; };
1AC35C4118CECF0C00F37B72 /* RenderTextureTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AE118CECF0C00F37B72 /* RenderTextureTest.cpp */; };
1AC35C4218CECF0C00F37B72 /* RenderTextureTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AE118CECF0C00F37B72 /* RenderTextureTest.cpp */; };
1AC35C4318CECF0C00F37B72 /* RotateWorldTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AE418CECF0C00F37B72 /* RotateWorldTest.cpp */; };
1AC35C4418CECF0C00F37B72 /* RotateWorldTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AE418CECF0C00F37B72 /* RotateWorldTest.cpp */; };
1AC35C4518CECF0C00F37B72 /* SceneTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AE718CECF0C00F37B72 /* SceneTest.cpp */; };
1AC35C4618CECF0C00F37B72 /* SceneTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AE718CECF0C00F37B72 /* SceneTest.cpp */; };
1AC35C4718CECF0C00F37B72 /* SchedulerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AEA18CECF0C00F37B72 /* SchedulerTest.cpp */; };
1AC35C4818CECF0C00F37B72 /* SchedulerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AEA18CECF0C00F37B72 /* SchedulerTest.cpp */; };
1AC35C4918CECF0C00F37B72 /* ShaderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AED18CECF0C00F37B72 /* ShaderTest.cpp */; };
1AC35C4A18CECF0C00F37B72 /* ShaderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AED18CECF0C00F37B72 /* ShaderTest.cpp */; };
1AC35C4B18CECF0C00F37B72 /* ShaderTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AEF18CECF0C00F37B72 /* ShaderTest2.cpp */; };
1AC35C4C18CECF0C00F37B72 /* ShaderTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AEF18CECF0C00F37B72 /* ShaderTest2.cpp */; };
1AC35C4D18CECF0C00F37B72 /* SpineTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AF218CECF0C00F37B72 /* SpineTest.cpp */; };
1AC35C4E18CECF0C00F37B72 /* SpineTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AF218CECF0C00F37B72 /* SpineTest.cpp */; };
1AC35C4F18CECF0C00F37B72 /* SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AF518CECF0C00F37B72 /* SpriteTest.cpp */; };
1AC35C5018CECF0C00F37B72 /* SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AF518CECF0C00F37B72 /* SpriteTest.cpp */; };
1AC35C5118CECF0C00F37B72 /* testBasic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AF718CECF0C00F37B72 /* testBasic.cpp */; };
1AC35C5218CECF0C00F37B72 /* testBasic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AF718CECF0C00F37B72 /* testBasic.cpp */; };
1AC35C5318CECF0C00F37B72 /* TextInputTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AFC18CECF0C00F37B72 /* TextInputTest.cpp */; };
1AC35C5418CECF0C00F37B72 /* TextInputTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AFC18CECF0C00F37B72 /* TextInputTest.cpp */; };
1AC35C5518CECF0C00F37B72 /* Texture2dTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AFF18CECF0C00F37B72 /* Texture2dTest.cpp */; };
1AC35C5618CECF0C00F37B72 /* Texture2dTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AFF18CECF0C00F37B72 /* Texture2dTest.cpp */; };
1AC35C5718CECF0C00F37B72 /* TextureCacheTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0218CECF0C00F37B72 /* TextureCacheTest.cpp */; };
1AC35C5818CECF0C00F37B72 /* TextureCacheTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0218CECF0C00F37B72 /* TextureCacheTest.cpp */; };
1AC35C5918CECF0C00F37B72 /* TextureAtlasEncryptionTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0518CECF0C00F37B72 /* TextureAtlasEncryptionTest.cpp */; };
1AC35C5A18CECF0C00F37B72 /* TextureAtlasEncryptionTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0518CECF0C00F37B72 /* TextureAtlasEncryptionTest.cpp */; };
1AC35C5B18CECF0C00F37B72 /* TileMapTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0818CECF0C00F37B72 /* TileMapTest.cpp */; };
1AC35C5C18CECF0C00F37B72 /* TileMapTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0818CECF0C00F37B72 /* TileMapTest.cpp */; };
1AC35C5D18CECF0C00F37B72 /* Ball.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0B18CECF0C00F37B72 /* Ball.cpp */; };
1AC35C5E18CECF0C00F37B72 /* Ball.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0B18CECF0C00F37B72 /* Ball.cpp */; };
1AC35C5F18CECF0C00F37B72 /* Paddle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0D18CECF0C00F37B72 /* Paddle.cpp */; };
1AC35C6018CECF0C00F37B72 /* Paddle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0D18CECF0C00F37B72 /* Paddle.cpp */; };
1AC35C6118CECF0C00F37B72 /* TouchesTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0F18CECF0C00F37B72 /* TouchesTest.cpp */; };
1AC35C6218CECF0C00F37B72 /* TouchesTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B0F18CECF0C00F37B72 /* TouchesTest.cpp */; };
1AC35C6318CECF0C00F37B72 /* TransitionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1218CECF0C00F37B72 /* TransitionsTest.cpp */; };
1AC35C6418CECF0C00F37B72 /* TransitionsTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1218CECF0C00F37B72 /* TransitionsTest.cpp */; };
1AC35C6518CECF0C00F37B72 /* UnitTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1518CECF0C00F37B72 /* UnitTest.cpp */; };
1AC35C6618CECF0C00F37B72 /* UnitTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1518CECF0C00F37B72 /* UnitTest.cpp */; };
1AC35C6718CECF0C00F37B72 /* UserDefaultTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1818CECF0C00F37B72 /* UserDefaultTest.cpp */; };
1AC35C6818CECF0C00F37B72 /* UserDefaultTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1818CECF0C00F37B72 /* UserDefaultTest.cpp */; };
1AC35C6918CECF0C00F37B72 /* VisibleRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1A18CECF0C00F37B72 /* VisibleRect.cpp */; };
1AC35C6A18CECF0C00F37B72 /* VisibleRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1A18CECF0C00F37B72 /* VisibleRect.cpp */; };
1AC35C6B18CECF0C00F37B72 /* ZwoptexTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1D18CECF0C00F37B72 /* ZwoptexTest.cpp */; };
1AC35C6C18CECF0C00F37B72 /* ZwoptexTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35B1D18CECF0C00F37B72 /* ZwoptexTest.cpp */; };
1AC35C8618CECF1400F37B72 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35C7018CECF1400F37B72 /* RootViewController.mm */; };
1AC35C8718CECF1400F37B72 /* testsAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35C7218CECF1400F37B72 /* testsAppDelegate.mm */; };
1AC35C8818CECF1400F37B72 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7318CECF1400F37B72 /* Default-568h@2x.png */; };
1AC35C8918CECF1400F37B72 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7418CECF1400F37B72 /* Default.png */; };
1AC35C8A18CECF1400F37B72 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7518CECF1400F37B72 /* Default@2x.png */; };
1AC35C8B18CECF1400F37B72 /* Icon-100.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7618CECF1400F37B72 /* Icon-100.png */; };
1AC35C8C18CECF1400F37B72 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7718CECF1400F37B72 /* Icon-114.png */; };
1AC35C8D18CECF1400F37B72 /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7818CECF1400F37B72 /* Icon-120.png */; };
1AC35C8E18CECF1400F37B72 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7918CECF1400F37B72 /* Icon-144.png */; };
1AC35C8F18CECF1400F37B72 /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7A18CECF1400F37B72 /* Icon-152.png */; };
1AC35C9018CECF1400F37B72 /* Icon-29.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7B18CECF1400F37B72 /* Icon-29.png */; };
1AC35C9118CECF1400F37B72 /* Icon-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7C18CECF1400F37B72 /* Icon-40.png */; };
1AC35C9218CECF1400F37B72 /* Icon-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7D18CECF1400F37B72 /* Icon-50.png */; };
1AC35C9318CECF1400F37B72 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7E18CECF1400F37B72 /* Icon-57.png */; };
1AC35C9418CECF1400F37B72 /* Icon-58.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C7F18CECF1400F37B72 /* Icon-58.png */; };
1AC35C9518CECF1400F37B72 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C8018CECF1400F37B72 /* Icon-72.png */; };
1AC35C9618CECF1400F37B72 /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C8118CECF1400F37B72 /* Icon-76.png */; };
1AC35C9718CECF1400F37B72 /* Icon-80.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C8218CECF1400F37B72 /* Icon-80.png */; };
1AC35C9818CECF1400F37B72 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35C8418CECF1400F37B72 /* main.m */; };
1AC35CA318CECF1E00F37B72 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C9B18CECF1E00F37B72 /* InfoPlist.strings */; };
1AC35CA418CECF1E00F37B72 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C9D18CECF1E00F37B72 /* MainMenu.xib */; };
1AC35CA518CECF1E00F37B72 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35C9F18CECF1E00F37B72 /* Icon.icns */; };
1AC35CA618CECF1E00F37B72 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35CA018CECF1E00F37B72 /* main.cpp */; };
1AC35CCA18CED84500F37B72 /* animations in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CA918CED84500F37B72 /* animations */; };
1AC35CCB18CED84500F37B72 /* animations in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CA918CED84500F37B72 /* animations */; };
1AC35CD018CED84500F37B72 /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAC18CED84500F37B72 /* background.mp3 */; };
1AC35CD118CED84500F37B72 /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAC18CED84500F37B72 /* background.mp3 */; };
1AC35CD218CED84500F37B72 /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAD18CED84500F37B72 /* background.ogg */; };
1AC35CD318CED84500F37B72 /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAD18CED84500F37B72 /* background.ogg */; };
1AC35CD418CED84500F37B72 /* ccb in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAE18CED84500F37B72 /* ccb */; };
1AC35CD518CED84500F37B72 /* ccb in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAE18CED84500F37B72 /* ccb */; };
1AC35CD618CED84500F37B72 /* CocosBuilderExample.ccbproj in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAF18CED84500F37B72 /* CocosBuilderExample.ccbproj */; };
1AC35CD718CED84500F37B72 /* CocosBuilderExample.ccbproj in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAF18CED84500F37B72 /* CocosBuilderExample.ccbproj */; };
1AC35CD818CED84500F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB018CED84500F37B72 /* CocosBuilderExample.ccbresourcelog */; };
1AC35CD918CED84500F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB018CED84500F37B72 /* CocosBuilderExample.ccbresourcelog */; };
1AC35CDE18CED84500F37B72 /* components in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB318CED84500F37B72 /* components */; };
1AC35CDF18CED84500F37B72 /* components in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB318CED84500F37B72 /* components */; };
1AC35CE018CED84500F37B72 /* configs in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB418CED84500F37B72 /* configs */; };
1AC35CE118CED84500F37B72 /* configs in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB418CED84500F37B72 /* configs */; };
1AC35CE218CED84500F37B72 /* effect1.raw in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB518CED84500F37B72 /* effect1.raw */; };
1AC35CE318CED84500F37B72 /* effect1.raw in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB518CED84500F37B72 /* effect1.raw */; };
1AC35CE418CED84500F37B72 /* effect1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB618CED84500F37B72 /* effect1.wav */; };
1AC35CE518CED84500F37B72 /* effect1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB618CED84500F37B72 /* effect1.wav */; };
1AC35CE618CED84500F37B72 /* effect2.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB718CED84500F37B72 /* effect2.ogg */; };
1AC35CE718CED84500F37B72 /* effect2.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB718CED84500F37B72 /* effect2.ogg */; };
1AC35CE818CED84500F37B72 /* extensions in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB818CED84500F37B72 /* extensions */; };
1AC35CE918CED84500F37B72 /* extensions in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB818CED84500F37B72 /* extensions */; };
1AC35CEA18CED84500F37B72 /* fileLookup.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB918CED84500F37B72 /* fileLookup.plist */; };
1AC35CEB18CED84500F37B72 /* fileLookup.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB918CED84500F37B72 /* fileLookup.plist */; };
1AC35CEC18CED84500F37B72 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBA18CED84500F37B72 /* fonts */; };
1AC35CED18CED84500F37B72 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBA18CED84500F37B72 /* fonts */; };
1AC35CF018CED84500F37B72 /* hd in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBC18CED84500F37B72 /* hd */; };
1AC35CF118CED84500F37B72 /* hd in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBC18CED84500F37B72 /* hd */; };
1AC35CF218CED84500F37B72 /* Hello.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBD18CED84500F37B72 /* Hello.png */; };
1AC35CF318CED84500F37B72 /* Hello.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBD18CED84500F37B72 /* Hello.png */; };
1AC35CF418CED84500F37B72 /* Images in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBE18CED84500F37B72 /* Images */; };
1AC35CF518CED84500F37B72 /* Images in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBE18CED84500F37B72 /* Images */; };
1AC35CFA18CED84500F37B72 /* Misc in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC118CED84500F37B72 /* Misc */; };
1AC35CFB18CED84500F37B72 /* Misc in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC118CED84500F37B72 /* Misc */; };
1AC35CFC18CED84500F37B72 /* music.mid in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC218CED84500F37B72 /* music.mid */; };
1AC35CFD18CED84500F37B72 /* music.mid in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC218CED84500F37B72 /* music.mid */; };
1AC35CFE18CED84500F37B72 /* Particles in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC318CED84500F37B72 /* Particles */; };
1AC35CFF18CED84500F37B72 /* Particles in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC318CED84500F37B72 /* Particles */; };
1AC35D0018CED84500F37B72 /* pew-pew-lei.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC418CED84500F37B72 /* pew-pew-lei.wav */; };
1AC35D0118CED84500F37B72 /* pew-pew-lei.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC418CED84500F37B72 /* pew-pew-lei.wav */; };
1AC35D0418CED84500F37B72 /* Shaders in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC618CED84500F37B72 /* Shaders */; };
1AC35D0518CED84500F37B72 /* Shaders in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC618CED84500F37B72 /* Shaders */; };
1AC35D0618CED84500F37B72 /* spine in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC718CED84500F37B72 /* spine */; };
1AC35D0718CED84500F37B72 /* spine in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC718CED84500F37B72 /* spine */; };
1AC35D0818CED84500F37B72 /* TileMaps in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC818CED84500F37B72 /* TileMaps */; };
1AC35D0918CED84500F37B72 /* TileMaps in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC818CED84500F37B72 /* TileMaps */; };
1AC35D0A18CED84500F37B72 /* zwoptex in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC918CED84500F37B72 /* zwoptex */; };
1AC35D0B18CED84500F37B72 /* zwoptex in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC918CED84500F37B72 /* zwoptex */; };
1AC35D2918CEDE7200F37B72 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D2718CEDE7200F37B72 /* res */; };
1AC35D2A18CEDE7200F37B72 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D2718CEDE7200F37B72 /* res */; };
1AC35D2B18CEDE7200F37B72 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D2818CEDE7200F37B72 /* src */; };
1AC35D2C18CEDE7200F37B72 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D2818CEDE7200F37B72 /* src */; };
1AC35D3118CEDE8B00F37B72 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D2F18CEDE8B00F37B72 /* AppDelegate.cpp */; };
1AC35D3218CEDE8B00F37B72 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D2F18CEDE8B00F37B72 /* AppDelegate.cpp */; };
1AC35D4518CEDE9400F37B72 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D3518CEDE9400F37B72 /* AppController.mm */; };
1AC35D4618CEDE9400F37B72 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D3618CEDE9400F37B72 /* Default-568h@2x.png */; };
1AC35D4718CEDE9400F37B72 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D3718CEDE9400F37B72 /* Default.png */; };
1AC35D4818CEDE9400F37B72 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D3818CEDE9400F37B72 /* Default@2x.png */; };
1AC35D4918CEDE9400F37B72 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D3A18CEDE9400F37B72 /* Icon-114.png */; };
1AC35D4A18CEDE9400F37B72 /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D3B18CEDE9400F37B72 /* Icon-120.png */; };
1AC35D4B18CEDE9400F37B72 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D3C18CEDE9400F37B72 /* Icon-144.png */; };
1AC35D4C18CEDE9400F37B72 /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D3D18CEDE9400F37B72 /* Icon-152.png */; };
1AC35D4D18CEDE9400F37B72 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D3E18CEDE9400F37B72 /* Icon-57.png */; };
1AC35D4E18CEDE9400F37B72 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D3F18CEDE9400F37B72 /* Icon-72.png */; };
1AC35D4F18CEDE9400F37B72 /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D4018CEDE9400F37B72 /* Icon-76.png */; };
1AC35D5118CEDE9400F37B72 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D4218CEDE9400F37B72 /* main.m */; };
1AC35D5218CEDE9400F37B72 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D4418CEDE9400F37B72 /* RootViewController.mm */; };
1AC35D5C18CEDE9E00F37B72 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D5418CEDE9E00F37B72 /* InfoPlist.strings */; };
1AC35D5D18CEDE9E00F37B72 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D5618CEDE9E00F37B72 /* MainMenu.xib */; };
1AC35D5E18CEDE9E00F37B72 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D5918CEDE9E00F37B72 /* Icon.icns */; };
1AC35D6018CEDE9E00F37B72 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D5B18CEDE9E00F37B72 /* main.cpp */; };
1AC35D7518CEE58500F37B72 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D7418CEE58500F37B72 /* src */; };
1AC35D7618CEE58500F37B72 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D7418CEE58500F37B72 /* src */; };
1AC35D7918CEE59900F37B72 /* cocosbuilderRes in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D7818CEE59900F37B72 /* cocosbuilderRes */; };
1AC35D7A18CEE59900F37B72 /* cocosbuilderRes in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D7818CEE59900F37B72 /* cocosbuilderRes */; };
1AC35D8118CEE5B100F37B72 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D7D18CEE5B100F37B72 /* AppDelegate.cpp */; };
1AC35D8218CEE5B100F37B72 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D7D18CEE5B100F37B72 /* AppDelegate.cpp */; };
1AC35D8318CEE5B100F37B72 /* lua_assetsmanager_test_sample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D7F18CEE5B100F37B72 /* lua_assetsmanager_test_sample.cpp */; };
1AC35D8418CEE5B100F37B72 /* lua_assetsmanager_test_sample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D7F18CEE5B100F37B72 /* lua_assetsmanager_test_sample.cpp */; };
1AC35D9818CEE5D100F37B72 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D8718CEE5D100F37B72 /* AppController.mm */; };
1AC35D9918CEE5D100F37B72 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8818CEE5D100F37B72 /* Default-568h@2x.png */; };
1AC35D9A18CEE5D100F37B72 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8918CEE5D100F37B72 /* Default.png */; };
1AC35D9B18CEE5D100F37B72 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8A18CEE5D100F37B72 /* Default@2x.png */; };
1AC35D9C18CEE5D100F37B72 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8B18CEE5D100F37B72 /* Icon-114.png */; };
1AC35D9D18CEE5D100F37B72 /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8C18CEE5D100F37B72 /* Icon-120.png */; };
1AC35D9E18CEE5D100F37B72 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8D18CEE5D100F37B72 /* Icon-144.png */; };
1AC35D9F18CEE5D100F37B72 /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8E18CEE5D100F37B72 /* Icon-152.png */; };
1AC35DA018CEE5D100F37B72 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D8F18CEE5D100F37B72 /* Icon-57.png */; };
1AC35DA118CEE5D100F37B72 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D9018CEE5D100F37B72 /* Icon-72.png */; };
1AC35DA218CEE5D100F37B72 /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35D9118CEE5D100F37B72 /* Icon-76.png */; };
1AC35DA418CEE5D100F37B72 /* LuaObjectCBridgeTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D9418CEE5D100F37B72 /* LuaObjectCBridgeTest.mm */; };
1AC35DA518CEE5D100F37B72 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D9518CEE5D100F37B72 /* main.m */; };
1AC35DA618CEE5D100F37B72 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35D9718CEE5D100F37B72 /* RootViewController.mm */; };
1AC35DB118CEE5DA00F37B72 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35DA818CEE5DA00F37B72 /* InfoPlist.strings */; };
1AC35DB218CEE5DA00F37B72 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35DAA18CEE5DA00F37B72 /* MainMenu.xib */; };
1AC35DB318CEE5DA00F37B72 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35DAC18CEE5DA00F37B72 /* Icon.icns */; };
1AC35DB518CEE5DA00F37B72 /* LuaObjectCBridgeTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35DAF18CEE5DA00F37B72 /* LuaObjectCBridgeTest.mm */; };
1AC35DB618CEE5DA00F37B72 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35DB018CEE5DA00F37B72 /* main.cpp */; };
1AC35DB718CEE65100F37B72 /* animations in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CA918CED84500F37B72 /* animations */; };
1AC35DB918CEE65100F37B72 /* ccb in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAE18CED84500F37B72 /* ccb */; };
1AC35DBB18CEE65100F37B72 /* components in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB318CED84500F37B72 /* components */; };
1AC35DBC18CEE65100F37B72 /* configs in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB418CED84500F37B72 /* configs */; };
1AC35DBD18CEE65100F37B72 /* extensions in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB818CED84500F37B72 /* extensions */; };
1AC35DBE18CEE65100F37B72 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBA18CED84500F37B72 /* fonts */; };
1AC35DBF18CEE65100F37B72 /* hd in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBC18CED84500F37B72 /* hd */; };
1AC35DC018CEE65100F37B72 /* Images in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBE18CED84500F37B72 /* Images */; };
1AC35DC318CEE65100F37B72 /* Misc in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC118CED84500F37B72 /* Misc */; };
1AC35DC418CEE65100F37B72 /* Particles in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC318CED84500F37B72 /* Particles */; };
1AC35DC618CEE65100F37B72 /* Shaders in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC618CED84500F37B72 /* Shaders */; };
1AC35DC718CEE65100F37B72 /* spine in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC718CED84500F37B72 /* spine */; };
1AC35DC818CEE65100F37B72 /* TileMaps in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC818CED84500F37B72 /* TileMaps */; };
1AC35DC918CEE65100F37B72 /* zwoptex in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC918CED84500F37B72 /* zwoptex */; };
1AC35DCA18CEE65200F37B72 /* animations in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CA918CED84500F37B72 /* animations */; };
1AC35DCC18CEE65200F37B72 /* ccb in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAE18CED84500F37B72 /* ccb */; };
1AC35DCE18CEE65200F37B72 /* components in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB318CED84500F37B72 /* components */; };
1AC35DCF18CEE65200F37B72 /* configs in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB418CED84500F37B72 /* configs */; };
1AC35DD018CEE65200F37B72 /* extensions in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB818CED84500F37B72 /* extensions */; };
1AC35DD118CEE65200F37B72 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBA18CED84500F37B72 /* fonts */; };
1AC35DD218CEE65200F37B72 /* hd in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBC18CED84500F37B72 /* hd */; };
1AC35DD318CEE65200F37B72 /* Images in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBE18CED84500F37B72 /* Images */; };
1AC35DD618CEE65200F37B72 /* Misc in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC118CED84500F37B72 /* Misc */; };
1AC35DD718CEE65200F37B72 /* Particles in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC318CED84500F37B72 /* Particles */; };
1AC35DD918CEE65200F37B72 /* Shaders in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC618CED84500F37B72 /* Shaders */; };
1AC35DDA18CEE65200F37B72 /* spine in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC718CED84500F37B72 /* spine */; };
1AC35DDB18CEE65200F37B72 /* TileMaps in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC818CED84500F37B72 /* TileMaps */; };
1AC35DDC18CEE65200F37B72 /* zwoptex in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC918CED84500F37B72 /* zwoptex */; };
1AC35DDD18CEE65900F37B72 /* CocosBuilderExample.ccbproj in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAF18CED84500F37B72 /* CocosBuilderExample.ccbproj */; };
1AC35DDE18CEE65900F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB018CED84500F37B72 /* CocosBuilderExample.ccbresourcelog */; };
1AC35DDF18CEE65900F37B72 /* music.mid in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC218CED84500F37B72 /* music.mid */; };
1AC35DE018CEE65900F37B72 /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAC18CED84500F37B72 /* background.mp3 */; };
1AC35DE118CEE65900F37B72 /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAD18CED84500F37B72 /* background.ogg */; };
1AC35DE218CEE65900F37B72 /* effect2.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB718CED84500F37B72 /* effect2.ogg */; };
1AC35DE318CEE65900F37B72 /* fileLookup.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB918CED84500F37B72 /* fileLookup.plist */; };
1AC35DE518CEE65900F37B72 /* Hello.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBD18CED84500F37B72 /* Hello.png */; };
1AC35DE618CEE65900F37B72 /* effect1.raw in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB518CED84500F37B72 /* effect1.raw */; };
1AC35DE918CEE65900F37B72 /* effect1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB618CED84500F37B72 /* effect1.wav */; };
1AC35DEA18CEE65900F37B72 /* pew-pew-lei.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC418CED84500F37B72 /* pew-pew-lei.wav */; };
1AC35DEB18CEE65B00F37B72 /* CocosBuilderExample.ccbproj in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAF18CED84500F37B72 /* CocosBuilderExample.ccbproj */; };
1AC35DEC18CEE65B00F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB018CED84500F37B72 /* CocosBuilderExample.ccbresourcelog */; };
1AC35DED18CEE65B00F37B72 /* music.mid in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC218CED84500F37B72 /* music.mid */; };
1AC35DEE18CEE65B00F37B72 /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAC18CED84500F37B72 /* background.mp3 */; };
1AC35DEF18CEE65B00F37B72 /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CAD18CED84500F37B72 /* background.ogg */; };
1AC35DF018CEE65B00F37B72 /* effect2.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB718CED84500F37B72 /* effect2.ogg */; };
1AC35DF118CEE65B00F37B72 /* fileLookup.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB918CED84500F37B72 /* fileLookup.plist */; };
1AC35DF318CEE65B00F37B72 /* Hello.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CBD18CED84500F37B72 /* Hello.png */; };
1AC35DF418CEE65B00F37B72 /* effect1.raw in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB518CED84500F37B72 /* effect1.raw */; };
1AC35DF718CEE65B00F37B72 /* effect1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CB618CED84500F37B72 /* effect1.wav */; };
1AC35DF818CEE65B00F37B72 /* pew-pew-lei.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC35CC418CED84500F37B72 /* pew-pew-lei.wav */; };
1AF152D918FD252A00A52F3D /* PerformanceCallbackTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF152D718FD252A00A52F3D /* PerformanceCallbackTest.cpp */; };
1AF152DA18FD252A00A52F3D /* PerformanceCallbackTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF152D718FD252A00A52F3D /* PerformanceCallbackTest.cpp */; };
1F33634F18E37E840074764D /* RefPtrTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F33634D18E37E840074764D /* RefPtrTest.cpp */; };
1F33635018E37E840074764D /* RefPtrTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F33634D18E37E840074764D /* RefPtrTest.cpp */; };
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D1C191B574B0066F8DF /* UITest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D1A191B574B0066F8DF /* UITest.cpp */; };
29080D1D191B574B0066F8DF /* UITest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D1A191B574B0066F8DF /* UITest.cpp */; };
29080D8D191B595E0066F8DF /* CocosGUIScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */; };
29080D8E191B595E0066F8DF /* CocosGUIScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */; };
29080D8F191B595E0066F8DF /* CocoStudioGUITest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D21191B595E0066F8DF /* CocoStudioGUITest.cpp */; };
29080D90191B595E0066F8DF /* CocoStudioGUITest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D21191B595E0066F8DF /* CocoStudioGUITest.cpp */; };
29080D91191B595E0066F8DF /* CustomGUIScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D23191B595E0066F8DF /* CustomGUIScene.cpp */; };
29080D92191B595E0066F8DF /* CustomGUIScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D23191B595E0066F8DF /* CustomGUIScene.cpp */; };
29080D93191B595E0066F8DF /* CustomImageTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D27191B595E0066F8DF /* CustomImageTest.cpp */; };
29080D94191B595E0066F8DF /* CustomImageTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D27191B595E0066F8DF /* CustomImageTest.cpp */; };
29080D95191B595E0066F8DF /* CustomParticleWidgetTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D2A191B595E0066F8DF /* CustomParticleWidgetTest.cpp */; };
29080D96191B595E0066F8DF /* CustomParticleWidgetTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D2A191B595E0066F8DF /* CustomParticleWidgetTest.cpp */; };
29080D97191B595E0066F8DF /* CustomImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D2D191B595E0066F8DF /* CustomImageView.cpp */; };
29080D98191B595E0066F8DF /* CustomImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D2D191B595E0066F8DF /* CustomImageView.cpp */; };
29080D99191B595E0066F8DF /* CustomImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D2F191B595E0066F8DF /* CustomImageViewReader.cpp */; };
29080D9A191B595E0066F8DF /* CustomImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D2F191B595E0066F8DF /* CustomImageViewReader.cpp */; };
29080D9B191B595E0066F8DF /* CustomParticleWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D31191B595E0066F8DF /* CustomParticleWidget.cpp */; };
29080D9C191B595E0066F8DF /* CustomParticleWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D31191B595E0066F8DF /* CustomParticleWidget.cpp */; };
29080D9D191B595E0066F8DF /* CustomParticleWidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D33191B595E0066F8DF /* CustomParticleWidgetReader.cpp */; };
29080D9E191B595E0066F8DF /* CustomParticleWidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D33191B595E0066F8DF /* CustomParticleWidgetReader.cpp */; };
29080D9F191B595E0066F8DF /* CustomReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D35191B595E0066F8DF /* CustomReader.cpp */; };
29080DA0191B595E0066F8DF /* CustomReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D35191B595E0066F8DF /* CustomReader.cpp */; };
29080DA1191B595E0066F8DF /* GUIEditorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D37191B595E0066F8DF /* GUIEditorTest.cpp */; };
29080DA2191B595E0066F8DF /* GUIEditorTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D37191B595E0066F8DF /* GUIEditorTest.cpp */; };
29080DA3191B595E0066F8DF /* UIButtonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D3A191B595E0066F8DF /* UIButtonTest.cpp */; };
29080DA4191B595E0066F8DF /* UIButtonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D3A191B595E0066F8DF /* UIButtonTest.cpp */; };
29080DA5191B595E0066F8DF /* UIButtonTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D3C191B595E0066F8DF /* UIButtonTest_Editor.cpp */; };
29080DA6191B595E0066F8DF /* UIButtonTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D3C191B595E0066F8DF /* UIButtonTest_Editor.cpp */; };
29080DA7191B595E0066F8DF /* UICheckBoxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D3F191B595E0066F8DF /* UICheckBoxTest.cpp */; };
29080DA8191B595E0066F8DF /* UICheckBoxTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D3F191B595E0066F8DF /* UICheckBoxTest.cpp */; };
29080DA9191B595E0066F8DF /* UICheckBoxTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D41191B595E0066F8DF /* UICheckBoxTest_Editor.cpp */; };
29080DAA191B595E0066F8DF /* UICheckBoxTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D41191B595E0066F8DF /* UICheckBoxTest_Editor.cpp */; };
29080DAB191B595E0066F8DF /* UIFocusTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D44191B595E0066F8DF /* UIFocusTest.cpp */; };
29080DAC191B595E0066F8DF /* UIFocusTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D44191B595E0066F8DF /* UIFocusTest.cpp */; };
29080DAD191B595E0066F8DF /* UIImageViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D47191B595E0066F8DF /* UIImageViewTest.cpp */; };
29080DAE191B595E0066F8DF /* UIImageViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D47191B595E0066F8DF /* UIImageViewTest.cpp */; };
29080DAF191B595E0066F8DF /* UIImageViewTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D49191B595E0066F8DF /* UIImageViewTest_Editor.cpp */; };
29080DB0191B595E0066F8DF /* UIImageViewTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D49191B595E0066F8DF /* UIImageViewTest_Editor.cpp */; };
29080DB1191B595E0066F8DF /* UILayoutTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D4C191B595E0066F8DF /* UILayoutTest.cpp */; };
29080DB2191B595E0066F8DF /* UILayoutTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D4C191B595E0066F8DF /* UILayoutTest.cpp */; };
29080DB3191B595E0066F8DF /* UILayoutTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D4E191B595E0066F8DF /* UILayoutTest_Editor.cpp */; };
29080DB4191B595E0066F8DF /* UILayoutTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D4E191B595E0066F8DF /* UILayoutTest_Editor.cpp */; };
29080DB5191B595E0066F8DF /* UIListViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D51191B595E0066F8DF /* UIListViewTest.cpp */; };
29080DB6191B595E0066F8DF /* UIListViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D51191B595E0066F8DF /* UIListViewTest.cpp */; };
29080DB7191B595E0066F8DF /* UIListViewTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D53191B595E0066F8DF /* UIListViewTest_Editor.cpp */; };
29080DB8191B595E0066F8DF /* UIListViewTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D53191B595E0066F8DF /* UIListViewTest_Editor.cpp */; };
29080DB9191B595E0066F8DF /* UILoadingBarTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D56191B595E0066F8DF /* UILoadingBarTest.cpp */; };
29080DBA191B595E0066F8DF /* UILoadingBarTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D56191B595E0066F8DF /* UILoadingBarTest.cpp */; };
29080DBB191B595E0066F8DF /* UILoadingBarTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D58191B595E0066F8DF /* UILoadingBarTest_Editor.cpp */; };
29080DBC191B595E0066F8DF /* UILoadingBarTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D58191B595E0066F8DF /* UILoadingBarTest_Editor.cpp */; };
29080DBD191B595E0066F8DF /* UIPageViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D5B191B595E0066F8DF /* UIPageViewTest.cpp */; };
29080DBE191B595E0066F8DF /* UIPageViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D5B191B595E0066F8DF /* UIPageViewTest.cpp */; };
29080DBF191B595E0066F8DF /* UIPageViewTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D5D191B595E0066F8DF /* UIPageViewTest_Editor.cpp */; };
29080DC0191B595E0066F8DF /* UIPageViewTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D5D191B595E0066F8DF /* UIPageViewTest_Editor.cpp */; };
29080DC1191B595E0066F8DF /* UIRichTextTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D60191B595E0066F8DF /* UIRichTextTest.cpp */; };
29080DC2191B595E0066F8DF /* UIRichTextTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D60191B595E0066F8DF /* UIRichTextTest.cpp */; };
29080DC3191B595E0066F8DF /* UIScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D62191B595E0066F8DF /* UIScene.cpp */; };
29080DC4191B595E0066F8DF /* UIScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D62191B595E0066F8DF /* UIScene.cpp */; };
29080DC5191B595E0066F8DF /* UIScene_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D64191B595E0066F8DF /* UIScene_Editor.cpp */; };
29080DC6191B595E0066F8DF /* UIScene_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D64191B595E0066F8DF /* UIScene_Editor.cpp */; };
29080DC7191B595E0066F8DF /* UISceneManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D66191B595E0066F8DF /* UISceneManager.cpp */; };
29080DC8191B595E0066F8DF /* UISceneManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D66191B595E0066F8DF /* UISceneManager.cpp */; };
29080DC9191B595E0066F8DF /* UISceneManager_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D68191B595E0066F8DF /* UISceneManager_Editor.cpp */; };
29080DCA191B595E0066F8DF /* UISceneManager_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D68191B595E0066F8DF /* UISceneManager_Editor.cpp */; };
29080DCB191B595E0066F8DF /* UIScrollViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D6B191B595E0066F8DF /* UIScrollViewTest.cpp */; };
29080DCC191B595E0066F8DF /* UIScrollViewTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D6B191B595E0066F8DF /* UIScrollViewTest.cpp */; };
29080DCD191B595E0066F8DF /* UIScrollViewTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D6D191B595E0066F8DF /* UIScrollViewTest_Editor.cpp */; };
29080DCE191B595E0066F8DF /* UIScrollViewTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D6D191B595E0066F8DF /* UIScrollViewTest_Editor.cpp */; };
29080DCF191B595E0066F8DF /* UISliderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D70191B595E0066F8DF /* UISliderTest.cpp */; };
29080DD0191B595E0066F8DF /* UISliderTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D70191B595E0066F8DF /* UISliderTest.cpp */; };
29080DD1191B595E0066F8DF /* UISliderTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D72191B595E0066F8DF /* UISliderTest_Editor.cpp */; };
29080DD2191B595E0066F8DF /* UISliderTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D72191B595E0066F8DF /* UISliderTest_Editor.cpp */; };
29080DD3191B595E0066F8DF /* UITextAtlasTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D75191B595E0066F8DF /* UITextAtlasTest.cpp */; };
29080DD4191B595E0066F8DF /* UITextAtlasTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D75191B595E0066F8DF /* UITextAtlasTest.cpp */; };
29080DD5191B595E0066F8DF /* UITextAtlasTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D77191B595E0066F8DF /* UITextAtlasTest_Editor.cpp */; };
29080DD6191B595E0066F8DF /* UITextAtlasTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D77191B595E0066F8DF /* UITextAtlasTest_Editor.cpp */; };
29080DD7191B595E0066F8DF /* UITextBMFontTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D7A191B595E0066F8DF /* UITextBMFontTest.cpp */; };
29080DD8191B595E0066F8DF /* UITextBMFontTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D7A191B595E0066F8DF /* UITextBMFontTest.cpp */; };
29080DD9191B595E0066F8DF /* UITextBMFontTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D7C191B595E0066F8DF /* UITextBMFontTest_Editor.cpp */; };
29080DDA191B595E0066F8DF /* UITextBMFontTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D7C191B595E0066F8DF /* UITextBMFontTest_Editor.cpp */; };
29080DDB191B595E0066F8DF /* UITextFieldTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D7F191B595E0066F8DF /* UITextFieldTest.cpp */; };
29080DDC191B595E0066F8DF /* UITextFieldTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D7F191B595E0066F8DF /* UITextFieldTest.cpp */; };
29080DDD191B595E0066F8DF /* UITextFieldTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D81191B595E0066F8DF /* UITextFieldTest_Editor.cpp */; };
29080DDE191B595E0066F8DF /* UITextFieldTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D81191B595E0066F8DF /* UITextFieldTest_Editor.cpp */; };
29080DDF191B595E0066F8DF /* UITextTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D84191B595E0066F8DF /* UITextTest.cpp */; };
29080DE0191B595E0066F8DF /* UITextTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D84191B595E0066F8DF /* UITextTest.cpp */; };
29080DE1191B595E0066F8DF /* UITextTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D86191B595E0066F8DF /* UITextTest_Editor.cpp */; };
29080DE2191B595E0066F8DF /* UITextTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D86191B595E0066F8DF /* UITextTest_Editor.cpp */; };
29080DE3191B595E0066F8DF /* UIWidgetAddNodeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D89191B595E0066F8DF /* UIWidgetAddNodeTest.cpp */; };
29080DE4191B595E0066F8DF /* UIWidgetAddNodeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D89191B595E0066F8DF /* UIWidgetAddNodeTest.cpp */; };
29080DE5191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; };
29080DE6191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; };
fix ios project bug
2014-07-11 14:55:00 +08:00
290E94B5196FC16900694919 /* CocostudioParserTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 290E94B3196FC16900694919 /* CocostudioParserTest.cpp */; };
290E94B6196FC16900694919 /* CocostudioParserTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 290E94B3196FC16900694919 /* CocostudioParserTest.cpp */; };
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
295824591987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; };
2958245A1987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; };
add Cocostudio 1.3,1.4, 1.5 ui tests
2014-07-08 17:02:50 +08:00
29FBBBFE196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */; };
29FBBBFF196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */; };
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E73194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */; };
38FA2E74194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */; };
38FA2E76194AECF800FF2BE4 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
38FA2E77194AECF800FF2BE4 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; };
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
3E6177221960FAED00DE83F5 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; };
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6177241960FAED00DE83F5 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
3E6177251960FAED00DE83F5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; };
3E6177261960FAED00DE83F5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
3E6177271960FAED00DE83F5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; };
3E6177281960FAED00DE83F5 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64828165F396B007D4F18 /* OpenAL.framework */; };
3E6177291960FAED00DE83F5 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; };
3E61772A1960FAED00DE83F5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52BB1783AEB80073F6A7 /* CoreGraphics.framework */; };
3E61772B1960FAED00DE83F5 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B91783AE900073F6A7 /* OpenGLES.framework */; };
3E61772C1960FAED00DE83F5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B71783AE6D0073F6A7 /* UIKit.framework */; };
3E61772D1960FAED00DE83F5 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52C11783B01F0073F6A7 /* AVFoundation.framework */; };
3E6177331960FB3500DE83F5 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176B71960FA6300DE83F5 /* AppDelegate.cpp */; };
3E6177341960FB3900DE83F5 /* GameControllerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176BA1960FA6300DE83F5 /* GameControllerTest.cpp */; };
3E6177351960FB4000DE83F5 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176DE1960FA6300DE83F5 /* AppController.mm */; };
3E6177361960FB5A00DE83F5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176EE1960FA6300DE83F5 /* main.m */; };
3E6177371960FB5E00DE83F5 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176F01960FA6300DE83F5 /* RootViewController.mm */; };
3E61773D1960FBD200DE83F5 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E61773C1960FBD100DE83F5 /* GameController.framework */; };
3E6177F41960FEFE00DE83F5 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F01960FEFE00DE83F5 /* fonts */; };
3E6177F51960FEFE00DE83F5 /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F11960FEFE00DE83F5 /* ipad */; };
3E6177F61960FEFE00DE83F5 /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F21960FEFE00DE83F5 /* ipadhd */; };
3E6177F71960FEFE00DE83F5 /* iphone in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F31960FEFE00DE83F5 /* iphone */; };
3E6177F81960FF1800DE83F5 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176DF1960FA6300DE83F5 /* Default-568h@2x.png */; };
3E6177F91960FF1800DE83F5 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E01960FA6300DE83F5 /* Default.png */; };
3E6177FA1960FF1800DE83F5 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E11960FA6300DE83F5 /* Default@2x.png */; };
3E6177FB1960FF1800DE83F5 /* Icon-100.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E21960FA6300DE83F5 /* Icon-100.png */; };
3E6177FC1960FF1800DE83F5 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E31960FA6300DE83F5 /* Icon-114.png */; };
3E6177FD1960FF1800DE83F5 /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E41960FA6300DE83F5 /* Icon-120.png */; };
3E6177FE1960FF1800DE83F5 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E51960FA6300DE83F5 /* Icon-144.png */; };
3E6177FF1960FF1800DE83F5 /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E61960FA6300DE83F5 /* Icon-152.png */; };
3E6178001960FF1800DE83F5 /* Icon-40.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E71960FA6300DE83F5 /* Icon-40.png */; };
3E6178011960FF1800DE83F5 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E81960FA6300DE83F5 /* Icon-57.png */; };
3E6178021960FF1800DE83F5 /* Icon-58.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176E91960FA6300DE83F5 /* Icon-58.png */; };
3E6178031960FF1800DE83F5 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176EA1960FA6300DE83F5 /* Icon-72.png */; };
3E6178041960FF1800DE83F5 /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176EB1960FA6300DE83F5 /* Icon-76.png */; };
3E6178051960FF1800DE83F5 /* Icon-80.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6176EC1960FA6300DE83F5 /* Icon-80.png */; };
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
3E92EA821921A1400094CD21 /* Sprite3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */; };
3E92EA831921A1400094CD21 /* Sprite3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */; };
3E92EA851921A7720094CD21 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
3E92EA861921A7720094CD21 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
3E9E75D0199324CB005B7047 /* Camera3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */; };
3E9E75D1199324CB005B7047 /* Camera3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */; };
Update XCode project.pbxproj for add files related to VideoWidget.
2014-05-08 18:28:28 +08:00
3EA0FB5E191B92F100B170C8 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; };
3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; };
update XCode project.pbxproj
2014-05-09 11:37:14 +08:00
3EA0FB72191C844400B170C8 /* UIVideoPlayerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */; };
add TestCase for reparentChildren bug
2014-05-13 13:50:31 +08:00
59620E8F1921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; };
59620E901921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; };
1. move drawnode3d to Sprite3DTest 2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
5EBEECB01995247000429821 /* DrawNode3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EBEECAE1995247000429821 /* DrawNode3D.cpp */; };
5EBEECB11995247000429821 /* DrawNode3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EBEECAE1995247000429821 /* DrawNode3D.cpp */; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
A05FCACA177C124500BE600E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
A07A521E1783A1D20073F6A7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; };
A07A521F1783A1D20073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
A07A52201783A1D20073F6A7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; };
A07A52221783A1D20073F6A7 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64828165F396B007D4F18 /* OpenAL.framework */; };
A07A52231783A1D20073F6A7 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; };
A07A52BE1783AF1E0073F6A7 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52BB1783AEB80073F6A7 /* CoreGraphics.framework */; };
A07A52BF1783AF210073F6A7 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B91783AE900073F6A7 /* OpenGLES.framework */; };
A07A52C01783AF250073F6A7 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52B71783AE6D0073F6A7 /* UIKit.framework */; };
A07A52C31783B02C0073F6A7 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A52C11783B01F0073F6A7 /* AVFoundation.framework */; };
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
B2507B6B192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; };
B2507B6C192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; };
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
C04F935A1941B05400E9FEAB /* TileMapTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C04F93581941B05400E9FEAB /* TileMapTest2.cpp */; };
C04F935B1941B05400E9FEAB /* TileMapTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C04F93581941B05400E9FEAB /* TileMapTest2.cpp */; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
C08689C118D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
C08689C218D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
C08689C318D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
C08689C418D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; };
D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
EDCC747F17C455FD007B692C /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B84198B8ACB00DC375D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15EFA59E198B2DAA000C57D3;
remoteInfo = "libluacocos2d iOS";
};
15427B94198B8BB400DC375D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15EFA59E198B2DAA000C57D3;
remoteInfo = "libluacocos2d iOS";
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
};
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B98198B8BDE00DC375D /* PBXContainerItemProxy */ = {
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
remoteGlobalIDString = A07A4C241783777C0073F6A7;
remoteInfo = "libcocos2d iOS";
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
};
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B9C198B8C0500DC375D /* PBXContainerItemProxy */ = {
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
remoteGlobalIDString = 15EFA59E198B2DAA000C57D3;
remoteInfo = "libluacocos2d iOS";
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
};
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427BA4198B8C2E00DC375D /* PBXContainerItemProxy */ = {
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
remoteGlobalIDString = 15C1C255198748D200A46ACC;
remoteInfo = "libluacocos2d Mac";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427BB4198B8C5000DC375D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 15C1C255198748D200A46ACC;
remoteInfo = "libluacocos2d Mac";
};
15CBA017196EE56C005877BB /* PBXContainerItemProxy */ = {
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4C241783777C0073F6A7;
remoteInfo = "cocos2dx iOS";
};
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15EFA257198A4A24000C57D3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 15C1C2CC198748D200A46ACC;
remoteInfo = "libluacocos2d Mac";
};
15EFA664198B33EE000C57D3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 15EFA616198B2DAA000C57D3;
remoteInfo = "libluacocos2d iOS";
};
1A0EE1C818CDF6DA004CD58F /* PBXContainerItemProxy */ = {
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
remoteGlobalIDString = 1551A33E158F2AB200E66CFE;
remoteInfo = "cocos2dx Mac";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
1A0EE2BC18CDF733004CD58F /* PBXContainerItemProxy */ = {
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
remoteGlobalIDString = 1551A33E158F2AB200E66CFE;
remoteInfo = "cocos2dx Mac";
};
1A0EE31A18CDF775004CD58F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4C241783777C0073F6A7;
remoteInfo = "cocos2dx iOS";
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AAF5341180E2F41000584C8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1551A33E158F2AB200E66CFE;
remoteInfo = "cocos2dx Mac";
};
1AAF53F4180E39C6000584C8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4C241783777C0073F6A7;
remoteInfo = "cocos2dx iOS";
};
1ABCA2B818CD92230087CE3A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 1551A33E158F2AB200E66CFE;
remoteInfo = "cocos2dx Mac";
};
1ABCA2F718CD93850087CE3A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4C241783777C0073F6A7;
remoteInfo = "cocos2dx iOS";
};
1ADA8BA318CF277400AE24B9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1A0EE1C618CDF6DA004CD58F;
remoteInfo = "cpp-empty-test Mac";
};
1ADA8BA518CF277400AE24B9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1ABCA28518CD91510087CE3A;
remoteInfo = "lua-tests Mac";
};
1ADA8BA718CF277400AE24B9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1A0EE2B818CDF733004CD58F;
remoteInfo = "lua-empty-test Mac";
};
1ADA8BAB18CF277C00AE24B9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1A0EE31818CDF775004CD58F;
remoteInfo = "cpp-empty-test iOS";
};
1ADA8BAD18CF277C00AE24B9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1ABCA2CC18CD93580087CE3A;
remoteInfo = "lua-tests iOS";
};
1ADA8BAF18CF277C00AE24B9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1A0EE41918CDF799004CD58F;
remoteInfo = "lua-empty-test iOS";
};
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6177011960FAED00DE83F5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = A07A4C241783777C0073F6A7;
remoteInfo = "cocos2dx iOS";
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
46A15FAF1807A4F9005B8026 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1551A33F158F2AB200E66CFE;
remoteInfo = "cocos2dx Mac";
};
46A15FBD1807A4F9005B8026 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A07A4D641783777C0073F6A7;
remoteInfo = "cocos2dx iOS";
};
A035ACBF178246BD00987F6C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = 1D6058900D05DD3D006BFB54;
remoteInfo = "Test cpp";
};
A07A526C1783AB980073F6A7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
proxyType = 1;
remoteGlobalIDString = A07A517F1783A1D20073F6A7;
remoteInfo = "Test cpp iOS";
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
1503FAA918DA8B6C00F6518C /* ftp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ftp.lua; path = ../external/lua/luasocket/ftp.lua; sourceTree = "<group>"; };
1503FAAA18DA8B6C00F6518C /* headers.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = headers.lua; path = ../external/lua/luasocket/headers.lua; sourceTree = "<group>"; };
1503FAAB18DA8B6C00F6518C /* http.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = http.lua; path = ../external/lua/luasocket/http.lua; sourceTree = "<group>"; };
1503FAAC18DA8B6C00F6518C /* ltn12.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ltn12.lua; path = ../external/lua/luasocket/ltn12.lua; sourceTree = "<group>"; };
1503FAAD18DA8B6C00F6518C /* mbox.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mbox.lua; path = ../external/lua/luasocket/mbox.lua; sourceTree = "<group>"; };
1503FAAE18DA8B6C00F6518C /* mime.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mime.lua; path = ../external/lua/luasocket/mime.lua; sourceTree = "<group>"; };
1503FAAF18DA8B6C00F6518C /* smtp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smtp.lua; path = ../external/lua/luasocket/smtp.lua; sourceTree = "<group>"; };
1503FAB018DA8B6C00F6518C /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = socket.lua; path = ../external/lua/luasocket/socket.lua; sourceTree = "<group>"; };
1503FAB118DA8B6C00F6518C /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tp.lua; path = ../external/lua/luasocket/tp.lua; sourceTree = "<group>"; };
1503FAB218DA8B6C00F6518C /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = url.lua; path = ../external/lua/luasocket/url.lua; sourceTree = "<group>"; };
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B76198B750300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = "<group>"; };
15427B77198B843300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = "<group>"; };
15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_manual.cpp; path = "../../../../cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp"; sourceTree = "<group>"; };
15427B7C198B880100DC375D /* lua_cocos2dx_controller_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = lua_cocos2dx_controller_manual.hpp; path = "../../../../cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp"; sourceTree = "<group>"; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C64822165F391E007D4F18 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
15C64824165F3934007D4F18 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; };
15C64826165F394E007D4F18 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
15C64828165F396B007D4F18 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; };
15C6482A165F3979007D4F18 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/ApplicationServices.framework; sourceTree = DEVELOPER_DIR; };
15C6482C165F3988007D4F18 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; };
15C6482E165F399D007D4F18 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
15C64832165F3AFD007D4F18 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA063196EE56C005877BB /* lua-game-controller-test iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-game-controller-test iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
15CBA08B196EE66D005877BB /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = "<group>"; };
15CBA08C196EE66D005877BB /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
15CBA08F196EE66D005877BB /* .classpath */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = .classpath; sourceTree = "<group>"; };
15CBA090196EE66D005877BB /* .project */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = .project; sourceTree = "<group>"; };
15CBA091196EE66D005877BB /* AndroidManifest.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = AndroidManifest.xml; sourceTree = "<group>"; };
15CBA092196EE66D005877BB /* ant.properties */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ant.properties; sourceTree = "<group>"; };
15CBA094196EE66D005877BB /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioEngine.lua; sourceTree = "<group>"; };
15CBA095196EE66D005877BB /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CCBReaderLoad.lua; sourceTree = "<group>"; };
15CBA096196EE66D005877BB /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cocos2d.lua; sourceTree = "<group>"; };
15CBA097196EE66D005877BB /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cocos2dConstants.lua; sourceTree = "<group>"; };
15CBA098196EE66D005877BB /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CocoStudio.lua; sourceTree = "<group>"; };
15CBA099196EE66D005877BB /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Deprecated.lua; sourceTree = "<group>"; };
15CBA09A196EE66D005877BB /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedClass.lua; sourceTree = "<group>"; };
15CBA09B196EE66D005877BB /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedEnum.lua; sourceTree = "<group>"; };
15CBA09C196EE66D005877BB /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedOpenglEnum.lua; sourceTree = "<group>"; };
15CBA09D196EE66D005877BB /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawPrimitives.lua; sourceTree = "<group>"; };
15CBA09E196EE66D005877BB /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = extern.lua; sourceTree = "<group>"; };
15CBA09F196EE66D005877BB /* ftp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ftp.lua; sourceTree = "<group>"; };
15CBA0A0196EE66D005877BB /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GuiConstants.lua; sourceTree = "<group>"; };
15CBA0A1196EE66D005877BB /* headers.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = headers.lua; sourceTree = "<group>"; };
15CBA0A2196EE66D005877BB /* http.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = http.lua; sourceTree = "<group>"; };
15CBA0A3196EE66D005877BB /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = json.lua; sourceTree = "<group>"; };
15CBA0A4196EE66D005877BB /* ltn12.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ltn12.lua; sourceTree = "<group>"; };
15CBA0A5196EE66D005877BB /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = luaj.lua; sourceTree = "<group>"; };
15CBA0A6196EE66D005877BB /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = luaoc.lua; sourceTree = "<group>"; };
15CBA0A7196EE66D005877BB /* mbox.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mbox.lua; sourceTree = "<group>"; };
15CBA0A8196EE66D005877BB /* mime.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mime.lua; sourceTree = "<group>"; };
15CBA0A9196EE66D005877BB /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Opengl.lua; sourceTree = "<group>"; };
15CBA0AA196EE66D005877BB /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenglConstants.lua; sourceTree = "<group>"; };
15CBA0AD196EE66D005877BB /* Marker Felt.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Marker Felt.ttf"; sourceTree = "<group>"; };
15CBA0AF196EE66D005877BB /* A.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = A.png; sourceTree = "<group>"; };
15CBA0B0196EE66D005877BB /* B.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = B.png; sourceTree = "<group>"; };
15CBA0B1196EE66D005877BB /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = "<group>"; };
15CBA0B2196EE66D005877BB /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = "<group>"; };
15CBA0B3196EE66D005877BB /* controller-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "controller-1.png"; sourceTree = "<group>"; };
15CBA0B4196EE66D005877BB /* controller-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "controller-2.png"; sourceTree = "<group>"; };
15CBA0B5196EE66D005877BB /* dpad-key.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "dpad-key.png"; sourceTree = "<group>"; };
15CBA0B6196EE66D005877BB /* dPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dPad.png; sourceTree = "<group>"; };
15CBA0B7196EE66D005877BB /* joystick.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = joystick.png; sourceTree = "<group>"; };
15CBA0B8196EE66D005877BB /* L1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = L1.png; sourceTree = "<group>"; };
15CBA0B9196EE66D005877BB /* L2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = L2.png; sourceTree = "<group>"; };
15CBA0BA196EE66D005877BB /* R1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = R1.png; sourceTree = "<group>"; };
15CBA0BB196EE66D005877BB /* R2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = R2.png; sourceTree = "<group>"; };
15CBA0BC196EE66D005877BB /* X.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = X.png; sourceTree = "<group>"; };
15CBA0BD196EE66D005877BB /* Y.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Y.png; sourceTree = "<group>"; };
15CBA0BF196EE66D005877BB /* A.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = A.png; sourceTree = "<group>"; };
15CBA0C0196EE66D005877BB /* B.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = B.png; sourceTree = "<group>"; };
15CBA0C1196EE66D005877BB /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = "<group>"; };
15CBA0C2196EE66D005877BB /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = "<group>"; };
15CBA0C3196EE66D005877BB /* controller-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "controller-1.png"; sourceTree = "<group>"; };
15CBA0C4196EE66D005877BB /* controller-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "controller-2.png"; sourceTree = "<group>"; };
15CBA0C5196EE66D005877BB /* dPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dPad.png; sourceTree = "<group>"; };
15CBA0C6196EE66D005877BB /* joystick.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = joystick.png; sourceTree = "<group>"; };
15CBA0C7196EE66D005877BB /* L1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = L1.png; sourceTree = "<group>"; };
15CBA0C8196EE66D005877BB /* L2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = L2.png; sourceTree = "<group>"; };
15CBA0C9196EE66D005877BB /* R1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = R1.png; sourceTree = "<group>"; };
15CBA0CA196EE66D005877BB /* R2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = R2.png; sourceTree = "<group>"; };
15CBA0CB196EE66D005877BB /* X.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = X.png; sourceTree = "<group>"; };
15CBA0CC196EE66D005877BB /* Y.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Y.png; sourceTree = "<group>"; };
15CBA0CE196EE66D005877BB /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = "<group>"; };
15CBA0CF196EE66D005877BB /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = "<group>"; };
15CBA0D0196EE66D005877BB /* smtp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = smtp.lua; sourceTree = "<group>"; };
15CBA0D1196EE66D005877BB /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = socket.lua; sourceTree = "<group>"; };
15CBA0D3196EE66D005877BB /* GameControllerTest.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GameControllerTest.lua; sourceTree = "<group>"; };
15CBA0D4196EE66D005877BB /* main.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.lua; sourceTree = "<group>"; };
15CBA0D5196EE66D005877BB /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = StudioConstants.lua; sourceTree = "<group>"; };
15CBA0D6196EE66D005877BB /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tp.lua; sourceTree = "<group>"; };
15CBA0D7196EE66D005877BB /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = url.lua; sourceTree = "<group>"; };
15CBA0D9196EE66D005877BB /* AndroidManifest.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = AndroidManifest.xml; sourceTree = "<group>"; };
15CBA0DA196EE66D005877BB /* AndroidManifest.xml.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = AndroidManifest.xml.d; sourceTree = "<group>"; };
15CBA0DB196EE66D005877BB /* build.prop */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = build.prop; sourceTree = "<group>"; };
15CBA0E0196EE66D005877BB /* R$drawable.class */ = {isa = PBXFileReference; lastKnownFileType = compiled.javaclass; path = R$drawable.class; sourceTree = "<group>"; };
15CBA0E1196EE66D005877BB /* R$string.class */ = {isa = PBXFileReference; lastKnownFileType = compiled.javaclass; path = R$string.class; sourceTree = "<group>"; };
15CBA0E2196EE66D005877BB /* R.class */ = {isa = PBXFileReference; lastKnownFileType = compiled.javaclass; path = R.class; sourceTree = "<group>"; };
15CBA0E4196EE66D005877BB /* AppActivity.class */ = {isa = PBXFileReference; lastKnownFileType = compiled.javaclass; path = AppActivity.class; sourceTree = "<group>"; };
15CBA0E5196EE66D005877BB /* BuildConfig.class */ = {isa = PBXFileReference; lastKnownFileType = compiled.javaclass; path = BuildConfig.class; sourceTree = "<group>"; };
15CBA0E6196EE66D005877BB /* R$attr.class */ = {isa = PBXFileReference; lastKnownFileType = compiled.javaclass; path = R$attr.class; sourceTree = "<group>"; };
15CBA0E7196EE66D005877BB /* R$drawable.class */ = {isa = PBXFileReference; lastKnownFileType = compiled.javaclass; path = R$drawable.class; sourceTree = "<group>"; };
15CBA0E8196EE66D005877BB /* R$string.class */ = {isa = PBXFileReference; lastKnownFileType = compiled.javaclass; path = R$string.class; sourceTree = "<group>"; };
15CBA0E9196EE66D005877BB /* R.class */ = {isa = PBXFileReference; lastKnownFileType = compiled.javaclass; path = R.class; sourceTree = "<group>"; };
15CBA0EA196EE66D005877BB /* R.java.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = R.java.d; sourceTree = "<group>"; };
15CBA0EB196EE66D005877BB /* classes.dex */ = {isa = PBXFileReference; lastKnownFileType = file; path = classes.dex; sourceTree = "<group>"; };
15CBA0EC196EE66D005877BB /* classes.dex.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = classes.dex.d; sourceTree = "<group>"; };
15CBA0EE196EE66D005877BB /* com.bda.controller-2a2221a1ab7454168b1de77b0fcb60b5.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "com.bda.controller-2a2221a1ab7454168b1de77b0fcb60b5.jar"; sourceTree = "<group>"; };
15CBA0EF196EE66D005877BB /* libcocos2dx-6607f245d91af6aef71b17fa98444a4b.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "libcocos2dx-6607f245d91af6aef71b17fa98444a4b.jar"; sourceTree = "<group>"; };
15CBA0F0196EE66E005877BB /* libcontrollermanualadapter-e17761caab08972308a4bbfa589d7d02.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "libcontrollermanualadapter-e17761caab08972308a4bbfa589d7d02.jar"; sourceTree = "<group>"; };
15CBA0F1196EE66E005877BB /* nibiru_lib_2_1_7-67e12061a63fd16ecf47bdef1767938c.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "nibiru_lib_2_1_7-67e12061a63fd16ecf47bdef1767938c.jar"; sourceTree = "<group>"; };
15CBA0F2196EE66E005877BB /* ouya-sdk-f5c122a155623a2270a639db2ebe8685.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "ouya-sdk-f5c122a155623a2270a639db2ebe8685.jar"; sourceTree = "<group>"; };
15CBA0F3196EE66E005877BB /* jarlist.cache */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = jarlist.cache; sourceTree = "<group>"; };
15CBA0F4196EE66E005877BB /* LuaGameControllerTest-debug-unaligned.apk */ = {isa = PBXFileReference; lastKnownFileType = file; path = "LuaGameControllerTest-debug-unaligned.apk"; sourceTree = "<group>"; };
15CBA0F5196EE66E005877BB /* LuaGameControllerTest-debug-unaligned.apk.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = "LuaGameControllerTest-debug-unaligned.apk.d"; sourceTree = "<group>"; };
15CBA0F6196EE66E005877BB /* LuaGameControllerTest-debug.apk */ = {isa = PBXFileReference; lastKnownFileType = file; path = "LuaGameControllerTest-debug.apk"; sourceTree = "<group>"; };
15CBA0F7196EE66E005877BB /* LuaGameControllerTest.ap_ */ = {isa = PBXFileReference; lastKnownFileType = file; path = LuaGameControllerTest.ap_; sourceTree = "<group>"; };
15CBA0F8196EE66E005877BB /* LuaGameControllerTest.ap_.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = LuaGameControllerTest.ap_.d; sourceTree = "<group>"; };
15CBA0F9196EE66E005877BB /* LuaGameControllerTest.apk */ = {isa = PBXFileReference; lastKnownFileType = file; path = LuaGameControllerTest.apk; sourceTree = "<group>"; };
15CBA0FA196EE66E005877BB /* proguard.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = proguard.txt; sourceTree = "<group>"; };
15CBA0FB196EE66E005877BB /* R.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = R.txt; sourceTree = "<group>"; };
15CBA0FE196EE66E005877BB /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
15CBA100196EE66E005877BB /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
15CBA102196EE66E005877BB /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
15CBA103196EE66E005877BB /* resources.ap_ */ = {isa = PBXFileReference; lastKnownFileType = file; path = resources.ap_; sourceTree = "<group>"; };
15CBA104196EE66E005877BB /* build-cfg.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "build-cfg.json"; sourceTree = "<group>"; };
15CBA105196EE66E005877BB /* build.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = build.xml; sourceTree = "<group>"; };
15CBA10A196EE66E005877BB /* R.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = R.java; sourceTree = "<group>"; };
15CBA10C196EE66E005877BB /* BuildConfig.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = BuildConfig.java; sourceTree = "<group>"; };
15CBA10D196EE66E005877BB /* R.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = R.java; sourceTree = "<group>"; };
15CBA10E196EE66E005877BB /* R.java.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = R.java.d; sourceTree = "<group>"; };
15CBA110196EE66E005877BB /* Android.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Android.mk; sourceTree = "<group>"; };
15CBA111196EE66E005877BB /* Application.mk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Application.mk; sourceTree = "<group>"; };
15CBA112196EE66E005877BB /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
15CBA115196EE66E005877BB /* liblua_game_controller.so */ = {isa = PBXFileReference; lastKnownFileType = file; path = liblua_game_controller.so; sourceTree = "<group>"; };
15CBA116196EE66E005877BB /* local.properties */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = local.properties; sourceTree = "<group>"; };
15CBA11A196EE66E005877BB /* libbox2d.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libbox2d.a; sourceTree = "<group>"; };
15CBA11B196EE66E005877BB /* libchipmunk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libchipmunk.a; sourceTree = "<group>"; };
15CBA11C196EE66E005877BB /* libcocos2d.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcocos2d.a; sourceTree = "<group>"; };
15CBA11D196EE66E005877BB /* libcocos2dandroid.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcocos2dandroid.a; sourceTree = "<group>"; };
15CBA11E196EE66E005877BB /* libcocosbuilder.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcocosbuilder.a; sourceTree = "<group>"; };
15CBA11F196EE66E005877BB /* libcocosdenshion.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcocosdenshion.a; sourceTree = "<group>"; };
15CBA120196EE66E005877BB /* libcocostudio.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcocostudio.a; sourceTree = "<group>"; };
15CBA121196EE66E005877BB /* libcpufeatures.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcpufeatures.a; sourceTree = "<group>"; };
15CBA122196EE66E005877BB /* libextension.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libextension.a; sourceTree = "<group>"; };
15CBA123196EE66E005877BB /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = liblua.a; sourceTree = "<group>"; };
15CBA124196EE66E005877BB /* liblua_game_controller.so */ = {isa = PBXFileReference; lastKnownFileType = file; path = liblua_game_controller.so; sourceTree = "<group>"; };
15CBA125196EE66E005877BB /* libnetwork.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libnetwork.a; sourceTree = "<group>"; };
15CBA126196EE66E005877BB /* libspine.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libspine.a; sourceTree = "<group>"; };
15CBA127196EE66E005877BB /* libui.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libui.a; sourceTree = "<group>"; };
15CBA12B196EE66E005877BB /* b2BroadPhase.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2BroadPhase.o; sourceTree = "<group>"; };
15CBA12C196EE66E005877BB /* b2BroadPhase.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2BroadPhase.o.d; sourceTree = "<group>"; };
15CBA12D196EE66E005877BB /* b2CollideCircle.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2CollideCircle.o; sourceTree = "<group>"; };
15CBA12E196EE66E005877BB /* b2CollideCircle.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2CollideCircle.o.d; sourceTree = "<group>"; };
15CBA12F196EE66E005877BB /* b2CollideEdge.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2CollideEdge.o; sourceTree = "<group>"; };
15CBA130196EE66E005877BB /* b2CollideEdge.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2CollideEdge.o.d; sourceTree = "<group>"; };
15CBA131196EE66E005877BB /* b2CollidePolygon.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2CollidePolygon.o; sourceTree = "<group>"; };
15CBA132196EE66E005877BB /* b2CollidePolygon.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2CollidePolygon.o.d; sourceTree = "<group>"; };
15CBA133196EE66E005877BB /* b2Collision.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Collision.o; sourceTree = "<group>"; };
15CBA134196EE66E005877BB /* b2Collision.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Collision.o.d; sourceTree = "<group>"; };
15CBA135196EE66E005877BB /* b2Distance.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Distance.o; sourceTree = "<group>"; };
15CBA136196EE66E005877BB /* b2Distance.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Distance.o.d; sourceTree = "<group>"; };
15CBA137196EE66E005877BB /* b2DynamicTree.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2DynamicTree.o; sourceTree = "<group>"; };
15CBA138196EE66E005877BB /* b2DynamicTree.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2DynamicTree.o.d; sourceTree = "<group>"; };
15CBA139196EE66E005877BB /* b2TimeOfImpact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2TimeOfImpact.o; sourceTree = "<group>"; };
15CBA13A196EE66E005877BB /* b2TimeOfImpact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2TimeOfImpact.o.d; sourceTree = "<group>"; };
15CBA13C196EE66E005877BB /* b2ChainShape.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2ChainShape.o; sourceTree = "<group>"; };
15CBA13D196EE66E005877BB /* b2ChainShape.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2ChainShape.o.d; sourceTree = "<group>"; };
15CBA13E196EE66E005877BB /* b2CircleShape.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2CircleShape.o; sourceTree = "<group>"; };
15CBA13F196EE66E005877BB /* b2CircleShape.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2CircleShape.o.d; sourceTree = "<group>"; };
15CBA140196EE66E005877BB /* b2EdgeShape.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2EdgeShape.o; sourceTree = "<group>"; };
15CBA141196EE66E005877BB /* b2EdgeShape.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2EdgeShape.o.d; sourceTree = "<group>"; };
15CBA142196EE66E005877BB /* b2PolygonShape.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2PolygonShape.o; sourceTree = "<group>"; };
15CBA143196EE66E005877BB /* b2PolygonShape.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2PolygonShape.o.d; sourceTree = "<group>"; };
15CBA145196EE66E005877BB /* b2BlockAllocator.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2BlockAllocator.o; sourceTree = "<group>"; };
15CBA146196EE66E005877BB /* b2BlockAllocator.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2BlockAllocator.o.d; sourceTree = "<group>"; };
15CBA147196EE66E005877BB /* b2Draw.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Draw.o; sourceTree = "<group>"; };
15CBA148196EE66E005877BB /* b2Draw.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Draw.o.d; sourceTree = "<group>"; };
15CBA149196EE66E005877BB /* b2Math.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Math.o; sourceTree = "<group>"; };
15CBA14A196EE66E005877BB /* b2Math.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Math.o.d; sourceTree = "<group>"; };
15CBA14B196EE66E005877BB /* b2Settings.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Settings.o; sourceTree = "<group>"; };
15CBA14C196EE66E005877BB /* b2Settings.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Settings.o.d; sourceTree = "<group>"; };
15CBA14D196EE66E005877BB /* b2StackAllocator.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2StackAllocator.o; sourceTree = "<group>"; };
15CBA14E196EE66E005877BB /* b2StackAllocator.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2StackAllocator.o.d; sourceTree = "<group>"; };
15CBA14F196EE66E005877BB /* b2Timer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Timer.o; sourceTree = "<group>"; };
15CBA150196EE66E005877BB /* b2Timer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Timer.o.d; sourceTree = "<group>"; };
15CBA152196EE66E005877BB /* b2Body.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Body.o; sourceTree = "<group>"; };
15CBA153196EE66E005877BB /* b2Body.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Body.o.d; sourceTree = "<group>"; };
15CBA154196EE66E005877BB /* b2ContactManager.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2ContactManager.o; sourceTree = "<group>"; };
15CBA155196EE66E005877BB /* b2ContactManager.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2ContactManager.o.d; sourceTree = "<group>"; };
15CBA156196EE66E005877BB /* b2Fixture.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Fixture.o; sourceTree = "<group>"; };
15CBA157196EE66E005877BB /* b2Fixture.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Fixture.o.d; sourceTree = "<group>"; };
15CBA158196EE66E005877BB /* b2Island.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Island.o; sourceTree = "<group>"; };
15CBA159196EE66E005877BB /* b2Island.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Island.o.d; sourceTree = "<group>"; };
15CBA15A196EE66E005877BB /* b2World.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2World.o; sourceTree = "<group>"; };
15CBA15B196EE66E005877BB /* b2World.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2World.o.d; sourceTree = "<group>"; };
15CBA15C196EE66E005877BB /* b2WorldCallbacks.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2WorldCallbacks.o; sourceTree = "<group>"; };
15CBA15D196EE66E005877BB /* b2WorldCallbacks.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2WorldCallbacks.o.d; sourceTree = "<group>"; };
15CBA15F196EE66E005877BB /* b2ChainAndCircleContact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2ChainAndCircleContact.o; sourceTree = "<group>"; };
15CBA160196EE66E005877BB /* b2ChainAndCircleContact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2ChainAndCircleContact.o.d; sourceTree = "<group>"; };
15CBA161196EE66E005877BB /* b2ChainAndPolygonContact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2ChainAndPolygonContact.o; sourceTree = "<group>"; };
15CBA162196EE66E005877BB /* b2ChainAndPolygonContact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2ChainAndPolygonContact.o.d; sourceTree = "<group>"; };
15CBA163196EE66E005877BB /* b2CircleContact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2CircleContact.o; sourceTree = "<group>"; };
15CBA164196EE66E005877BB /* b2CircleContact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2CircleContact.o.d; sourceTree = "<group>"; };
15CBA165196EE66E005877BB /* b2Contact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Contact.o; sourceTree = "<group>"; };
15CBA166196EE66E005877BB /* b2Contact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Contact.o.d; sourceTree = "<group>"; };
15CBA167196EE66E005877BB /* b2ContactSolver.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2ContactSolver.o; sourceTree = "<group>"; };
15CBA168196EE66E005877BB /* b2ContactSolver.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2ContactSolver.o.d; sourceTree = "<group>"; };
15CBA169196EE66E005877BB /* b2EdgeAndCircleContact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2EdgeAndCircleContact.o; sourceTree = "<group>"; };
15CBA16A196EE66E005877BB /* b2EdgeAndCircleContact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2EdgeAndCircleContact.o.d; sourceTree = "<group>"; };
15CBA16B196EE66E005877BB /* b2EdgeAndPolygonContact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2EdgeAndPolygonContact.o; sourceTree = "<group>"; };
15CBA16C196EE66E005877BB /* b2EdgeAndPolygonContact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2EdgeAndPolygonContact.o.d; sourceTree = "<group>"; };
15CBA16D196EE66E005877BB /* b2PolygonAndCircleContact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2PolygonAndCircleContact.o; sourceTree = "<group>"; };
15CBA16E196EE66E005877BB /* b2PolygonAndCircleContact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2PolygonAndCircleContact.o.d; sourceTree = "<group>"; };
15CBA16F196EE66E005877BB /* b2PolygonContact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2PolygonContact.o; sourceTree = "<group>"; };
15CBA170196EE66E005877BB /* b2PolygonContact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2PolygonContact.o.d; sourceTree = "<group>"; };
15CBA172196EE66E005877BB /* b2DistanceJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2DistanceJoint.o; sourceTree = "<group>"; };
15CBA173196EE66E005877BB /* b2DistanceJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2DistanceJoint.o.d; sourceTree = "<group>"; };
15CBA174196EE66E005877BB /* b2FrictionJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2FrictionJoint.o; sourceTree = "<group>"; };
15CBA175196EE66E005877BB /* b2FrictionJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2FrictionJoint.o.d; sourceTree = "<group>"; };
15CBA176196EE66E005877BB /* b2GearJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2GearJoint.o; sourceTree = "<group>"; };
15CBA177196EE66E005877BB /* b2GearJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2GearJoint.o.d; sourceTree = "<group>"; };
15CBA178196EE66E005877BB /* b2Joint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Joint.o; sourceTree = "<group>"; };
15CBA179196EE66E005877BB /* b2Joint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Joint.o.d; sourceTree = "<group>"; };
15CBA17A196EE66E005877BB /* b2MotorJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2MotorJoint.o; sourceTree = "<group>"; };
15CBA17B196EE66E005877BB /* b2MotorJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2MotorJoint.o.d; sourceTree = "<group>"; };
15CBA17C196EE66E005877BB /* b2MouseJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2MouseJoint.o; sourceTree = "<group>"; };
15CBA17D196EE66E005877BB /* b2MouseJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2MouseJoint.o.d; sourceTree = "<group>"; };
15CBA17E196EE66E005877BB /* b2PrismaticJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2PrismaticJoint.o; sourceTree = "<group>"; };
15CBA17F196EE66E005877BB /* b2PrismaticJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2PrismaticJoint.o.d; sourceTree = "<group>"; };
15CBA180196EE66E005877BB /* b2PulleyJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2PulleyJoint.o; sourceTree = "<group>"; };
15CBA181196EE66E005877BB /* b2PulleyJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2PulleyJoint.o.d; sourceTree = "<group>"; };
15CBA182196EE66E005877BB /* b2RevoluteJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2RevoluteJoint.o; sourceTree = "<group>"; };
15CBA183196EE66E005877BB /* b2RevoluteJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2RevoluteJoint.o.d; sourceTree = "<group>"; };
15CBA184196EE66E005877BB /* b2RopeJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2RopeJoint.o; sourceTree = "<group>"; };
15CBA185196EE66E005877BB /* b2RopeJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2RopeJoint.o.d; sourceTree = "<group>"; };
15CBA186196EE66E005877BB /* b2WeldJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2WeldJoint.o; sourceTree = "<group>"; };
15CBA187196EE66E005877BB /* b2WeldJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2WeldJoint.o.d; sourceTree = "<group>"; };
15CBA188196EE66E005877BB /* b2WheelJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2WheelJoint.o; sourceTree = "<group>"; };
15CBA189196EE66E005877BB /* b2WheelJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2WheelJoint.o.d; sourceTree = "<group>"; };
15CBA18B196EE66E005877BB /* b2Rope.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = b2Rope.o; sourceTree = "<group>"; };
15CBA18C196EE66E005877BB /* b2Rope.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = b2Rope.o.d; sourceTree = "<group>"; };
15CBA18F196EE66E005877BB /* chipmunk.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = chipmunk.o; sourceTree = "<group>"; };
15CBA190196EE66E005877BB /* chipmunk.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = chipmunk.o.d; sourceTree = "<group>"; };
15CBA192196EE66E005877BB /* cpConstraint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpConstraint.o; sourceTree = "<group>"; };
15CBA193196EE66E005877BB /* cpConstraint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpConstraint.o.d; sourceTree = "<group>"; };
15CBA194196EE66E005877BB /* cpDampedRotarySpring.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpDampedRotarySpring.o; sourceTree = "<group>"; };
15CBA195196EE66E005877BB /* cpDampedRotarySpring.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpDampedRotarySpring.o.d; sourceTree = "<group>"; };
15CBA196196EE66E005877BB /* cpDampedSpring.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpDampedSpring.o; sourceTree = "<group>"; };
15CBA197196EE66E005877BB /* cpDampedSpring.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpDampedSpring.o.d; sourceTree = "<group>"; };
15CBA198196EE66E005877BB /* cpGearJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpGearJoint.o; sourceTree = "<group>"; };
15CBA199196EE66E005877BB /* cpGearJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpGearJoint.o.d; sourceTree = "<group>"; };
15CBA19A196EE66E005877BB /* cpGrooveJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpGrooveJoint.o; sourceTree = "<group>"; };
15CBA19B196EE66E005877BB /* cpGrooveJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpGrooveJoint.o.d; sourceTree = "<group>"; };
15CBA19C196EE66E005877BB /* cpPinJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpPinJoint.o; sourceTree = "<group>"; };
15CBA19D196EE66E005877BB /* cpPinJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpPinJoint.o.d; sourceTree = "<group>"; };
15CBA19E196EE66E005877BB /* cpPivotJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpPivotJoint.o; sourceTree = "<group>"; };
15CBA19F196EE66E005877BB /* cpPivotJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpPivotJoint.o.d; sourceTree = "<group>"; };
15CBA1A0196EE66E005877BB /* cpRatchetJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpRatchetJoint.o; sourceTree = "<group>"; };
15CBA1A1196EE66E005877BB /* cpRatchetJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpRatchetJoint.o.d; sourceTree = "<group>"; };
15CBA1A2196EE66E005877BB /* cpRotaryLimitJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpRotaryLimitJoint.o; sourceTree = "<group>"; };
15CBA1A3196EE66E005877BB /* cpRotaryLimitJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpRotaryLimitJoint.o.d; sourceTree = "<group>"; };
15CBA1A4196EE66E005877BB /* cpSimpleMotor.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpSimpleMotor.o; sourceTree = "<group>"; };
15CBA1A5196EE66E005877BB /* cpSimpleMotor.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpSimpleMotor.o.d; sourceTree = "<group>"; };
15CBA1A6196EE66E005877BB /* cpSlideJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpSlideJoint.o; sourceTree = "<group>"; };
15CBA1A7196EE66E005877BB /* cpSlideJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpSlideJoint.o.d; sourceTree = "<group>"; };
15CBA1A8196EE66E005877BB /* cpArbiter.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpArbiter.o; sourceTree = "<group>"; };
15CBA1A9196EE66E005877BB /* cpArbiter.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpArbiter.o.d; sourceTree = "<group>"; };
15CBA1AA196EE66E005877BB /* cpArray.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpArray.o; sourceTree = "<group>"; };
15CBA1AB196EE66E005877BB /* cpArray.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpArray.o.d; sourceTree = "<group>"; };
15CBA1AC196EE66E005877BB /* cpBB.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpBB.o; sourceTree = "<group>"; };
15CBA1AD196EE66E005877BB /* cpBB.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpBB.o.d; sourceTree = "<group>"; };
15CBA1AE196EE66E005877BB /* cpBBTree.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpBBTree.o; sourceTree = "<group>"; };
15CBA1AF196EE66E005877BB /* cpBBTree.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpBBTree.o.d; sourceTree = "<group>"; };
15CBA1B0196EE66E005877BB /* cpBody.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpBody.o; sourceTree = "<group>"; };
15CBA1B1196EE66E005877BB /* cpBody.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpBody.o.d; sourceTree = "<group>"; };
15CBA1B2196EE66E005877BB /* cpCollision.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpCollision.o; sourceTree = "<group>"; };
15CBA1B3196EE66E005877BB /* cpCollision.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpCollision.o.d; sourceTree = "<group>"; };
15CBA1B4196EE66E005877BB /* cpHashSet.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpHashSet.o; sourceTree = "<group>"; };
15CBA1B5196EE66E005877BB /* cpHashSet.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpHashSet.o.d; sourceTree = "<group>"; };
15CBA1B6196EE66E005877BB /* cpPolyShape.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpPolyShape.o; sourceTree = "<group>"; };
15CBA1B7196EE66E005877BB /* cpPolyShape.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpPolyShape.o.d; sourceTree = "<group>"; };
15CBA1B8196EE66E005877BB /* cpShape.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpShape.o; sourceTree = "<group>"; };
15CBA1B9196EE66E005877BB /* cpShape.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpShape.o.d; sourceTree = "<group>"; };
15CBA1BA196EE66E005877BB /* cpSpace.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpSpace.o; sourceTree = "<group>"; };
15CBA1BB196EE66E005877BB /* cpSpace.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpSpace.o.d; sourceTree = "<group>"; };
15CBA1BC196EE66E005877BB /* cpSpaceComponent.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpSpaceComponent.o; sourceTree = "<group>"; };
15CBA1BD196EE66E005877BB /* cpSpaceComponent.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpSpaceComponent.o.d; sourceTree = "<group>"; };
15CBA1BE196EE66E005877BB /* cpSpaceHash.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpSpaceHash.o; sourceTree = "<group>"; };
15CBA1BF196EE66E005877BB /* cpSpaceHash.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpSpaceHash.o.d; sourceTree = "<group>"; };
15CBA1C0196EE66E005877BB /* cpSpaceQuery.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpSpaceQuery.o; sourceTree = "<group>"; };
15CBA1C1196EE66E005877BB /* cpSpaceQuery.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpSpaceQuery.o.d; sourceTree = "<group>"; };
15CBA1C2196EE66E005877BB /* cpSpaceStep.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpSpaceStep.o; sourceTree = "<group>"; };
15CBA1C3196EE66E005877BB /* cpSpaceStep.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpSpaceStep.o.d; sourceTree = "<group>"; };
15CBA1C4196EE66E005877BB /* cpSpatialIndex.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpSpatialIndex.o; sourceTree = "<group>"; };
15CBA1C5196EE66E005877BB /* cpSpatialIndex.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpSpatialIndex.o.d; sourceTree = "<group>"; };
15CBA1C6196EE66E005877BB /* cpSweep1D.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpSweep1D.o; sourceTree = "<group>"; };
15CBA1C7196EE66E005877BB /* cpSweep1D.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpSweep1D.o.d; sourceTree = "<group>"; };
15CBA1C8196EE66E005877BB /* cpVect.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cpVect.o; sourceTree = "<group>"; };
15CBA1C9196EE66E005877BB /* cpVect.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cpVect.o.d; sourceTree = "<group>"; };
15CBA1CC196EE66E005877BB /* CCAction.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCAction.o; sourceTree = "<group>"; };
15CBA1CD196EE66E005877BB /* CCAction.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCAction.o.d; sourceTree = "<group>"; };
15CBA1CE196EE66E005877BB /* CCActionCamera.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionCamera.o; sourceTree = "<group>"; };
15CBA1CF196EE66E005877BB /* CCActionCamera.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionCamera.o.d; sourceTree = "<group>"; };
15CBA1D0196EE66E005877BB /* CCActionCatmullRom.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionCatmullRom.o; sourceTree = "<group>"; };
15CBA1D1196EE66E005877BB /* CCActionCatmullRom.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionCatmullRom.o.d; sourceTree = "<group>"; };
15CBA1D2196EE66E005877BB /* CCActionEase.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionEase.o; sourceTree = "<group>"; };
15CBA1D3196EE66E005877BB /* CCActionEase.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionEase.o.d; sourceTree = "<group>"; };
15CBA1D4196EE66E005877BB /* CCActionGrid.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionGrid.o; sourceTree = "<group>"; };
15CBA1D5196EE66E005877BB /* CCActionGrid.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionGrid.o.d; sourceTree = "<group>"; };
15CBA1D6196EE66E005877BB /* CCActionGrid3D.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionGrid3D.o; sourceTree = "<group>"; };
15CBA1D7196EE66E005877BB /* CCActionGrid3D.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionGrid3D.o.d; sourceTree = "<group>"; };
15CBA1D8196EE66E005877BB /* CCActionInstant.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionInstant.o; sourceTree = "<group>"; };
15CBA1D9196EE66E005877BB /* CCActionInstant.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionInstant.o.d; sourceTree = "<group>"; };
15CBA1DA196EE66E005877BB /* CCActionInterval.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionInterval.o; sourceTree = "<group>"; };
15CBA1DB196EE66E005877BB /* CCActionInterval.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionInterval.o.d; sourceTree = "<group>"; };
15CBA1DC196EE66E005877BB /* CCActionManager.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionManager.o; sourceTree = "<group>"; };
15CBA1DD196EE66E005877BB /* CCActionManager.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionManager.o.d; sourceTree = "<group>"; };
15CBA1DE196EE66E005877BB /* CCActionPageTurn3D.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionPageTurn3D.o; sourceTree = "<group>"; };
15CBA1DF196EE66E005877BB /* CCActionPageTurn3D.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionPageTurn3D.o.d; sourceTree = "<group>"; };
15CBA1E0196EE66E005877BB /* CCActionProgressTimer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionProgressTimer.o; sourceTree = "<group>"; };
15CBA1E1196EE66E005877BB /* CCActionProgressTimer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionProgressTimer.o.d; sourceTree = "<group>"; };
15CBA1E2196EE66E005877BB /* CCActionTiledGrid.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionTiledGrid.o; sourceTree = "<group>"; };
15CBA1E3196EE66E005877BB /* CCActionTiledGrid.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionTiledGrid.o.d; sourceTree = "<group>"; };
15CBA1E4196EE66E005877BB /* CCActionTween.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionTween.o; sourceTree = "<group>"; };
15CBA1E5196EE66E005877BB /* CCActionTween.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionTween.o.d; sourceTree = "<group>"; };
15CBA1E6196EE66E005877BB /* CCAnimation.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCAnimation.o; sourceTree = "<group>"; };
15CBA1E7196EE66E005877BB /* CCAnimation.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCAnimation.o.d; sourceTree = "<group>"; };
15CBA1E8196EE66E005877BB /* CCAnimationCache.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCAnimationCache.o; sourceTree = "<group>"; };
15CBA1E9196EE66E005877BB /* CCAnimationCache.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCAnimationCache.o.d; sourceTree = "<group>"; };
15CBA1EA196EE66E005877BB /* CCAtlasNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCAtlasNode.o; sourceTree = "<group>"; };
15CBA1EB196EE66E005877BB /* CCAtlasNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCAtlasNode.o.d; sourceTree = "<group>"; };
15CBA1EC196EE66E005877BB /* CCClippingNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCClippingNode.o; sourceTree = "<group>"; };
15CBA1ED196EE66E005877BB /* CCClippingNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCClippingNode.o.d; sourceTree = "<group>"; };
15CBA1EE196EE66E005877BB /* CCComponent.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCComponent.o; sourceTree = "<group>"; };
15CBA1EF196EE66E005877BB /* CCComponent.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCComponent.o.d; sourceTree = "<group>"; };
15CBA1F0196EE66E005877BB /* CCComponentContainer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCComponentContainer.o; sourceTree = "<group>"; };
15CBA1F1196EE66E005877BB /* CCComponentContainer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCComponentContainer.o.d; sourceTree = "<group>"; };
15CBA1F2196EE66E005877BB /* CCDrawingPrimitives.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDrawingPrimitives.o; sourceTree = "<group>"; };
15CBA1F3196EE66E005877BB /* CCDrawingPrimitives.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDrawingPrimitives.o.d; sourceTree = "<group>"; };
15CBA1F4196EE66E005877BB /* CCDrawNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDrawNode.o; sourceTree = "<group>"; };
15CBA1F5196EE66E005877BB /* CCDrawNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDrawNode.o.d; sourceTree = "<group>"; };
15CBA1F6196EE66E005877BB /* CCFastTMXLayer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFastTMXLayer.o; sourceTree = "<group>"; };
15CBA1F7196EE66E005877BB /* CCFastTMXLayer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFastTMXLayer.o.d; sourceTree = "<group>"; };
15CBA1F8196EE66E005877BB /* CCFastTMXTiledMap.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFastTMXTiledMap.o; sourceTree = "<group>"; };
15CBA1F9196EE66E005877BB /* CCFastTMXTiledMap.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFastTMXTiledMap.o.d; sourceTree = "<group>"; };
15CBA1FA196EE66E005877BB /* CCFont.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFont.o; sourceTree = "<group>"; };
15CBA1FB196EE66E005877BB /* CCFont.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFont.o.d; sourceTree = "<group>"; };
15CBA1FC196EE66E005877BB /* CCFontAtlas.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFontAtlas.o; sourceTree = "<group>"; };
15CBA1FD196EE66E005877BB /* CCFontAtlas.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFontAtlas.o.d; sourceTree = "<group>"; };
15CBA1FE196EE66E005877BB /* CCFontAtlasCache.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFontAtlasCache.o; sourceTree = "<group>"; };
15CBA1FF196EE66E005877BB /* CCFontAtlasCache.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFontAtlasCache.o.d; sourceTree = "<group>"; };
15CBA200196EE66E005877BB /* CCFontCharMap.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFontCharMap.o; sourceTree = "<group>"; };
15CBA201196EE66E005877BB /* CCFontCharMap.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFontCharMap.o.d; sourceTree = "<group>"; };
15CBA202196EE66E005877BB /* CCFontFNT.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFontFNT.o; sourceTree = "<group>"; };
15CBA203196EE66E005877BB /* CCFontFNT.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFontFNT.o.d; sourceTree = "<group>"; };
15CBA204196EE66E005877BB /* CCFontFreeType.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFontFreeType.o; sourceTree = "<group>"; };
15CBA205196EE66E005877BB /* CCFontFreeType.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFontFreeType.o.d; sourceTree = "<group>"; };
15CBA206196EE66E005877BB /* CCGLBufferedNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGLBufferedNode.o; sourceTree = "<group>"; };
15CBA207196EE66E005877BB /* CCGLBufferedNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGLBufferedNode.o.d; sourceTree = "<group>"; };
15CBA208196EE66E005877BB /* CCGrabber.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGrabber.o; sourceTree = "<group>"; };
15CBA209196EE66E005877BB /* CCGrabber.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGrabber.o.d; sourceTree = "<group>"; };
15CBA20A196EE66E005877BB /* CCGrid.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGrid.o; sourceTree = "<group>"; };
15CBA20B196EE66E005877BB /* CCGrid.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGrid.o.d; sourceTree = "<group>"; };
15CBA20C196EE66E005877BB /* CCLabel.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLabel.o; sourceTree = "<group>"; };
15CBA20D196EE66E005877BB /* CCLabel.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLabel.o.d; sourceTree = "<group>"; };
15CBA20E196EE66E005877BB /* CCLabelAtlas.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLabelAtlas.o; sourceTree = "<group>"; };
15CBA20F196EE66E005877BB /* CCLabelAtlas.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLabelAtlas.o.d; sourceTree = "<group>"; };
15CBA210196EE66E005877BB /* CCLabelBMFont.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLabelBMFont.o; sourceTree = "<group>"; };
15CBA211196EE66E005877BB /* CCLabelBMFont.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLabelBMFont.o.d; sourceTree = "<group>"; };
15CBA212196EE66E005877BB /* CCLabelTextFormatter.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLabelTextFormatter.o; sourceTree = "<group>"; };
15CBA213196EE66E005877BB /* CCLabelTextFormatter.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLabelTextFormatter.o.d; sourceTree = "<group>"; };
15CBA214196EE66E005877BB /* CCLabelTTF.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLabelTTF.o; sourceTree = "<group>"; };
15CBA215196EE66E005877BB /* CCLabelTTF.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLabelTTF.o.d; sourceTree = "<group>"; };
15CBA216196EE66E005877BB /* CCLayer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLayer.o; sourceTree = "<group>"; };
15CBA217196EE66E005877BB /* CCLayer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLayer.o.d; sourceTree = "<group>"; };
15CBA218196EE66E005877BB /* CCMenu.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCMenu.o; sourceTree = "<group>"; };
15CBA219196EE66E005877BB /* CCMenu.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCMenu.o.d; sourceTree = "<group>"; };
15CBA21A196EE66E005877BB /* CCMenuItem.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCMenuItem.o; sourceTree = "<group>"; };
15CBA21B196EE66E005877BB /* CCMenuItem.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCMenuItem.o.d; sourceTree = "<group>"; };
15CBA21C196EE66E005877BB /* CCMotionStreak.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCMotionStreak.o; sourceTree = "<group>"; };
15CBA21D196EE66E005877BB /* CCMotionStreak.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCMotionStreak.o.d; sourceTree = "<group>"; };
15CBA21E196EE66E005877BB /* CCNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCNode.o; sourceTree = "<group>"; };
15CBA21F196EE66E005877BB /* CCNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCNode.o.d; sourceTree = "<group>"; };
15CBA220196EE66E005877BB /* CCNodeGrid.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCNodeGrid.o; sourceTree = "<group>"; };
15CBA221196EE66E005877BB /* CCNodeGrid.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCNodeGrid.o.d; sourceTree = "<group>"; };
15CBA222196EE66E005877BB /* CCParallaxNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCParallaxNode.o; sourceTree = "<group>"; };
15CBA223196EE66E005877BB /* CCParallaxNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCParallaxNode.o.d; sourceTree = "<group>"; };
15CBA224196EE66E005877BB /* CCParticleBatchNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCParticleBatchNode.o; sourceTree = "<group>"; };
15CBA225196EE66E005877BB /* CCParticleBatchNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCParticleBatchNode.o.d; sourceTree = "<group>"; };
15CBA226196EE66E005877BB /* CCParticleExamples.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCParticleExamples.o; sourceTree = "<group>"; };
15CBA227196EE66E005877BB /* CCParticleExamples.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCParticleExamples.o.d; sourceTree = "<group>"; };
15CBA228196EE66E005877BB /* CCParticleSystem.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCParticleSystem.o; sourceTree = "<group>"; };
15CBA229196EE66E005877BB /* CCParticleSystem.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCParticleSystem.o.d; sourceTree = "<group>"; };
15CBA22A196EE66E005877BB /* CCParticleSystemQuad.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCParticleSystemQuad.o; sourceTree = "<group>"; };
15CBA22B196EE66E005877BB /* CCParticleSystemQuad.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCParticleSystemQuad.o.d; sourceTree = "<group>"; };
15CBA22C196EE66E005877BB /* CCProgressTimer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCProgressTimer.o; sourceTree = "<group>"; };
15CBA22D196EE66E005877BB /* CCProgressTimer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCProgressTimer.o.d; sourceTree = "<group>"; };
15CBA22E196EE66E005877BB /* CCRenderTexture.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCRenderTexture.o; sourceTree = "<group>"; };
15CBA22F196EE66E005877BB /* CCRenderTexture.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCRenderTexture.o.d; sourceTree = "<group>"; };
15CBA230196EE66E005877BB /* CCScene.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCScene.o; sourceTree = "<group>"; };
15CBA231196EE66E005877BB /* CCScene.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCScene.o.d; sourceTree = "<group>"; };
15CBA232196EE66E005877BB /* CCSprite.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSprite.o; sourceTree = "<group>"; };
15CBA233196EE66E005877BB /* CCSprite.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSprite.o.d; sourceTree = "<group>"; };
15CBA234196EE66E005877BB /* CCSpriteBatchNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSpriteBatchNode.o; sourceTree = "<group>"; };
15CBA235196EE66E005877BB /* CCSpriteBatchNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSpriteBatchNode.o.d; sourceTree = "<group>"; };
15CBA236196EE66E005877BB /* CCSpriteFrame.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSpriteFrame.o; sourceTree = "<group>"; };
15CBA237196EE66E005877BB /* CCSpriteFrame.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSpriteFrame.o.d; sourceTree = "<group>"; };
15CBA238196EE66E005877BB /* CCSpriteFrameCache.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSpriteFrameCache.o; sourceTree = "<group>"; };
15CBA239196EE66E005877BB /* CCSpriteFrameCache.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSpriteFrameCache.o.d; sourceTree = "<group>"; };
15CBA23A196EE66E005877BB /* CCTextFieldTTF.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTextFieldTTF.o; sourceTree = "<group>"; };
15CBA23B196EE66E005877BB /* CCTextFieldTTF.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTextFieldTTF.o.d; sourceTree = "<group>"; };
15CBA23C196EE66E005877BB /* CCTileMapAtlas.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTileMapAtlas.o; sourceTree = "<group>"; };
15CBA23D196EE66E005877BB /* CCTileMapAtlas.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTileMapAtlas.o.d; sourceTree = "<group>"; };
15CBA23E196EE66E005877BB /* CCTMXLayer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTMXLayer.o; sourceTree = "<group>"; };
15CBA23F196EE66E005877BB /* CCTMXLayer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTMXLayer.o.d; sourceTree = "<group>"; };
15CBA240196EE66E005877BB /* CCTMXObjectGroup.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTMXObjectGroup.o; sourceTree = "<group>"; };
15CBA241196EE66E005877BB /* CCTMXObjectGroup.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTMXObjectGroup.o.d; sourceTree = "<group>"; };
15CBA242196EE66E005877BB /* CCTMXTiledMap.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTMXTiledMap.o; sourceTree = "<group>"; };
15CBA243196EE66E005877BB /* CCTMXTiledMap.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTMXTiledMap.o.d; sourceTree = "<group>"; };
15CBA244196EE66E005877BB /* CCTMXXMLParser.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTMXXMLParser.o; sourceTree = "<group>"; };
15CBA245196EE66E005877BB /* CCTMXXMLParser.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTMXXMLParser.o.d; sourceTree = "<group>"; };
15CBA246196EE66E005877BB /* CCTransition.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTransition.o; sourceTree = "<group>"; };
15CBA247196EE66E005877BB /* CCTransition.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTransition.o.d; sourceTree = "<group>"; };
15CBA248196EE66E005877BB /* CCTransitionPageTurn.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTransitionPageTurn.o; sourceTree = "<group>"; };
15CBA249196EE66E005877BB /* CCTransitionPageTurn.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTransitionPageTurn.o.d; sourceTree = "<group>"; };
15CBA24A196EE66E005877BB /* CCTransitionProgress.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTransitionProgress.o; sourceTree = "<group>"; };
15CBA24B196EE66E005877BB /* CCTransitionProgress.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTransitionProgress.o.d; sourceTree = "<group>"; };
15CBA24C196EE66F005877BB /* CCTweenFunction.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTweenFunction.o; sourceTree = "<group>"; };
15CBA24D196EE66F005877BB /* CCTweenFunction.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTweenFunction.o.d; sourceTree = "<group>"; };
15CBA24F196EE66F005877BB /* CCAnimate3D.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCAnimate3D.o; sourceTree = "<group>"; };
15CBA250196EE66F005877BB /* CCAnimate3D.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCAnimate3D.o.d; sourceTree = "<group>"; };
15CBA251196EE66F005877BB /* CCAnimation3D.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCAnimation3D.o; sourceTree = "<group>"; };
15CBA252196EE66F005877BB /* CCAnimation3D.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCAnimation3D.o.d; sourceTree = "<group>"; };
15CBA253196EE66F005877BB /* CCBundle3D.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBundle3D.o; sourceTree = "<group>"; };
15CBA254196EE66F005877BB /* CCBundle3D.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBundle3D.o.d; sourceTree = "<group>"; };
15CBA255196EE66F005877BB /* CCBundleReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBundleReader.o; sourceTree = "<group>"; };
15CBA256196EE66F005877BB /* CCBundleReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBundleReader.o.d; sourceTree = "<group>"; };
15CBA257196EE66F005877BB /* CCMesh.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCMesh.o; sourceTree = "<group>"; };
15CBA258196EE66F005877BB /* CCMesh.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCMesh.o.d; sourceTree = "<group>"; };
15CBA259196EE66F005877BB /* CCMeshSkin.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCMeshSkin.o; sourceTree = "<group>"; };
15CBA25A196EE66F005877BB /* CCMeshSkin.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCMeshSkin.o.d; sourceTree = "<group>"; };
15CBA25B196EE66F005877BB /* CCObjLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCObjLoader.o; sourceTree = "<group>"; };
15CBA25C196EE66F005877BB /* CCObjLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCObjLoader.o.d; sourceTree = "<group>"; };
15CBA25D196EE66F005877BB /* CCSprite3D.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSprite3D.o; sourceTree = "<group>"; };
15CBA25E196EE66F005877BB /* CCSprite3D.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSprite3D.o.d; sourceTree = "<group>"; };
15CBA25F196EE66F005877BB /* CCSprite3DMaterial.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSprite3DMaterial.o; sourceTree = "<group>"; };
15CBA260196EE66F005877BB /* CCSprite3DMaterial.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSprite3DMaterial.o.d; sourceTree = "<group>"; };
15CBA264196EE66F005877BB /* ConvertUTF.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ConvertUTF.o; sourceTree = "<group>"; };
15CBA265196EE66F005877BB /* ConvertUTF.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ConvertUTF.o.d; sourceTree = "<group>"; };
15CBA266196EE66F005877BB /* ConvertUTFWrapper.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ConvertUTFWrapper.o; sourceTree = "<group>"; };
15CBA267196EE66F005877BB /* ConvertUTFWrapper.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ConvertUTFWrapper.o.d; sourceTree = "<group>"; };
15CBA269196EE66F005877BB /* edtaa3func.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = edtaa3func.o; sourceTree = "<group>"; };
15CBA26A196EE66F005877BB /* edtaa3func.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = edtaa3func.o.d; sourceTree = "<group>"; };
15CBA26C196EE66F005877BB /* tinyxml2.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = tinyxml2.o; sourceTree = "<group>"; };
15CBA26D196EE66F005877BB /* tinyxml2.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = tinyxml2.o.d; sourceTree = "<group>"; };
15CBA26F196EE66F005877BB /* ioapi.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ioapi.o; sourceTree = "<group>"; };
15CBA270196EE66F005877BB /* ioapi.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ioapi.o.d; sourceTree = "<group>"; };
15CBA271196EE66F005877BB /* unzip.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = unzip.o; sourceTree = "<group>"; };
15CBA272196EE66F005877BB /* unzip.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = unzip.o.d; sourceTree = "<group>"; };
15CBA274196EE66F005877BB /* xxhash.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = xxhash.o; sourceTree = "<group>"; };
15CBA275196EE66F005877BB /* xxhash.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = xxhash.o.d; sourceTree = "<group>"; };
15CBA277196EE66F005877BB /* atitc.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = atitc.o; sourceTree = "<group>"; };
15CBA278196EE66F005877BB /* atitc.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = atitc.o.d; sourceTree = "<group>"; };
15CBA279196EE66F005877BB /* base64.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = base64.o; sourceTree = "<group>"; };
15CBA27A196EE66F005877BB /* base64.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = base64.o.d; sourceTree = "<group>"; };
15CBA27B196EE66F005877BB /* CCAutoreleasePool.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCAutoreleasePool.o; sourceTree = "<group>"; };
15CBA27C196EE66F005877BB /* CCAutoreleasePool.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCAutoreleasePool.o.d; sourceTree = "<group>"; };
15CBA27D196EE66F005877BB /* ccCArray.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ccCArray.o; sourceTree = "<group>"; };
15CBA27E196EE66F005877BB /* ccCArray.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ccCArray.o.d; sourceTree = "<group>"; };
15CBA27F196EE66F005877BB /* CCConfiguration.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCConfiguration.o; sourceTree = "<group>"; };
15CBA280196EE66F005877BB /* CCConfiguration.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCConfiguration.o.d; sourceTree = "<group>"; };
15CBA281196EE66F005877BB /* CCConsole.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCConsole.o; sourceTree = "<group>"; };
15CBA282196EE66F005877BB /* CCConsole.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCConsole.o.d; sourceTree = "<group>"; };
15CBA283196EE66F005877BB /* CCController-android.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "CCController-android.o"; sourceTree = "<group>"; };
15CBA284196EE66F005877BB /* CCController-android.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = "CCController-android.o.d"; sourceTree = "<group>"; };
15CBA285196EE66F005877BB /* CCController.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCController.o; sourceTree = "<group>"; };
15CBA286196EE66F005877BB /* CCController.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCController.o.d; sourceTree = "<group>"; };
15CBA287196EE66F005877BB /* CCData.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCData.o; sourceTree = "<group>"; };
15CBA288196EE66F005877BB /* CCData.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCData.o.d; sourceTree = "<group>"; };
15CBA289196EE66F005877BB /* CCDataVisitor.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDataVisitor.o; sourceTree = "<group>"; };
15CBA28A196EE66F005877BB /* CCDataVisitor.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDataVisitor.o.d; sourceTree = "<group>"; };
15CBA28B196EE66F005877BB /* CCDirector.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDirector.o; sourceTree = "<group>"; };
15CBA28C196EE66F005877BB /* CCDirector.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDirector.o.d; sourceTree = "<group>"; };
15CBA28D196EE66F005877BB /* CCEvent.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEvent.o; sourceTree = "<group>"; };
15CBA28E196EE66F005877BB /* CCEvent.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEvent.o.d; sourceTree = "<group>"; };
15CBA28F196EE66F005877BB /* CCEventAcceleration.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventAcceleration.o; sourceTree = "<group>"; };
15CBA290196EE66F005877BB /* CCEventAcceleration.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventAcceleration.o.d; sourceTree = "<group>"; };
15CBA291196EE66F005877BB /* CCEventController.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventController.o; sourceTree = "<group>"; };
15CBA292196EE66F005877BB /* CCEventController.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventController.o.d; sourceTree = "<group>"; };
15CBA293196EE66F005877BB /* CCEventCustom.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventCustom.o; sourceTree = "<group>"; };
15CBA294196EE66F005877BB /* CCEventCustom.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventCustom.o.d; sourceTree = "<group>"; };
15CBA295196EE66F005877BB /* CCEventDispatcher.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventDispatcher.o; sourceTree = "<group>"; };
15CBA296196EE66F005877BB /* CCEventDispatcher.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventDispatcher.o.d; sourceTree = "<group>"; };
15CBA297196EE66F005877BB /* CCEventFocus.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventFocus.o; sourceTree = "<group>"; };
15CBA298196EE66F005877BB /* CCEventFocus.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventFocus.o.d; sourceTree = "<group>"; };
15CBA299196EE66F005877BB /* CCEventKeyboard.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventKeyboard.o; sourceTree = "<group>"; };
15CBA29A196EE66F005877BB /* CCEventKeyboard.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventKeyboard.o.d; sourceTree = "<group>"; };
15CBA29B196EE66F005877BB /* CCEventListener.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventListener.o; sourceTree = "<group>"; };
15CBA29C196EE66F005877BB /* CCEventListener.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventListener.o.d; sourceTree = "<group>"; };
15CBA29D196EE66F005877BB /* CCEventListenerAcceleration.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventListenerAcceleration.o; sourceTree = "<group>"; };
15CBA29E196EE66F005877BB /* CCEventListenerAcceleration.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventListenerAcceleration.o.d; sourceTree = "<group>"; };
15CBA29F196EE66F005877BB /* CCEventListenerController.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventListenerController.o; sourceTree = "<group>"; };
15CBA2A0196EE66F005877BB /* CCEventListenerController.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventListenerController.o.d; sourceTree = "<group>"; };
15CBA2A1196EE66F005877BB /* CCEventListenerCustom.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventListenerCustom.o; sourceTree = "<group>"; };
15CBA2A2196EE66F005877BB /* CCEventListenerCustom.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventListenerCustom.o.d; sourceTree = "<group>"; };
15CBA2A3196EE66F005877BB /* CCEventListenerFocus.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventListenerFocus.o; sourceTree = "<group>"; };
15CBA2A4196EE66F005877BB /* CCEventListenerFocus.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventListenerFocus.o.d; sourceTree = "<group>"; };
15CBA2A5196EE66F005877BB /* CCEventListenerKeyboard.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventListenerKeyboard.o; sourceTree = "<group>"; };
15CBA2A6196EE66F005877BB /* CCEventListenerKeyboard.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventListenerKeyboard.o.d; sourceTree = "<group>"; };
15CBA2A7196EE66F005877BB /* CCEventListenerMouse.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventListenerMouse.o; sourceTree = "<group>"; };
15CBA2A8196EE66F005877BB /* CCEventListenerMouse.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventListenerMouse.o.d; sourceTree = "<group>"; };
15CBA2A9196EE66F005877BB /* CCEventListenerTouch.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventListenerTouch.o; sourceTree = "<group>"; };
15CBA2AA196EE66F005877BB /* CCEventListenerTouch.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventListenerTouch.o.d; sourceTree = "<group>"; };
15CBA2AB196EE66F005877BB /* CCEventMouse.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventMouse.o; sourceTree = "<group>"; };
15CBA2AC196EE66F005877BB /* CCEventMouse.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventMouse.o.d; sourceTree = "<group>"; };
15CBA2AD196EE66F005877BB /* CCEventTouch.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEventTouch.o; sourceTree = "<group>"; };
15CBA2AE196EE66F005877BB /* CCEventTouch.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEventTouch.o.d; sourceTree = "<group>"; };
15CBA2AF196EE66F005877BB /* ccFPSImages.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ccFPSImages.o; sourceTree = "<group>"; };
15CBA2B0196EE66F005877BB /* ccFPSImages.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ccFPSImages.o.d; sourceTree = "<group>"; };
15CBA2B1196EE66F005877BB /* CCIMEDispatcher.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCIMEDispatcher.o; sourceTree = "<group>"; };
15CBA2B2196EE66F005877BB /* CCIMEDispatcher.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCIMEDispatcher.o.d; sourceTree = "<group>"; };
15CBA2B3196EE66F005877BB /* CCNS.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCNS.o; sourceTree = "<group>"; };
15CBA2B4196EE66F005877BB /* CCNS.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCNS.o.d; sourceTree = "<group>"; };
15CBA2B5196EE66F005877BB /* CCProfiling.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCProfiling.o; sourceTree = "<group>"; };
15CBA2B6196EE66F005877BB /* CCProfiling.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCProfiling.o.d; sourceTree = "<group>"; };
15CBA2B7196EE66F005877BB /* CCRef.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCRef.o; sourceTree = "<group>"; };
15CBA2B8196EE66F005877BB /* CCRef.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCRef.o.d; sourceTree = "<group>"; };
15CBA2B9196EE66F005877BB /* CCScheduler.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCScheduler.o; sourceTree = "<group>"; };
15CBA2BA196EE66F005877BB /* CCScheduler.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCScheduler.o.d; sourceTree = "<group>"; };
15CBA2BB196EE66F005877BB /* CCScriptSupport.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCScriptSupport.o; sourceTree = "<group>"; };
15CBA2BC196EE66F005877BB /* CCScriptSupport.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCScriptSupport.o.d; sourceTree = "<group>"; };
15CBA2BD196EE66F005877BB /* CCTouch.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTouch.o; sourceTree = "<group>"; };
15CBA2BE196EE66F005877BB /* CCTouch.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTouch.o.d; sourceTree = "<group>"; };
15CBA2BF196EE66F005877BB /* ccTypes.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ccTypes.o; sourceTree = "<group>"; };
15CBA2C0196EE66F005877BB /* ccTypes.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ccTypes.o.d; sourceTree = "<group>"; };
15CBA2C1196EE66F005877BB /* CCUserDefault.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCUserDefault.o; sourceTree = "<group>"; };
15CBA2C2196EE66F005877BB /* CCUserDefault.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCUserDefault.o.d; sourceTree = "<group>"; };
15CBA2C3196EE66F005877BB /* CCUserDefaultAndroid.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCUserDefaultAndroid.o; sourceTree = "<group>"; };
15CBA2C4196EE66F005877BB /* CCUserDefaultAndroid.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCUserDefaultAndroid.o.d; sourceTree = "<group>"; };
15CBA2C5196EE66F005877BB /* ccUTF8.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ccUTF8.o; sourceTree = "<group>"; };
15CBA2C6196EE66F005877BB /* ccUTF8.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ccUTF8.o.d; sourceTree = "<group>"; };
15CBA2C7196EE66F005877BB /* ccUtils.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ccUtils.o; sourceTree = "<group>"; };
15CBA2C8196EE66F005877BB /* ccUtils.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ccUtils.o.d; sourceTree = "<group>"; };
15CBA2C9196EE66F005877BB /* CCValue.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCValue.o; sourceTree = "<group>"; };
15CBA2CA196EE66F005877BB /* CCValue.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCValue.o.d; sourceTree = "<group>"; };
15CBA2CB196EE66F005877BB /* etc1.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = etc1.o; sourceTree = "<group>"; };
15CBA2CC196EE66F005877BB /* etc1.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = etc1.o.d; sourceTree = "<group>"; };
15CBA2CD196EE66F005877BB /* ObjectFactory.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ObjectFactory.o; sourceTree = "<group>"; };
15CBA2CE196EE66F005877BB /* ObjectFactory.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ObjectFactory.o.d; sourceTree = "<group>"; };
15CBA2CF196EE66F005877BB /* s3tc.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = s3tc.o; sourceTree = "<group>"; };
15CBA2D0196EE66F005877BB /* s3tc.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = s3tc.o.d; sourceTree = "<group>"; };
15CBA2D1196EE66F005877BB /* TGAlib.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TGAlib.o; sourceTree = "<group>"; };
15CBA2D2196EE66F005877BB /* TGAlib.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TGAlib.o.d; sourceTree = "<group>"; };
15CBA2D3196EE66F005877BB /* ZipUtils.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ZipUtils.o; sourceTree = "<group>"; };
15CBA2D4196EE66F005877BB /* ZipUtils.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ZipUtils.o.d; sourceTree = "<group>"; };
15CBA2D5196EE66F005877BB /* cocos2d.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cocos2d.o; sourceTree = "<group>"; };
15CBA2D6196EE66F005877BB /* cocos2d.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cocos2d.o.d; sourceTree = "<group>"; };
15CBA2D8196EE66F005877BB /* CCArray.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCArray.o; sourceTree = "<group>"; };
15CBA2D9196EE66F005877BB /* CCArray.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCArray.o.d; sourceTree = "<group>"; };
15CBA2DA196EE66F005877BB /* CCDeprecated.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDeprecated.o; sourceTree = "<group>"; };
15CBA2DB196EE66F005877BB /* CCDeprecated.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDeprecated.o.d; sourceTree = "<group>"; };
15CBA2DC196EE66F005877BB /* CCDictionary.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDictionary.o; sourceTree = "<group>"; };
15CBA2DD196EE66F005877BB /* CCDictionary.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDictionary.o.d; sourceTree = "<group>"; };
15CBA2DE196EE66F005877BB /* CCNotificationCenter.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCNotificationCenter.o; sourceTree = "<group>"; };
15CBA2DF196EE66F005877BB /* CCNotificationCenter.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCNotificationCenter.o.d; sourceTree = "<group>"; };
15CBA2E0196EE66F005877BB /* CCSet.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSet.o; sourceTree = "<group>"; };
15CBA2E1196EE66F005877BB /* CCSet.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSet.o.d; sourceTree = "<group>"; };
15CBA2E2196EE66F005877BB /* CCString.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCString.o; sourceTree = "<group>"; };
15CBA2E3196EE66F005877BB /* CCString.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCString.o.d; sourceTree = "<group>"; };
15CBA2E5196EE66F005877BB /* CCAffineTransform.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCAffineTransform.o; sourceTree = "<group>"; };
15CBA2E6196EE66F005877BB /* CCAffineTransform.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCAffineTransform.o.d; sourceTree = "<group>"; };
15CBA2E7196EE66F005877BB /* CCGeometry.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGeometry.o; sourceTree = "<group>"; };
15CBA2E8196EE66F005877BB /* CCGeometry.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGeometry.o.d; sourceTree = "<group>"; };
15CBA2E9196EE66F005877BB /* CCVertex.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCVertex.o; sourceTree = "<group>"; };
15CBA2EA196EE66F005877BB /* CCVertex.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCVertex.o.d; sourceTree = "<group>"; };
15CBA2EB196EE66F005877BB /* Mat4.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Mat4.o; sourceTree = "<group>"; };
15CBA2EC196EE66F005877BB /* Mat4.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Mat4.o.d; sourceTree = "<group>"; };
15CBA2ED196EE66F005877BB /* MathUtil.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = MathUtil.o; sourceTree = "<group>"; };
15CBA2EE196EE66F005877BB /* MathUtil.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = MathUtil.o.d; sourceTree = "<group>"; };
15CBA2EF196EE66F005877BB /* Quaternion.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Quaternion.o; sourceTree = "<group>"; };
15CBA2F0196EE66F005877BB /* Quaternion.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Quaternion.o.d; sourceTree = "<group>"; };
15CBA2F1196EE66F005877BB /* TransformUtils.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TransformUtils.o; sourceTree = "<group>"; };
15CBA2F2196EE66F005877BB /* TransformUtils.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TransformUtils.o.d; sourceTree = "<group>"; };
15CBA2F3196EE66F005877BB /* Vec2.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Vec2.o; sourceTree = "<group>"; };
15CBA2F4196EE66F005877BB /* Vec2.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Vec2.o.d; sourceTree = "<group>"; };
15CBA2F5196EE66F005877BB /* Vec3.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Vec3.o; sourceTree = "<group>"; };
15CBA2F6196EE66F005877BB /* Vec3.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Vec3.o.d; sourceTree = "<group>"; };
15CBA2F7196EE66F005877BB /* Vec4.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Vec4.o; sourceTree = "<group>"; };
15CBA2F8196EE66F005877BB /* Vec4.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Vec4.o.d; sourceTree = "<group>"; };
15CBA2FA196EE66F005877BB /* CCPhysicsBody.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsBody.o; sourceTree = "<group>"; };
15CBA2FB196EE66F005877BB /* CCPhysicsBody.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsBody.o.d; sourceTree = "<group>"; };
15CBA2FC196EE66F005877BB /* CCPhysicsContact.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsContact.o; sourceTree = "<group>"; };
15CBA2FD196EE66F005877BB /* CCPhysicsContact.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsContact.o.d; sourceTree = "<group>"; };
15CBA2FE196EE66F005877BB /* CCPhysicsJoint.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsJoint.o; sourceTree = "<group>"; };
15CBA2FF196EE66F005877BB /* CCPhysicsJoint.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsJoint.o.d; sourceTree = "<group>"; };
15CBA300196EE66F005877BB /* CCPhysicsShape.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsShape.o; sourceTree = "<group>"; };
15CBA301196EE66F005877BB /* CCPhysicsShape.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsShape.o.d; sourceTree = "<group>"; };
15CBA302196EE66F005877BB /* CCPhysicsWorld.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsWorld.o; sourceTree = "<group>"; };
15CBA303196EE66F005877BB /* CCPhysicsWorld.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsWorld.o.d; sourceTree = "<group>"; };
15CBA305196EE66F005877BB /* CCPhysicsBodyInfo_chipmunk.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsBodyInfo_chipmunk.o; sourceTree = "<group>"; };
15CBA306196EE66F005877BB /* CCPhysicsBodyInfo_chipmunk.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsBodyInfo_chipmunk.o.d; sourceTree = "<group>"; };
15CBA307196EE66F005877BB /* CCPhysicsContactInfo_chipmunk.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsContactInfo_chipmunk.o; sourceTree = "<group>"; };
15CBA308196EE66F005877BB /* CCPhysicsContactInfo_chipmunk.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsContactInfo_chipmunk.o.d; sourceTree = "<group>"; };
15CBA309196EE66F005877BB /* CCPhysicsJointInfo_chipmunk.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsJointInfo_chipmunk.o; sourceTree = "<group>"; };
15CBA30A196EE66F005877BB /* CCPhysicsJointInfo_chipmunk.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsJointInfo_chipmunk.o.d; sourceTree = "<group>"; };
15CBA30B196EE66F005877BB /* CCPhysicsShapeInfo_chipmunk.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsShapeInfo_chipmunk.o; sourceTree = "<group>"; };
15CBA30C196EE66F005877BB /* CCPhysicsShapeInfo_chipmunk.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsShapeInfo_chipmunk.o.d; sourceTree = "<group>"; };
15CBA30D196EE66F005877BB /* CCPhysicsWorldInfo_chipmunk.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsWorldInfo_chipmunk.o; sourceTree = "<group>"; };
15CBA30E196EE66F005877BB /* CCPhysicsWorldInfo_chipmunk.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsWorldInfo_chipmunk.o.d; sourceTree = "<group>"; };
15CBA310196EE66F005877BB /* CCFileUtils.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFileUtils.o; sourceTree = "<group>"; };
15CBA311196EE66F005877BB /* CCFileUtils.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFileUtils.o.d; sourceTree = "<group>"; };
15CBA312196EE66F005877BB /* CCGLViewProtocol.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGLViewProtocol.o; sourceTree = "<group>"; };
15CBA313196EE66F005877BB /* CCGLViewProtocol.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGLViewProtocol.o.d; sourceTree = "<group>"; };
15CBA314196EE66F005877BB /* CCImage.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCImage.o; sourceTree = "<group>"; };
15CBA315196EE66F005877BB /* CCImage.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCImage.o.d; sourceTree = "<group>"; };
15CBA316196EE66F005877BB /* CCSAXParser.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSAXParser.o; sourceTree = "<group>"; };
15CBA317196EE66F005877BB /* CCSAXParser.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSAXParser.o.d; sourceTree = "<group>"; };
15CBA318196EE66F005877BB /* CCThread.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCThread.o; sourceTree = "<group>"; };
15CBA319196EE66F005877BB /* CCThread.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCThread.o.d; sourceTree = "<group>"; };
15CBA31B196EE66F005877BB /* CCBatchCommand.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBatchCommand.o; sourceTree = "<group>"; };
15CBA31C196EE66F005877BB /* CCBatchCommand.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBatchCommand.o.d; sourceTree = "<group>"; };
15CBA31D196EE66F005877BB /* CCCustomCommand.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCCustomCommand.o; sourceTree = "<group>"; };
15CBA31E196EE66F005877BB /* CCCustomCommand.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCCustomCommand.o.d; sourceTree = "<group>"; };
15CBA31F196EE66F005877BB /* CCGLProgram.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGLProgram.o; sourceTree = "<group>"; };
15CBA320196EE66F005877BB /* CCGLProgram.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGLProgram.o.d; sourceTree = "<group>"; };
15CBA321196EE66F005877BB /* CCGLProgramCache.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGLProgramCache.o; sourceTree = "<group>"; };
15CBA322196EE66F005877BB /* CCGLProgramCache.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGLProgramCache.o.d; sourceTree = "<group>"; };
15CBA323196EE66F005877BB /* CCGLProgramState.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGLProgramState.o; sourceTree = "<group>"; };
15CBA324196EE66F005877BB /* CCGLProgramState.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGLProgramState.o.d; sourceTree = "<group>"; };
15CBA325196EE66F005877BB /* CCGLProgramStateCache.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGLProgramStateCache.o; sourceTree = "<group>"; };
15CBA326196EE66F005877BB /* CCGLProgramStateCache.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGLProgramStateCache.o.d; sourceTree = "<group>"; };
15CBA327196EE66F005877BB /* ccGLStateCache.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ccGLStateCache.o; sourceTree = "<group>"; };
15CBA328196EE66F005877BB /* ccGLStateCache.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ccGLStateCache.o.d; sourceTree = "<group>"; };
15CBA329196EE66F005877BB /* CCGroupCommand.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGroupCommand.o; sourceTree = "<group>"; };
15CBA32A196EE66F005877BB /* CCGroupCommand.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGroupCommand.o.d; sourceTree = "<group>"; };
15CBA32B196EE66F005877BB /* CCMeshCommand.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCMeshCommand.o; sourceTree = "<group>"; };
15CBA32C196EE66F005877BB /* CCMeshCommand.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCMeshCommand.o.d; sourceTree = "<group>"; };
15CBA32D196EE66F005877BB /* CCQuadCommand.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCQuadCommand.o; sourceTree = "<group>"; };
15CBA32E196EE66F005877BB /* CCQuadCommand.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCQuadCommand.o.d; sourceTree = "<group>"; };
15CBA32F196EE66F005877BB /* CCRenderCommand.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCRenderCommand.o; sourceTree = "<group>"; };
15CBA330196EE66F005877BB /* CCRenderCommand.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCRenderCommand.o.d; sourceTree = "<group>"; };
15CBA331196EE66F005877BB /* CCRenderer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCRenderer.o; sourceTree = "<group>"; };
15CBA332196EE66F005877BB /* CCRenderer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCRenderer.o.d; sourceTree = "<group>"; };
15CBA333196EE66F005877BB /* ccShaders.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ccShaders.o; sourceTree = "<group>"; };
15CBA334196EE66F005877BB /* ccShaders.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ccShaders.o.d; sourceTree = "<group>"; };
15CBA335196EE66F005877BB /* CCTexture2D.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTexture2D.o; sourceTree = "<group>"; };
15CBA336196EE66F005877BB /* CCTexture2D.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTexture2D.o.d; sourceTree = "<group>"; };
15CBA337196EE66F005877BB /* CCTextureAtlas.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTextureAtlas.o; sourceTree = "<group>"; };
15CBA338196EE66F005877BB /* CCTextureAtlas.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTextureAtlas.o.d; sourceTree = "<group>"; };
15CBA339196EE66F005877BB /* CCTextureCache.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTextureCache.o; sourceTree = "<group>"; };
15CBA33A196EE66F005877BB /* CCTextureCache.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTextureCache.o.d; sourceTree = "<group>"; };
15CBA33C196EE66F005877BB /* CCApplication.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCApplication.o; sourceTree = "<group>"; };
15CBA33D196EE66F005877BB /* CCApplication.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCApplication.o.d; sourceTree = "<group>"; };
15CBA33E196EE66F005877BB /* CCCommon.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCCommon.o; sourceTree = "<group>"; };
15CBA33F196EE66F005877BB /* CCCommon.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCCommon.o.d; sourceTree = "<group>"; };
15CBA340196EE66F005877BB /* CCDevice.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDevice.o; sourceTree = "<group>"; };
15CBA341196EE66F005877BB /* CCDevice.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDevice.o.d; sourceTree = "<group>"; };
15CBA342196EE66F005877BB /* CCFileUtilsAndroid.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFileUtilsAndroid.o; sourceTree = "<group>"; };
15CBA343196EE66F005877BB /* CCFileUtilsAndroid.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFileUtilsAndroid.o.d; sourceTree = "<group>"; };
15CBA344196EE66F005877BB /* CCGLView.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCGLView.o; sourceTree = "<group>"; };
15CBA345196EE66F005877BB /* CCGLView.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCGLView.o.d; sourceTree = "<group>"; };
15CBA346196EE66F005877BB /* javaactivity.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = javaactivity.o; sourceTree = "<group>"; };
15CBA347196EE66F005877BB /* javaactivity.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = javaactivity.o.d; sourceTree = "<group>"; };
15CBA349196EE66F005877BB /* DPIJni.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = DPIJni.o; sourceTree = "<group>"; };
15CBA34A196EE66F005877BB /* DPIJni.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = DPIJni.o.d; sourceTree = "<group>"; };
15CBA34B196EE66F005877BB /* IMEJni.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = IMEJni.o; sourceTree = "<group>"; };
15CBA34C196EE66F005877BB /* IMEJni.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = IMEJni.o.d; sourceTree = "<group>"; };
15CBA34D196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxAccelerometer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Java_org_cocos2dx_lib_Cocos2dxAccelerometer.o; sourceTree = "<group>"; };
15CBA34E196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxAccelerometer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Java_org_cocos2dx_lib_Cocos2dxAccelerometer.o.d; sourceTree = "<group>"; };
15CBA34F196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxBitmap.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Java_org_cocos2dx_lib_Cocos2dxBitmap.o; sourceTree = "<group>"; };
15CBA350196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxBitmap.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Java_org_cocos2dx_lib_Cocos2dxBitmap.o.d; sourceTree = "<group>"; };
15CBA351196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxHelper.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Java_org_cocos2dx_lib_Cocos2dxHelper.o; sourceTree = "<group>"; };
15CBA352196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxHelper.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Java_org_cocos2dx_lib_Cocos2dxHelper.o.d; sourceTree = "<group>"; };
15CBA353196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxRenderer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Java_org_cocos2dx_lib_Cocos2dxRenderer.o; sourceTree = "<group>"; };
15CBA354196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxRenderer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Java_org_cocos2dx_lib_Cocos2dxRenderer.o.d; sourceTree = "<group>"; };
15CBA355196EE66F005877BB /* JniHelper.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = JniHelper.o; sourceTree = "<group>"; };
15CBA356196EE66F005877BB /* JniHelper.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = JniHelper.o.d; sourceTree = "<group>"; };
15CBA357196EE66F005877BB /* TouchesJni.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TouchesJni.o; sourceTree = "<group>"; };
15CBA358196EE66F005877BB /* TouchesJni.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TouchesJni.o.d; sourceTree = "<group>"; };
15CBA35B196EE66F005877BB /* AssetsManager.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = AssetsManager.o; sourceTree = "<group>"; };
15CBA35C196EE66F005877BB /* AssetsManager.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = AssetsManager.o.d; sourceTree = "<group>"; };
15CBA35F196EE66F005877BB /* CCControl.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControl.o; sourceTree = "<group>"; };
15CBA360196EE66F005877BB /* CCControl.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControl.o.d; sourceTree = "<group>"; };
15CBA361196EE66F005877BB /* CCControlButton.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlButton.o; sourceTree = "<group>"; };
15CBA362196EE66F005877BB /* CCControlButton.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlButton.o.d; sourceTree = "<group>"; };
15CBA363196EE66F005877BB /* CCControlColourPicker.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlColourPicker.o; sourceTree = "<group>"; };
15CBA364196EE66F005877BB /* CCControlColourPicker.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlColourPicker.o.d; sourceTree = "<group>"; };
15CBA365196EE66F005877BB /* CCControlHuePicker.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlHuePicker.o; sourceTree = "<group>"; };
15CBA366196EE66F005877BB /* CCControlHuePicker.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlHuePicker.o.d; sourceTree = "<group>"; };
15CBA367196EE66F005877BB /* CCControlPotentiometer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlPotentiometer.o; sourceTree = "<group>"; };
15CBA368196EE66F005877BB /* CCControlPotentiometer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlPotentiometer.o.d; sourceTree = "<group>"; };
15CBA369196EE66F005877BB /* CCControlSaturationBrightnessPicker.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlSaturationBrightnessPicker.o; sourceTree = "<group>"; };
15CBA36A196EE66F005877BB /* CCControlSaturationBrightnessPicker.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlSaturationBrightnessPicker.o.d; sourceTree = "<group>"; };
15CBA36B196EE66F005877BB /* CCControlSlider.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlSlider.o; sourceTree = "<group>"; };
15CBA36C196EE66F005877BB /* CCControlSlider.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlSlider.o.d; sourceTree = "<group>"; };
15CBA36D196EE66F005877BB /* CCControlStepper.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlStepper.o; sourceTree = "<group>"; };
15CBA36E196EE66F005877BB /* CCControlStepper.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlStepper.o.d; sourceTree = "<group>"; };
15CBA36F196EE66F005877BB /* CCControlSwitch.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlSwitch.o; sourceTree = "<group>"; };
15CBA370196EE66F005877BB /* CCControlSwitch.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlSwitch.o.d; sourceTree = "<group>"; };
15CBA371196EE66F005877BB /* CCControlUtils.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlUtils.o; sourceTree = "<group>"; };
15CBA372196EE66F005877BB /* CCControlUtils.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlUtils.o.d; sourceTree = "<group>"; };
15CBA373196EE66F005877BB /* CCInvocation.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCInvocation.o; sourceTree = "<group>"; };
15CBA374196EE66F005877BB /* CCInvocation.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCInvocation.o.d; sourceTree = "<group>"; };
15CBA375196EE66F005877BB /* CCScale9Sprite.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCScale9Sprite.o; sourceTree = "<group>"; };
15CBA376196EE66F005877BB /* CCScale9Sprite.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCScale9Sprite.o.d; sourceTree = "<group>"; };
15CBA378196EE66F005877BB /* CCEditBox.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEditBox.o; sourceTree = "<group>"; };
15CBA379196EE66F005877BB /* CCEditBox.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEditBox.o.d; sourceTree = "<group>"; };
15CBA37A196EE66F005877BB /* CCEditBoxImplAndroid.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEditBoxImplAndroid.o; sourceTree = "<group>"; };
15CBA37B196EE66F005877BB /* CCEditBoxImplAndroid.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEditBoxImplAndroid.o.d; sourceTree = "<group>"; };
15CBA37C196EE66F005877BB /* CCEditBoxImplNone.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEditBoxImplNone.o; sourceTree = "<group>"; };
15CBA37D196EE66F005877BB /* CCEditBoxImplNone.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEditBoxImplNone.o.d; sourceTree = "<group>"; };
15CBA37E196EE66F005877BB /* CCEditBoxImplWin.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCEditBoxImplWin.o; sourceTree = "<group>"; };
15CBA37F196EE66F005877BB /* CCEditBoxImplWin.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCEditBoxImplWin.o.d; sourceTree = "<group>"; };
15CBA381196EE66F005877BB /* CCScrollView.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCScrollView.o; sourceTree = "<group>"; };
15CBA382196EE66F005877BB /* CCScrollView.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCScrollView.o.d; sourceTree = "<group>"; };
15CBA383196EE66F005877BB /* CCTableView.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTableView.o; sourceTree = "<group>"; };
15CBA384196EE66F005877BB /* CCTableView.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTableView.o.d; sourceTree = "<group>"; };
15CBA385196EE66F005877BB /* CCTableViewCell.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTableViewCell.o; sourceTree = "<group>"; };
15CBA386196EE66F005877BB /* CCTableViewCell.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTableViewCell.o.d; sourceTree = "<group>"; };
15CBA388196EE66F005877BB /* CCPhysicsDebugNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsDebugNode.o; sourceTree = "<group>"; };
15CBA389196EE66F005877BB /* CCPhysicsDebugNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsDebugNode.o.d; sourceTree = "<group>"; };
15CBA38A196EE66F005877BB /* CCPhysicsSprite.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCPhysicsSprite.o; sourceTree = "<group>"; };
15CBA38B196EE66F005877BB /* CCPhysicsSprite.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCPhysicsSprite.o.d; sourceTree = "<group>"; };
15CBA393196EE66F005877BB /* auxiliar.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = auxiliar.o; sourceTree = "<group>"; };
15CBA394196EE670005877BB /* auxiliar.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = auxiliar.o.d; sourceTree = "<group>"; };
15CBA395196EE670005877BB /* buffer.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = buffer.o; sourceTree = "<group>"; };
15CBA396196EE670005877BB /* buffer.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = buffer.o.d; sourceTree = "<group>"; };
15CBA397196EE670005877BB /* except.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = except.o; sourceTree = "<group>"; };
15CBA398196EE670005877BB /* except.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = except.o.d; sourceTree = "<group>"; };
15CBA399196EE670005877BB /* inet.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = inet.o; sourceTree = "<group>"; };
15CBA39A196EE670005877BB /* inet.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = inet.o.d; sourceTree = "<group>"; };
15CBA39B196EE670005877BB /* io.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = io.o; sourceTree = "<group>"; };
15CBA39C196EE670005877BB /* io.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = io.o.d; sourceTree = "<group>"; };
15CBA39D196EE670005877BB /* luasocket.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = luasocket.o; sourceTree = "<group>"; };
15CBA39E196EE670005877BB /* luasocket.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = luasocket.o.d; sourceTree = "<group>"; };
15CBA39F196EE670005877BB /* mime.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = mime.o; sourceTree = "<group>"; };
15CBA3A0196EE670005877BB /* mime.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = mime.o.d; sourceTree = "<group>"; };
15CBA3A1196EE670005877BB /* options.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = options.o; sourceTree = "<group>"; };
15CBA3A2196EE670005877BB /* options.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = options.o.d; sourceTree = "<group>"; };
15CBA3A3196EE670005877BB /* select.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = select.o; sourceTree = "<group>"; };
15CBA3A4196EE670005877BB /* select.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = select.o.d; sourceTree = "<group>"; };
15CBA3A5196EE670005877BB /* serial.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = serial.o; sourceTree = "<group>"; };
15CBA3A6196EE670005877BB /* serial.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = serial.o.d; sourceTree = "<group>"; };
15CBA3A7196EE670005877BB /* tcp.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = tcp.o; sourceTree = "<group>"; };
15CBA3A8196EE670005877BB /* tcp.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = tcp.o.d; sourceTree = "<group>"; };
15CBA3A9196EE670005877BB /* timeout.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = timeout.o; sourceTree = "<group>"; };
15CBA3AA196EE670005877BB /* timeout.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = timeout.o.d; sourceTree = "<group>"; };
15CBA3AB196EE670005877BB /* udp.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = udp.o; sourceTree = "<group>"; };
15CBA3AC196EE670005877BB /* udp.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = udp.o.d; sourceTree = "<group>"; };
15CBA3AD196EE670005877BB /* unix.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = unix.o; sourceTree = "<group>"; };
15CBA3AE196EE670005877BB /* unix.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = unix.o.d; sourceTree = "<group>"; };
15CBA3AF196EE670005877BB /* usocket.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = usocket.o; sourceTree = "<group>"; };
15CBA3B0196EE670005877BB /* usocket.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = usocket.o.d; sourceTree = "<group>"; };
15CBA3B2196EE670005877BB /* tolua_event.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = tolua_event.o; sourceTree = "<group>"; };
15CBA3B3196EE670005877BB /* tolua_event.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = tolua_event.o.d; sourceTree = "<group>"; };
15CBA3B4196EE670005877BB /* tolua_is.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = tolua_is.o; sourceTree = "<group>"; };
15CBA3B5196EE670005877BB /* tolua_is.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = tolua_is.o.d; sourceTree = "<group>"; };
15CBA3B6196EE670005877BB /* tolua_map.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = tolua_map.o; sourceTree = "<group>"; };
15CBA3B7196EE670005877BB /* tolua_map.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = tolua_map.o.d; sourceTree = "<group>"; };
15CBA3B8196EE670005877BB /* tolua_push.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = tolua_push.o; sourceTree = "<group>"; };
15CBA3B9196EE670005877BB /* tolua_push.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = tolua_push.o.d; sourceTree = "<group>"; };
15CBA3BA196EE670005877BB /* tolua_to.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = tolua_to.o; sourceTree = "<group>"; };
15CBA3BB196EE670005877BB /* tolua_to.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = tolua_to.o.d; sourceTree = "<group>"; };
15CBA3BD196EE670005877BB /* xxtea.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = xxtea.o; sourceTree = "<group>"; };
15CBA3BE196EE670005877BB /* xxtea.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = xxtea.o.d; sourceTree = "<group>"; };
15CBA3C0196EE670005877BB /* lua_cocos2dx_auto.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_auto.o; sourceTree = "<group>"; };
15CBA3C1196EE670005877BB /* lua_cocos2dx_auto.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_auto.o.d; sourceTree = "<group>"; };
15CBA3C2196EE670005877BB /* lua_cocos2dx_controller_auto.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_controller_auto.o; sourceTree = "<group>"; };
15CBA3C3196EE670005877BB /* lua_cocos2dx_controller_auto.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_controller_auto.o.d; sourceTree = "<group>"; };
15CBA3C4196EE670005877BB /* lua_cocos2dx_extension_auto.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_extension_auto.o; sourceTree = "<group>"; };
15CBA3C5196EE670005877BB /* lua_cocos2dx_extension_auto.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_extension_auto.o.d; sourceTree = "<group>"; };
15CBA3C6196EE670005877BB /* lua_cocos2dx_physics_auto.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_physics_auto.o; sourceTree = "<group>"; };
15CBA3C7196EE670005877BB /* lua_cocos2dx_physics_auto.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_physics_auto.o.d; sourceTree = "<group>"; };
15CBA3C8196EE670005877BB /* lua_cocos2dx_spine_auto.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_spine_auto.o; sourceTree = "<group>"; };
15CBA3C9196EE670005877BB /* lua_cocos2dx_spine_auto.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_spine_auto.o.d; sourceTree = "<group>"; };
15CBA3CA196EE670005877BB /* lua_cocos2dx_studio_auto.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_studio_auto.o; sourceTree = "<group>"; };
15CBA3CB196EE670005877BB /* lua_cocos2dx_studio_auto.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_studio_auto.o.d; sourceTree = "<group>"; };
15CBA3CC196EE670005877BB /* lua_cocos2dx_ui_auto.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_ui_auto.o; sourceTree = "<group>"; };
15CBA3CD196EE670005877BB /* lua_cocos2dx_ui_auto.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_ui_auto.o.d; sourceTree = "<group>"; };
15CBA3CF196EE670005877BB /* CCBProxy.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBProxy.o; sourceTree = "<group>"; };
15CBA3D0196EE670005877BB /* CCBProxy.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBProxy.o.d; sourceTree = "<group>"; };
15CBA3D1196EE670005877BB /* CCLuaBridge.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLuaBridge.o; sourceTree = "<group>"; };
15CBA3D2196EE670005877BB /* CCLuaBridge.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLuaBridge.o.d; sourceTree = "<group>"; };
15CBA3D3196EE670005877BB /* CCLuaEngine.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLuaEngine.o; sourceTree = "<group>"; };
15CBA3D4196EE670005877BB /* CCLuaEngine.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLuaEngine.o.d; sourceTree = "<group>"; };
15CBA3D5196EE670005877BB /* CCLuaStack.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLuaStack.o; sourceTree = "<group>"; };
15CBA3D6196EE670005877BB /* CCLuaStack.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLuaStack.o.d; sourceTree = "<group>"; };
15CBA3D7196EE670005877BB /* CCLuaValue.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLuaValue.o; sourceTree = "<group>"; };
15CBA3D8196EE670005877BB /* CCLuaValue.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLuaValue.o.d; sourceTree = "<group>"; };
15CBA3D9196EE670005877BB /* Cocos2dxLuaLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Cocos2dxLuaLoader.o; sourceTree = "<group>"; };
15CBA3DA196EE670005877BB /* Cocos2dxLuaLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Cocos2dxLuaLoader.o.d; sourceTree = "<group>"; };
15CBA3DB196EE670005877BB /* lua_cocos2dx_coco_studio_manual.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_coco_studio_manual.o; sourceTree = "<group>"; };
15CBA3DC196EE670005877BB /* lua_cocos2dx_coco_studio_manual.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_coco_studio_manual.o.d; sourceTree = "<group>"; };
15CBA3DD196EE670005877BB /* lua_cocos2dx_controller_manual.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_controller_manual.o; sourceTree = "<group>"; };
15CBA3DE196EE670005877BB /* lua_cocos2dx_controller_manual.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_controller_manual.o.d; sourceTree = "<group>"; };
15CBA3DF196EE670005877BB /* lua_cocos2dx_deprecated.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_deprecated.o; sourceTree = "<group>"; };
15CBA3E0196EE670005877BB /* lua_cocos2dx_deprecated.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_deprecated.o.d; sourceTree = "<group>"; };
15CBA3E1196EE670005877BB /* lua_cocos2dx_extension_manual.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_extension_manual.o; sourceTree = "<group>"; };
15CBA3E2196EE670005877BB /* lua_cocos2dx_extension_manual.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_extension_manual.o.d; sourceTree = "<group>"; };
15CBA3E3196EE670005877BB /* lua_cocos2dx_manual.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_manual.o; sourceTree = "<group>"; };
15CBA3E4196EE670005877BB /* lua_cocos2dx_manual.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_manual.o.d; sourceTree = "<group>"; };
15CBA3E5196EE670005877BB /* lua_cocos2dx_physics_manual.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_physics_manual.o; sourceTree = "<group>"; };
15CBA3E6196EE670005877BB /* lua_cocos2dx_physics_manual.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_physics_manual.o.d; sourceTree = "<group>"; };
15CBA3E7196EE670005877BB /* lua_cocos2dx_spine_manual.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_spine_manual.o; sourceTree = "<group>"; };
15CBA3E8196EE670005877BB /* lua_cocos2dx_spine_manual.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_spine_manual.o.d; sourceTree = "<group>"; };
15CBA3E9196EE670005877BB /* lua_cocos2dx_ui_manual.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_cocos2dx_ui_manual.o; sourceTree = "<group>"; };
15CBA3EA196EE670005877BB /* lua_cocos2dx_ui_manual.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_cocos2dx_ui_manual.o.d; sourceTree = "<group>"; };
15CBA3EB196EE670005877BB /* lua_debugger.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_debugger.o; sourceTree = "<group>"; };
15CBA3EC196EE670005877BB /* lua_debugger.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_debugger.o.d; sourceTree = "<group>"; };
15CBA3ED196EE670005877BB /* lua_extensions.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_extensions.o; sourceTree = "<group>"; };
15CBA3EE196EE670005877BB /* lua_extensions.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_extensions.o.d; sourceTree = "<group>"; };
15CBA3EF196EE670005877BB /* Lua_web_socket.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Lua_web_socket.o; sourceTree = "<group>"; };
15CBA3F0196EE670005877BB /* Lua_web_socket.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Lua_web_socket.o.d; sourceTree = "<group>"; };
15CBA3F1196EE670005877BB /* lua_xml_http_request.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = lua_xml_http_request.o; sourceTree = "<group>"; };
15CBA3F2196EE670005877BB /* lua_xml_http_request.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = lua_xml_http_request.o.d; sourceTree = "<group>"; };
15CBA3F3196EE670005877BB /* LuaBasicConversions.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = LuaBasicConversions.o; sourceTree = "<group>"; };
15CBA3F4196EE670005877BB /* LuaBasicConversions.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = LuaBasicConversions.o.d; sourceTree = "<group>"; };
15CBA3F5196EE670005877BB /* LuaOpengl.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = LuaOpengl.o; sourceTree = "<group>"; };
15CBA3F6196EE670005877BB /* LuaOpengl.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = LuaOpengl.o.d; sourceTree = "<group>"; };
15CBA3F7196EE670005877BB /* LuaScriptHandlerMgr.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = LuaScriptHandlerMgr.o; sourceTree = "<group>"; };
15CBA3F8196EE670005877BB /* LuaScriptHandlerMgr.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = LuaScriptHandlerMgr.o.d; sourceTree = "<group>"; };
15CBA3F9196EE670005877BB /* LuaSkeletonAnimation.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = LuaSkeletonAnimation.o; sourceTree = "<group>"; };
15CBA3FA196EE670005877BB /* LuaSkeletonAnimation.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = LuaSkeletonAnimation.o.d; sourceTree = "<group>"; };
15CBA3FD196EE670005877BB /* CCLuaJavaBridge.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLuaJavaBridge.o; sourceTree = "<group>"; };
15CBA3FE196EE670005877BB /* CCLuaJavaBridge.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLuaJavaBridge.o.d; sourceTree = "<group>"; };
15CBA400196EE670005877BB /* Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.o; sourceTree = "<group>"; };
15CBA401196EE670005877BB /* Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.o.d; sourceTree = "<group>"; };
15CBA402196EE670005877BB /* tolua_fix.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = tolua_fix.o; sourceTree = "<group>"; };
15CBA403196EE670005877BB /* tolua_fix.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = tolua_fix.o.d; sourceTree = "<group>"; };
15CBA405196EE670005877BB /* HttpClient.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = HttpClient.o; sourceTree = "<group>"; };
15CBA406196EE670005877BB /* HttpClient.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = HttpClient.o.d; sourceTree = "<group>"; };
15CBA407196EE670005877BB /* SocketIO.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = SocketIO.o; sourceTree = "<group>"; };
15CBA408196EE670005877BB /* SocketIO.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = SocketIO.o.d; sourceTree = "<group>"; };
15CBA409196EE670005877BB /* WebSocket.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = WebSocket.o; sourceTree = "<group>"; };
15CBA40A196EE670005877BB /* WebSocket.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = WebSocket.o.d; sourceTree = "<group>"; };
15CBA40C196EE670005877BB /* CCProtectedNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCProtectedNode.o; sourceTree = "<group>"; };
15CBA40D196EE670005877BB /* CCProtectedNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCProtectedNode.o.d; sourceTree = "<group>"; };
15CBA40E196EE670005877BB /* CocosGUI.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CocosGUI.o; sourceTree = "<group>"; };
15CBA40F196EE670005877BB /* CocosGUI.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CocosGUI.o.d; sourceTree = "<group>"; };
15CBA410196EE670005877BB /* UIButton.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIButton.o; sourceTree = "<group>"; };
15CBA411196EE670005877BB /* UIButton.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIButton.o.d; sourceTree = "<group>"; };
15CBA412196EE670005877BB /* UICheckBox.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UICheckBox.o; sourceTree = "<group>"; };
15CBA413196EE670005877BB /* UICheckBox.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UICheckBox.o.d; sourceTree = "<group>"; };
15CBA414196EE670005877BB /* UIDeprecated.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIDeprecated.o; sourceTree = "<group>"; };
15CBA415196EE670005877BB /* UIDeprecated.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIDeprecated.o.d; sourceTree = "<group>"; };
15CBA416196EE670005877BB /* UIHBox.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIHBox.o; sourceTree = "<group>"; };
15CBA417196EE670005877BB /* UIHBox.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIHBox.o.d; sourceTree = "<group>"; };
15CBA418196EE670005877BB /* UIHelper.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIHelper.o; sourceTree = "<group>"; };
15CBA419196EE670005877BB /* UIHelper.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIHelper.o.d; sourceTree = "<group>"; };
15CBA41A196EE670005877BB /* UIImageView.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIImageView.o; sourceTree = "<group>"; };
15CBA41B196EE670005877BB /* UIImageView.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIImageView.o.d; sourceTree = "<group>"; };
15CBA41C196EE670005877BB /* UILayout.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UILayout.o; sourceTree = "<group>"; };
15CBA41D196EE670005877BB /* UILayout.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UILayout.o.d; sourceTree = "<group>"; };
15CBA41E196EE670005877BB /* UILayoutManager.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UILayoutManager.o; sourceTree = "<group>"; };
15CBA41F196EE670005877BB /* UILayoutManager.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UILayoutManager.o.d; sourceTree = "<group>"; };
15CBA420196EE670005877BB /* UILayoutParameter.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UILayoutParameter.o; sourceTree = "<group>"; };
15CBA421196EE670005877BB /* UILayoutParameter.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UILayoutParameter.o.d; sourceTree = "<group>"; };
15CBA422196EE670005877BB /* UIListView.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIListView.o; sourceTree = "<group>"; };
15CBA423196EE670005877BB /* UIListView.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIListView.o.d; sourceTree = "<group>"; };
15CBA424196EE670005877BB /* UILoadingBar.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UILoadingBar.o; sourceTree = "<group>"; };
15CBA425196EE670005877BB /* UILoadingBar.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UILoadingBar.o.d; sourceTree = "<group>"; };
15CBA426196EE670005877BB /* UIPageView.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIPageView.o; sourceTree = "<group>"; };
15CBA427196EE670005877BB /* UIPageView.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIPageView.o.d; sourceTree = "<group>"; };
15CBA428196EE670005877BB /* UIRelativeBox.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIRelativeBox.o; sourceTree = "<group>"; };
15CBA429196EE670005877BB /* UIRelativeBox.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIRelativeBox.o.d; sourceTree = "<group>"; };
15CBA42A196EE670005877BB /* UIRichText.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIRichText.o; sourceTree = "<group>"; };
15CBA42B196EE670005877BB /* UIRichText.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIRichText.o.d; sourceTree = "<group>"; };
15CBA42C196EE670005877BB /* UIScrollView.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIScrollView.o; sourceTree = "<group>"; };
15CBA42D196EE670005877BB /* UIScrollView.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIScrollView.o.d; sourceTree = "<group>"; };
15CBA42E196EE670005877BB /* UISlider.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UISlider.o; sourceTree = "<group>"; };
15CBA42F196EE670005877BB /* UISlider.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UISlider.o.d; sourceTree = "<group>"; };
15CBA430196EE670005877BB /* UIText.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIText.o; sourceTree = "<group>"; };
15CBA431196EE670005877BB /* UIText.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIText.o.d; sourceTree = "<group>"; };
15CBA432196EE670005877BB /* UITextAtlas.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UITextAtlas.o; sourceTree = "<group>"; };
15CBA433196EE670005877BB /* UITextAtlas.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UITextAtlas.o.d; sourceTree = "<group>"; };
15CBA434196EE670005877BB /* UITextBMFont.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UITextBMFont.o; sourceTree = "<group>"; };
15CBA435196EE670005877BB /* UITextBMFont.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UITextBMFont.o.d; sourceTree = "<group>"; };
15CBA436196EE670005877BB /* UITextField.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UITextField.o; sourceTree = "<group>"; };
15CBA437196EE670005877BB /* UITextField.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UITextField.o.d; sourceTree = "<group>"; };
15CBA438196EE670005877BB /* UIVBox.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIVBox.o; sourceTree = "<group>"; };
15CBA439196EE670005877BB /* UIVBox.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIVBox.o.d; sourceTree = "<group>"; };
15CBA43A196EE670005877BB /* UIVideoPlayerAndroid.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIVideoPlayerAndroid.o; sourceTree = "<group>"; };
15CBA43B196EE670005877BB /* UIVideoPlayerAndroid.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIVideoPlayerAndroid.o.d; sourceTree = "<group>"; };
15CBA43C196EE670005877BB /* UIWidget.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = UIWidget.o; sourceTree = "<group>"; };
15CBA43D196EE670005877BB /* UIWidget.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = UIWidget.o.d; sourceTree = "<group>"; };
15CBA43F196EE670005877BB /* CCBAnimationManager.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBAnimationManager.o; sourceTree = "<group>"; };
15CBA440196EE670005877BB /* CCBAnimationManager.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBAnimationManager.o.d; sourceTree = "<group>"; };
15CBA441196EE670005877BB /* CCBFileLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBFileLoader.o; sourceTree = "<group>"; };
15CBA442196EE670005877BB /* CCBFileLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBFileLoader.o.d; sourceTree = "<group>"; };
15CBA443196EE670005877BB /* CCBKeyframe.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBKeyframe.o; sourceTree = "<group>"; };
15CBA444196EE670005877BB /* CCBKeyframe.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBKeyframe.o.d; sourceTree = "<group>"; };
15CBA445196EE670005877BB /* CCBReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBReader.o; sourceTree = "<group>"; };
15CBA446196EE670005877BB /* CCBReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBReader.o.d; sourceTree = "<group>"; };
15CBA447196EE670005877BB /* CCBSequence.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBSequence.o; sourceTree = "<group>"; };
15CBA448196EE670005877BB /* CCBSequence.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBSequence.o.d; sourceTree = "<group>"; };
15CBA449196EE670005877BB /* CCBSequenceProperty.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBSequenceProperty.o; sourceTree = "<group>"; };
15CBA44A196EE670005877BB /* CCBSequenceProperty.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBSequenceProperty.o.d; sourceTree = "<group>"; };
15CBA44B196EE670005877BB /* CCControlButtonLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlButtonLoader.o; sourceTree = "<group>"; };
15CBA44C196EE670005877BB /* CCControlButtonLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlButtonLoader.o.d; sourceTree = "<group>"; };
15CBA44D196EE670005877BB /* CCControlLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCControlLoader.o; sourceTree = "<group>"; };
15CBA44E196EE670005877BB /* CCControlLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCControlLoader.o.d; sourceTree = "<group>"; };
15CBA44F196EE670005877BB /* CCLabelBMFontLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLabelBMFontLoader.o; sourceTree = "<group>"; };
15CBA450196EE670005877BB /* CCLabelBMFontLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLabelBMFontLoader.o.d; sourceTree = "<group>"; };
15CBA451196EE670005877BB /* CCLabelTTFLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLabelTTFLoader.o; sourceTree = "<group>"; };
15CBA452196EE670005877BB /* CCLabelTTFLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLabelTTFLoader.o.d; sourceTree = "<group>"; };
15CBA453196EE670005877BB /* CCLayerColorLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLayerColorLoader.o; sourceTree = "<group>"; };
15CBA454196EE670005877BB /* CCLayerColorLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLayerColorLoader.o.d; sourceTree = "<group>"; };
15CBA455196EE670005877BB /* CCLayerGradientLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLayerGradientLoader.o; sourceTree = "<group>"; };
15CBA456196EE670005877BB /* CCLayerGradientLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLayerGradientLoader.o.d; sourceTree = "<group>"; };
15CBA457196EE670005877BB /* CCLayerLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCLayerLoader.o; sourceTree = "<group>"; };
15CBA458196EE670005877BB /* CCLayerLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCLayerLoader.o.d; sourceTree = "<group>"; };
15CBA459196EE670005877BB /* CCMenuItemImageLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCMenuItemImageLoader.o; sourceTree = "<group>"; };
15CBA45A196EE670005877BB /* CCMenuItemImageLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCMenuItemImageLoader.o.d; sourceTree = "<group>"; };
15CBA45B196EE670005877BB /* CCMenuItemLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCMenuItemLoader.o; sourceTree = "<group>"; };
15CBA45C196EE670005877BB /* CCMenuItemLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCMenuItemLoader.o.d; sourceTree = "<group>"; };
15CBA45D196EE670005877BB /* CCNode+CCBRelativePositioning.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "CCNode+CCBRelativePositioning.o"; sourceTree = "<group>"; };
15CBA45E196EE670005877BB /* CCNode+CCBRelativePositioning.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = "CCNode+CCBRelativePositioning.o.d"; sourceTree = "<group>"; };
15CBA45F196EE670005877BB /* CCNodeLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCNodeLoader.o; sourceTree = "<group>"; };
15CBA460196EE670005877BB /* CCNodeLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCNodeLoader.o.d; sourceTree = "<group>"; };
15CBA461196EE670005877BB /* CCNodeLoaderLibrary.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCNodeLoaderLibrary.o; sourceTree = "<group>"; };
15CBA462196EE670005877BB /* CCNodeLoaderLibrary.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCNodeLoaderLibrary.o.d; sourceTree = "<group>"; };
15CBA463196EE670005877BB /* CCParticleSystemQuadLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCParticleSystemQuadLoader.o; sourceTree = "<group>"; };
15CBA464196EE670005877BB /* CCParticleSystemQuadLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCParticleSystemQuadLoader.o.d; sourceTree = "<group>"; };
15CBA465196EE670005877BB /* CCScale9SpriteLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCScale9SpriteLoader.o; sourceTree = "<group>"; };
15CBA466196EE670005877BB /* CCScale9SpriteLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCScale9SpriteLoader.o.d; sourceTree = "<group>"; };
15CBA467196EE670005877BB /* CCScrollViewLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCScrollViewLoader.o; sourceTree = "<group>"; };
15CBA468196EE670005877BB /* CCScrollViewLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCScrollViewLoader.o.d; sourceTree = "<group>"; };
15CBA469196EE670005877BB /* CCSpriteLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSpriteLoader.o; sourceTree = "<group>"; };
15CBA46A196EE670005877BB /* CCSpriteLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSpriteLoader.o.d; sourceTree = "<group>"; };
15CBA46C196EE670005877BB /* ccdandroidUtils.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ccdandroidUtils.o; sourceTree = "<group>"; };
15CBA46D196EE670005877BB /* ccdandroidUtils.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ccdandroidUtils.o.d; sourceTree = "<group>"; };
15CBA46E196EE670005877BB /* cddSimpleAudioEngine.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cddSimpleAudioEngine.o; sourceTree = "<group>"; };
15CBA46F196EE670005877BB /* cddSimpleAudioEngine.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cddSimpleAudioEngine.o.d; sourceTree = "<group>"; };
15CBA471196EE670005877BB /* cddandroidAndroidJavaEngine.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = cddandroidAndroidJavaEngine.o; sourceTree = "<group>"; };
15CBA472196EE670005877BB /* cddandroidAndroidJavaEngine.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = cddandroidAndroidJavaEngine.o.d; sourceTree = "<group>"; };
15CBA475196EE670005877BB /* CCActionTimeline.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionTimeline.o; sourceTree = "<group>"; };
15CBA476196EE670005877BB /* CCActionTimeline.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionTimeline.o.d; sourceTree = "<group>"; };
15CBA477196EE670005877BB /* CCActionTimelineCache.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionTimelineCache.o; sourceTree = "<group>"; };
15CBA478196EE670005877BB /* CCActionTimelineCache.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionTimelineCache.o.d; sourceTree = "<group>"; };
15CBA479196EE670005877BB /* CCFrame.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCFrame.o; sourceTree = "<group>"; };
15CBA47A196EE670005877BB /* CCFrame.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCFrame.o.d; sourceTree = "<group>"; };
15CBA47B196EE670005877BB /* CCNodeReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCNodeReader.o; sourceTree = "<group>"; };
15CBA47C196EE670005877BB /* CCNodeReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCNodeReader.o.d; sourceTree = "<group>"; };
15CBA47D196EE670005877BB /* CCTimeLine.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTimeLine.o; sourceTree = "<group>"; };
15CBA47E196EE670005877BB /* CCTimeLine.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTimeLine.o.d; sourceTree = "<group>"; };
15CBA47F196EE670005877BB /* CCActionFrame.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionFrame.o; sourceTree = "<group>"; };
15CBA480196EE670005877BB /* CCActionFrame.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionFrame.o.d; sourceTree = "<group>"; };
15CBA481196EE670005877BB /* CCActionFrameEasing.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionFrameEasing.o; sourceTree = "<group>"; };
15CBA482196EE670005877BB /* CCActionFrameEasing.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionFrameEasing.o.d; sourceTree = "<group>"; };
15CBA483196EE670005877BB /* CCActionManagerEx.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionManagerEx.o; sourceTree = "<group>"; };
15CBA484196EE670005877BB /* CCActionManagerEx.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionManagerEx.o.d; sourceTree = "<group>"; };
15CBA485196EE670005877BB /* CCActionNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionNode.o; sourceTree = "<group>"; };
15CBA486196EE670005877BB /* CCActionNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionNode.o.d; sourceTree = "<group>"; };
15CBA487196EE670005877BB /* CCActionObject.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCActionObject.o; sourceTree = "<group>"; };
15CBA488196EE670005877BB /* CCActionObject.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCActionObject.o.d; sourceTree = "<group>"; };
15CBA489196EE670005877BB /* CCArmature.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCArmature.o; sourceTree = "<group>"; };
15CBA48A196EE670005877BB /* CCArmature.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCArmature.o.d; sourceTree = "<group>"; };
15CBA48B196EE670005877BB /* CCArmatureAnimation.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCArmatureAnimation.o; sourceTree = "<group>"; };
15CBA48C196EE670005877BB /* CCArmatureAnimation.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCArmatureAnimation.o.d; sourceTree = "<group>"; };
15CBA48D196EE670005877BB /* CCArmatureDataManager.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCArmatureDataManager.o; sourceTree = "<group>"; };
15CBA48E196EE670005877BB /* CCArmatureDataManager.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCArmatureDataManager.o.d; sourceTree = "<group>"; };
15CBA48F196EE670005877BB /* CCArmatureDefine.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCArmatureDefine.o; sourceTree = "<group>"; };
15CBA490196EE670005877BB /* CCArmatureDefine.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCArmatureDefine.o.d; sourceTree = "<group>"; };
15CBA491196EE670005877BB /* CCBatchNode.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBatchNode.o; sourceTree = "<group>"; };
15CBA492196EE670005877BB /* CCBatchNode.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBatchNode.o.d; sourceTree = "<group>"; };
15CBA493196EE670005877BB /* CCBone.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCBone.o; sourceTree = "<group>"; };
15CBA494196EE670005877BB /* CCBone.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCBone.o.d; sourceTree = "<group>"; };
15CBA495196EE670005877BB /* CCColliderDetector.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCColliderDetector.o; sourceTree = "<group>"; };
15CBA496196EE670005877BB /* CCColliderDetector.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCColliderDetector.o.d; sourceTree = "<group>"; };
15CBA497196EE670005877BB /* CCComAttribute.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCComAttribute.o; sourceTree = "<group>"; };
15CBA498196EE670005877BB /* CCComAttribute.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCComAttribute.o.d; sourceTree = "<group>"; };
15CBA499196EE670005877BB /* CCComAudio.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCComAudio.o; sourceTree = "<group>"; };
15CBA49A196EE670005877BB /* CCComAudio.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCComAudio.o.d; sourceTree = "<group>"; };
15CBA49B196EE670005877BB /* CCComController.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCComController.o; sourceTree = "<group>"; };
15CBA49C196EE670005877BB /* CCComController.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCComController.o.d; sourceTree = "<group>"; };
15CBA49D196EE670005877BB /* CCComRender.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCComRender.o; sourceTree = "<group>"; };
15CBA49E196EE670005877BB /* CCComRender.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCComRender.o.d; sourceTree = "<group>"; };
15CBA49F196EE670005877BB /* CCDataReaderHelper.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDataReaderHelper.o; sourceTree = "<group>"; };
15CBA4A0196EE670005877BB /* CCDataReaderHelper.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDataReaderHelper.o.d; sourceTree = "<group>"; };
15CBA4A1196EE670005877BB /* CCDatas.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDatas.o; sourceTree = "<group>"; };
15CBA4A2196EE670005877BB /* CCDatas.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDatas.o.d; sourceTree = "<group>"; };
15CBA4A3196EE670005877BB /* CCDecorativeDisplay.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDecorativeDisplay.o; sourceTree = "<group>"; };
15CBA4A4196EE670005877BB /* CCDecorativeDisplay.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDecorativeDisplay.o.d; sourceTree = "<group>"; };
15CBA4A5196EE670005877BB /* CCDisplayFactory.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDisplayFactory.o; sourceTree = "<group>"; };
15CBA4A6196EE670005877BB /* CCDisplayFactory.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDisplayFactory.o.d; sourceTree = "<group>"; };
15CBA4A7196EE670005877BB /* CCDisplayManager.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCDisplayManager.o; sourceTree = "<group>"; };
15CBA4A8196EE670005877BB /* CCDisplayManager.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCDisplayManager.o.d; sourceTree = "<group>"; };
15CBA4A9196EE670005877BB /* CCInputDelegate.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCInputDelegate.o; sourceTree = "<group>"; };
15CBA4AA196EE670005877BB /* CCInputDelegate.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCInputDelegate.o.d; sourceTree = "<group>"; };
15CBA4AB196EE670005877BB /* CCProcessBase.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCProcessBase.o; sourceTree = "<group>"; };
15CBA4AC196EE670005877BB /* CCProcessBase.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCProcessBase.o.d; sourceTree = "<group>"; };
15CBA4AD196EE670005877BB /* CCSGUIReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSGUIReader.o; sourceTree = "<group>"; };
15CBA4AE196EE670005877BB /* CCSGUIReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSGUIReader.o.d; sourceTree = "<group>"; };
15CBA4AF196EE670005877BB /* CCSkin.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSkin.o; sourceTree = "<group>"; };
15CBA4B0196EE670005877BB /* CCSkin.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSkin.o.d; sourceTree = "<group>"; };
15CBA4B1196EE671005877BB /* CCSpriteFrameCacheHelper.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSpriteFrameCacheHelper.o; sourceTree = "<group>"; };
15CBA4B2196EE671005877BB /* CCSpriteFrameCacheHelper.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSpriteFrameCacheHelper.o.d; sourceTree = "<group>"; };
15CBA4B3196EE671005877BB /* CCSSceneReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSSceneReader.o; sourceTree = "<group>"; };
15CBA4B4196EE671005877BB /* CCSSceneReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSSceneReader.o.d; sourceTree = "<group>"; };
15CBA4B5196EE671005877BB /* CCTransformHelp.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTransformHelp.o; sourceTree = "<group>"; };
15CBA4B6196EE671005877BB /* CCTransformHelp.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTransformHelp.o.d; sourceTree = "<group>"; };
15CBA4B7196EE671005877BB /* CCTween.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCTween.o; sourceTree = "<group>"; };
15CBA4B8196EE671005877BB /* CCTween.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCTween.o.d; sourceTree = "<group>"; };
15CBA4B9196EE671005877BB /* CCUtilMath.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCUtilMath.o; sourceTree = "<group>"; };
15CBA4BA196EE671005877BB /* CCUtilMath.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCUtilMath.o.d; sourceTree = "<group>"; };
15CBA4BB196EE671005877BB /* CocoLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CocoLoader.o; sourceTree = "<group>"; };
15CBA4BC196EE671005877BB /* CocoLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CocoLoader.o.d; sourceTree = "<group>"; };
15CBA4BD196EE671005877BB /* DictionaryHelper.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = DictionaryHelper.o; sourceTree = "<group>"; };
15CBA4BE196EE671005877BB /* DictionaryHelper.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = DictionaryHelper.o.d; sourceTree = "<group>"; };
15CBA4BF196EE671005877BB /* TriggerBase.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TriggerBase.o; sourceTree = "<group>"; };
15CBA4C0196EE671005877BB /* TriggerBase.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TriggerBase.o.d; sourceTree = "<group>"; };
15CBA4C1196EE671005877BB /* TriggerMng.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TriggerMng.o; sourceTree = "<group>"; };
15CBA4C2196EE671005877BB /* TriggerMng.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TriggerMng.o.d; sourceTree = "<group>"; };
15CBA4C3196EE671005877BB /* TriggerObj.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TriggerObj.o; sourceTree = "<group>"; };
15CBA4C4196EE671005877BB /* TriggerObj.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TriggerObj.o.d; sourceTree = "<group>"; };
15CBA4C7196EE671005877BB /* ButtonReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ButtonReader.o; sourceTree = "<group>"; };
15CBA4C8196EE671005877BB /* ButtonReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ButtonReader.o.d; sourceTree = "<group>"; };
15CBA4CA196EE671005877BB /* CheckBoxReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CheckBoxReader.o; sourceTree = "<group>"; };
15CBA4CB196EE671005877BB /* CheckBoxReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CheckBoxReader.o.d; sourceTree = "<group>"; };
15CBA4CD196EE671005877BB /* ImageViewReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ImageViewReader.o; sourceTree = "<group>"; };
15CBA4CE196EE671005877BB /* ImageViewReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ImageViewReader.o.d; sourceTree = "<group>"; };
15CBA4D0196EE671005877BB /* LayoutReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = LayoutReader.o; sourceTree = "<group>"; };
15CBA4D1196EE671005877BB /* LayoutReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = LayoutReader.o.d; sourceTree = "<group>"; };
15CBA4D3196EE671005877BB /* ListViewReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ListViewReader.o; sourceTree = "<group>"; };
15CBA4D4196EE671005877BB /* ListViewReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ListViewReader.o.d; sourceTree = "<group>"; };
15CBA4D6196EE671005877BB /* LoadingBarReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = LoadingBarReader.o; sourceTree = "<group>"; };
15CBA4D7196EE671005877BB /* LoadingBarReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = LoadingBarReader.o.d; sourceTree = "<group>"; };
15CBA4D9196EE671005877BB /* PageViewReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = PageViewReader.o; sourceTree = "<group>"; };
15CBA4DA196EE671005877BB /* PageViewReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = PageViewReader.o.d; sourceTree = "<group>"; };
15CBA4DC196EE671005877BB /* ScrollViewReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ScrollViewReader.o; sourceTree = "<group>"; };
15CBA4DD196EE671005877BB /* ScrollViewReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = ScrollViewReader.o.d; sourceTree = "<group>"; };
15CBA4DF196EE671005877BB /* SliderReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = SliderReader.o; sourceTree = "<group>"; };
15CBA4E0196EE671005877BB /* SliderReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = SliderReader.o.d; sourceTree = "<group>"; };
15CBA4E2196EE671005877BB /* TextAtlasReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TextAtlasReader.o; sourceTree = "<group>"; };
15CBA4E3196EE671005877BB /* TextAtlasReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TextAtlasReader.o.d; sourceTree = "<group>"; };
15CBA4E5196EE671005877BB /* TextBMFontReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TextBMFontReader.o; sourceTree = "<group>"; };
15CBA4E6196EE671005877BB /* TextBMFontReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TextBMFontReader.o.d; sourceTree = "<group>"; };
15CBA4E8196EE671005877BB /* TextFieldReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TextFieldReader.o; sourceTree = "<group>"; };
15CBA4E9196EE671005877BB /* TextFieldReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TextFieldReader.o.d; sourceTree = "<group>"; };
15CBA4EB196EE671005877BB /* TextReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = TextReader.o; sourceTree = "<group>"; };
15CBA4EC196EE671005877BB /* TextReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = TextReader.o.d; sourceTree = "<group>"; };
15CBA4ED196EE671005877BB /* WidgetReader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = WidgetReader.o; sourceTree = "<group>"; };
15CBA4EE196EE671005877BB /* WidgetReader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = WidgetReader.o.d; sourceTree = "<group>"; };
15CBA4F0196EE671005877BB /* cpu-features.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "cpu-features.o"; sourceTree = "<group>"; };
15CBA4F1196EE671005877BB /* cpu-features.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = "cpu-features.o.d"; sourceTree = "<group>"; };
15CBA4F6196EE671005877BB /* AppDelegate.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = AppDelegate.o; sourceTree = "<group>"; };
15CBA4F7196EE671005877BB /* AppDelegate.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = AppDelegate.o.d; sourceTree = "<group>"; };
15CBA4F8196EE671005877BB /* main.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = main.o; sourceTree = "<group>"; };
15CBA4F9196EE671005877BB /* main.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = main.o.d; sourceTree = "<group>"; };
15CBA4FB196EE671005877BB /* Animation.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Animation.o; sourceTree = "<group>"; };
15CBA4FC196EE671005877BB /* Animation.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Animation.o.d; sourceTree = "<group>"; };
15CBA4FD196EE671005877BB /* AnimationState.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = AnimationState.o; sourceTree = "<group>"; };
15CBA4FE196EE671005877BB /* AnimationState.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = AnimationState.o.d; sourceTree = "<group>"; };
15CBA4FF196EE671005877BB /* AnimationStateData.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = AnimationStateData.o; sourceTree = "<group>"; };
15CBA500196EE671005877BB /* AnimationStateData.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = AnimationStateData.o.d; sourceTree = "<group>"; };
15CBA501196EE671005877BB /* Atlas.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Atlas.o; sourceTree = "<group>"; };
15CBA502196EE671005877BB /* Atlas.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Atlas.o.d; sourceTree = "<group>"; };
15CBA503196EE671005877BB /* AtlasAttachmentLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = AtlasAttachmentLoader.o; sourceTree = "<group>"; };
15CBA504196EE671005877BB /* AtlasAttachmentLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = AtlasAttachmentLoader.o.d; sourceTree = "<group>"; };
15CBA505196EE671005877BB /* Attachment.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Attachment.o; sourceTree = "<group>"; };
15CBA506196EE671005877BB /* Attachment.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Attachment.o.d; sourceTree = "<group>"; };
15CBA507196EE671005877BB /* AttachmentLoader.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = AttachmentLoader.o; sourceTree = "<group>"; };
15CBA508196EE671005877BB /* AttachmentLoader.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = AttachmentLoader.o.d; sourceTree = "<group>"; };
15CBA509196EE671005877BB /* Bone.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Bone.o; sourceTree = "<group>"; };
15CBA50A196EE671005877BB /* Bone.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Bone.o.d; sourceTree = "<group>"; };
15CBA50B196EE671005877BB /* BoneData.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = BoneData.o; sourceTree = "<group>"; };
15CBA50C196EE671005877BB /* BoneData.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = BoneData.o.d; sourceTree = "<group>"; };
15CBA50D196EE671005877BB /* BoundingBoxAttachment.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = BoundingBoxAttachment.o; sourceTree = "<group>"; };
15CBA50E196EE671005877BB /* BoundingBoxAttachment.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = BoundingBoxAttachment.o.d; sourceTree = "<group>"; };
15CBA50F196EE671005877BB /* CCSkeleton.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSkeleton.o; sourceTree = "<group>"; };
15CBA510196EE671005877BB /* CCSkeleton.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSkeleton.o.d; sourceTree = "<group>"; };
15CBA511196EE671005877BB /* CCSkeletonAnimation.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = CCSkeletonAnimation.o; sourceTree = "<group>"; };
15CBA512196EE671005877BB /* CCSkeletonAnimation.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = CCSkeletonAnimation.o.d; sourceTree = "<group>"; };
15CBA513196EE671005877BB /* Event.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Event.o; sourceTree = "<group>"; };
15CBA514196EE671005877BB /* Event.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Event.o.d; sourceTree = "<group>"; };
15CBA515196EE671005877BB /* EventData.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = EventData.o; sourceTree = "<group>"; };
15CBA516196EE671005877BB /* EventData.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = EventData.o.d; sourceTree = "<group>"; };
15CBA517196EE671005877BB /* extension.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = extension.o; sourceTree = "<group>"; };
15CBA518196EE671005877BB /* extension.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = extension.o.d; sourceTree = "<group>"; };
15CBA519196EE671005877BB /* Json.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Json.o; sourceTree = "<group>"; };
15CBA51A196EE671005877BB /* Json.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Json.o.d; sourceTree = "<group>"; };
15CBA51B196EE671005877BB /* RegionAttachment.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = RegionAttachment.o; sourceTree = "<group>"; };
15CBA51C196EE671005877BB /* RegionAttachment.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = RegionAttachment.o.d; sourceTree = "<group>"; };
15CBA51D196EE671005877BB /* Skeleton.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Skeleton.o; sourceTree = "<group>"; };
15CBA51E196EE671005877BB /* Skeleton.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Skeleton.o.d; sourceTree = "<group>"; };
15CBA51F196EE671005877BB /* SkeletonBounds.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = SkeletonBounds.o; sourceTree = "<group>"; };
15CBA520196EE671005877BB /* SkeletonBounds.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = SkeletonBounds.o.d; sourceTree = "<group>"; };
15CBA521196EE671005877BB /* SkeletonData.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = SkeletonData.o; sourceTree = "<group>"; };
15CBA522196EE671005877BB /* SkeletonData.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = SkeletonData.o.d; sourceTree = "<group>"; };
15CBA523196EE671005877BB /* SkeletonJson.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = SkeletonJson.o; sourceTree = "<group>"; };
15CBA524196EE671005877BB /* SkeletonJson.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = SkeletonJson.o.d; sourceTree = "<group>"; };
15CBA525196EE671005877BB /* Skin.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Skin.o; sourceTree = "<group>"; };
15CBA526196EE671005877BB /* Skin.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Skin.o.d; sourceTree = "<group>"; };
15CBA527196EE671005877BB /* Slot.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = Slot.o; sourceTree = "<group>"; };
15CBA528196EE671005877BB /* Slot.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = Slot.o.d; sourceTree = "<group>"; };
15CBA529196EE671005877BB /* SlotData.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = SlotData.o; sourceTree = "<group>"; };
15CBA52A196EE671005877BB /* SlotData.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = SlotData.o.d; sourceTree = "<group>"; };
15CBA52B196EE671005877BB /* spine-cocos2dx.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "spine-cocos2dx.o"; sourceTree = "<group>"; };
15CBA52C196EE671005877BB /* spine-cocos2dx.o.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.dtrace; path = "spine-cocos2dx.o.d"; sourceTree = "<group>"; };
15CBA52D196EE671005877BB /* proguard-project.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "proguard-project.txt"; sourceTree = "<group>"; };
15CBA52E196EE671005877BB /* project.properties */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = project.properties; sourceTree = "<group>"; };
15CBA531196EE671005877BB /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
15CBA533196EE671005877BB /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
15CBA535196EE671005877BB /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
15CBA537196EE671005877BB /* strings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = strings.xml; sourceTree = "<group>"; };
15CBA53C196EE671005877BB /* AppActivity.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = AppActivity.java; sourceTree = "<group>"; };
15CBA53E196EE671005877BB /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
15CBA53F196EE671005877BB /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; };
15CBA540196EE671005877BB /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
15CBA541196EE671005877BB /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
15CBA542196EE671005877BB /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
15CBA543196EE671005877BB /* HelloLua_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloLua_Prefix.pch; sourceTree = "<group>"; };
15CBA544196EE671005877BB /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
15CBA545196EE671005877BB /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = "<group>"; };
15CBA546196EE671005877BB /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
15CBA547196EE671005877BB /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = "<group>"; };
15CBA548196EE671005877BB /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
15CBA549196EE671005877BB /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
15CBA54A196EE671005877BB /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = "<group>"; };
15CBA54B196EE671005877BB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
15CBA54C196EE671005877BB /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
15CBA54D196EE671005877BB /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
15CBA54E196EE671005877BB /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = "<group>"; };
15CBA9A4196EE6B1005877BB /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = src; sourceTree = "<group>"; };
15CBA9A7196EE6DB005877BB /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
15CBA9C0196EE943005877BB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
15CBA9C2196EE951005877BB /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; };
15CBA9C4196EE962005877BB /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
15CBA9C6196EE971005877BB /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
15CBA9C8196EE97F005877BB /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
15CBA9D3196EEA33005877BB /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; };
15CBA9D6196EEA63005877BB /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; };
15CBA9D8196EEA7D005877BB /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
15CBA9DA196EEA90005877BB /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
15CBA9DC196EEAA6005877BB /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_auto.cpp; path = "../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp"; sourceTree = "<group>"; };
15CBA9EC196F7BD8005877BB /* lua_cocos2dx_controller_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = lua_cocos2dx_controller_auto.hpp; path = "../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp"; sourceTree = "<group>"; };
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCDE1998637C00302043 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua"; sourceTree = "<group>"; };
15D1FCDF1998637C00302043 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua"; sourceTree = "<group>"; };
15D1FCE01998637C00302043 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua"; sourceTree = "<group>"; };
15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua"; sourceTree = "<group>"; };
15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua"; sourceTree = "<group>"; };
15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua"; sourceTree = "<group>"; };
15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua"; sourceTree = "<group>"; };
15D1FCE51998637C00302043 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua"; sourceTree = "<group>"; };
15D1FCE61998637C00302043 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/extern.lua"; sourceTree = "<group>"; };
15D1FCE71998637C00302043 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/json.lua"; sourceTree = "<group>"; };
15D1FCE81998637C00302043 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaj.lua"; sourceTree = "<group>"; };
15D1FCE91998637C00302043 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua"; sourceTree = "<group>"; };
15D1FCEA1998637C00302043 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua"; sourceTree = "<group>"; };
15D1FCEB1998637C00302043 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua"; sourceTree = "<group>"; };
15D1FD32199863BA00302043 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua"; sourceTree = "<group>"; };
15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosBuilderClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua"; sourceTree = "<group>"; };
15D1FD38199863CA00302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = "<group>"; };
15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = "<group>"; };
15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = "<group>"; };
15D1FD41199863E800302043 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua"; sourceTree = "<group>"; };
15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua"; sourceTree = "<group>"; };
15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua"; sourceTree = "<group>"; };
15D1FD44199863E800302043 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua"; sourceTree = "<group>"; };
15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionClass.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua"; sourceTree = "<group>"; };
15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionEnum.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua"; sourceTree = "<group>"; };
15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionFunc.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua"; sourceTree = "<group>"; };
15D1FD50199863F900302043 /* ExtensionConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ExtensionConstants.lua; path = "../cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua"; sourceTree = "<group>"; };
15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkClass.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua"; sourceTree = "<group>"; };
15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkEnum.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua"; sourceTree = "<group>"; };
15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkFunc.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua"; sourceTree = "<group>"; };
15D1FD5C1998641200302043 /* NetworkConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConstants.lua; path = "../cocos/scripting/lua-bindings/script/network/NetworkConstants.lua"; sourceTree = "<group>"; };
15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIEnum.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua"; sourceTree = "<group>"; };
15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIFunc.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua"; sourceTree = "<group>"; };
15D1FD6F1998642800302043 /* experimentalUIConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalUIConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua"; sourceTree = "<group>"; };
15D1FD701998642800302043 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/GuiConstants.lua"; sourceTree = "<group>"; };
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
15EE465A19A7200300AF29F1 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../external/curl/prebuilt/ios/libcurl.a; sourceTree = "<group>"; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE2B218CDF6DA004CD58F /* cpp-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1A0EE31418CDF733004CD58F /* lua-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1A0EE41318CDF775004CD58F /* cpp-empty-test iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1A0EE47E18CDF799004CD58F /* lua-empty-test iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-empty-test iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
1A221C9B191771E300FD2BE4 /* ccs-res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "ccs-res"; path = "../tests/cpp-tests/Resources/ccs-res"; sourceTree = "<group>"; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A9F808C177E98A600D9A1CB /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; };
1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_lua_bindings.xcodeproj; path = "../cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj"; sourceTree = "<group>"; };
1ABCA28618CD91510087CE3A /* lua-tests Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-tests Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1ABCA28918CD91510087CE3A /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
1ABCA28A18CD91510087CE3A /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
1ABCA28B18CD91510087CE3A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1ABCA2A518CD91520087CE3A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
1ABCA2CD18CD93580087CE3A /* lua-tests iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-tests iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1ABCA35418CD9A820087CE3A /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
1ABCA35618CD9A890087CE3A /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
1ABCA35818CD9A8F0087CE3A /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
1ABCA35A18CD9A950087CE3A /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
1ABCA35C18CD9A9E0087CE3A /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
1ABCA36018CD9AC00087CE3A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; };
1ABCA39E18CD9EE50087CE3A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
1ABCA3A218CD9EFE0087CE3A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
1ABCA3A418CD9F060087CE3A /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
1ABCA3A618CD9F0D0087CE3A /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; };
1ABCA3A818CD9F130087CE3A /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; };
1ABCA3AF18CDA06D0087CE3A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
1AC358BB18CEC1BF00F37B72 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = "<group>"; };
1AC358BC18CEC1BF00F37B72 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
1AC358BD18CEC1BF00F37B72 /* AppMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppMacros.h; sourceTree = "<group>"; };
1AC358BE18CEC1BF00F37B72 /* HelloWorldScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HelloWorldScene.cpp; sourceTree = "<group>"; };
1AC358BF18CEC1BF00F37B72 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloWorldScene.h; sourceTree = "<group>"; };
1AC358C518CEC1CA00F37B72 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
1AC358C618CEC1CA00F37B72 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; };
1AC358C718CEC1CA00F37B72 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
1AC358C818CEC1CA00F37B72 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
1AC358C918CEC1CA00F37B72 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
1AC358CC18CEC1CB00F37B72 /* Icon-100.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-100.png"; sourceTree = "<group>"; };
1AC358CD18CEC1CB00F37B72 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
1AC358CE18CEC1CB00F37B72 /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = "<group>"; };
1AC358CF18CEC1CB00F37B72 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
1AC358D018CEC1CB00F37B72 /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = "<group>"; };
1AC358D118CEC1CB00F37B72 /* Icon-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-40.png"; sourceTree = "<group>"; };
1AC358D218CEC1CB00F37B72 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
1AC358D318CEC1CB00F37B72 /* Icon-58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-58.png"; sourceTree = "<group>"; };
1AC358D418CEC1CB00F37B72 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
1AC358D518CEC1CB00F37B72 /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = "<group>"; };
1AC358D618CEC1CB00F37B72 /* Icon-80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-80.png"; sourceTree = "<group>"; };
1AC358D718CEC1CB00F37B72 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
1AC358D818CEC1CB00F37B72 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
1AC358D918CEC1CB00F37B72 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = "<group>"; };
1AC358EE18CEC1D400F37B72 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1AC358F018CEC1D400F37B72 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
1AC358F318CEC1D400F37B72 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
1AC358F418CEC1D400F37B72 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
1AC358FE18CEC1FB00F37B72 /* bang.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bang.png; path = "../tests/cpp-empty-test/Resources/bang.png"; sourceTree = "<group>"; };
1AC358FF18CEC1FB00F37B72 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = "../tests/cpp-empty-test/Resources/fonts"; sourceTree = "<group>"; };
1AC3590018CEC1FB00F37B72 /* ipad */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ipad; path = "../tests/cpp-empty-test/Resources/ipad"; sourceTree = "<group>"; };
1AC3590118CEC1FB00F37B72 /* ipadhd */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ipadhd; path = "../tests/cpp-empty-test/Resources/ipadhd"; sourceTree = "<group>"; };
1AC3590218CEC1FB00F37B72 /* iphone */ = {isa = PBXFileReference; lastKnownFileType = folder; name = iphone; path = "../tests/cpp-empty-test/Resources/iphone"; sourceTree = "<group>"; };
1AC3590D18CEC25300F37B72 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1AC3590F18CEC26700F37B72 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1AC3592918CECF0A00F37B72 /* ActionManagerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionManagerTest.cpp; sourceTree = "<group>"; };
1AC3592A18CECF0A00F37B72 /* ActionManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActionManagerTest.h; sourceTree = "<group>"; };
1AC3592C18CECF0A00F37B72 /* ActionsEaseTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionsEaseTest.cpp; sourceTree = "<group>"; };
1AC3592D18CECF0A00F37B72 /* ActionsEaseTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActionsEaseTest.h; sourceTree = "<group>"; };
1AC3592F18CECF0A00F37B72 /* ActionsProgressTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionsProgressTest.cpp; sourceTree = "<group>"; };
1AC3593018CECF0A00F37B72 /* ActionsProgressTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActionsProgressTest.h; sourceTree = "<group>"; };
1AC3593218CECF0A00F37B72 /* ActionsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionsTest.cpp; sourceTree = "<group>"; };
1AC3593318CECF0A00F37B72 /* ActionsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActionsTest.h; sourceTree = "<group>"; };
1AC3593418CECF0A00F37B72 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = "<group>"; };
1AC3593518CECF0A00F37B72 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
1AC3593618CECF0A00F37B72 /* BaseTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseTest.cpp; sourceTree = "<group>"; };
1AC3593718CECF0A00F37B72 /* BaseTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseTest.h; sourceTree = "<group>"; };
1AC3593918CECF0A00F37B72 /* Box2dTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Box2dTest.cpp; sourceTree = "<group>"; };
1AC3593A18CECF0A00F37B72 /* Box2dTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Box2dTest.h; sourceTree = "<group>"; };
1AC3593C18CECF0A00F37B72 /* Box2dView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Box2dView.cpp; sourceTree = "<group>"; };
1AC3593D18CECF0A00F37B72 /* Box2dView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Box2dView.h; sourceTree = "<group>"; };
1AC3593E18CECF0A00F37B72 /* GLES-Render.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "GLES-Render.cpp"; sourceTree = "<group>"; };
1AC3593F18CECF0A00F37B72 /* GLES-Render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GLES-Render.h"; sourceTree = "<group>"; };
1AC3594018CECF0A00F37B72 /* Test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Test.cpp; sourceTree = "<group>"; };
1AC3594118CECF0A00F37B72 /* Test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Test.h; sourceTree = "<group>"; };
1AC3594218CECF0A00F37B72 /* TestEntries.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestEntries.cpp; sourceTree = "<group>"; };
1AC3594418CECF0B00F37B72 /* AddPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddPair.h; sourceTree = "<group>"; };
1AC3594518CECF0B00F37B72 /* ApplyForce.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplyForce.h; sourceTree = "<group>"; };
1AC3594618CECF0B00F37B72 /* BodyTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BodyTypes.h; sourceTree = "<group>"; };
1AC3594718CECF0B00F37B72 /* Breakable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Breakable.h; sourceTree = "<group>"; };
1AC3594818CECF0B00F37B72 /* Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bridge.h; sourceTree = "<group>"; };
1AC3594918CECF0B00F37B72 /* BulletTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BulletTest.h; sourceTree = "<group>"; };
1AC3594A18CECF0B00F37B72 /* Cantilever.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cantilever.h; sourceTree = "<group>"; };
1AC3594B18CECF0B00F37B72 /* Car.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Car.h; sourceTree = "<group>"; };
1AC3594C18CECF0B00F37B72 /* Chain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Chain.h; sourceTree = "<group>"; };
1AC3594D18CECF0B00F37B72 /* CharacterCollision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterCollision.h; sourceTree = "<group>"; };
1AC3594E18CECF0B00F37B72 /* CollisionFiltering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollisionFiltering.h; sourceTree = "<group>"; };
1AC3594F18CECF0B00F37B72 /* CollisionProcessing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollisionProcessing.h; sourceTree = "<group>"; };
1AC3595018CECF0B00F37B72 /* CompoundShapes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompoundShapes.h; sourceTree = "<group>"; };
1AC3595118CECF0B00F37B72 /* Confined.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Confined.h; sourceTree = "<group>"; };
1AC3595218CECF0B00F37B72 /* ContinuousTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContinuousTest.h; sourceTree = "<group>"; };
1AC3595318CECF0B00F37B72 /* ConvexHull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvexHull.h; sourceTree = "<group>"; };
1AC3595418CECF0B00F37B72 /* ConveyorBelt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConveyorBelt.h; sourceTree = "<group>"; };
1AC3595518CECF0B00F37B72 /* DistanceTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DistanceTest.h; sourceTree = "<group>"; };
1AC3595618CECF0B00F37B72 /* Dominos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Dominos.h; sourceTree = "<group>"; };
1AC3595718CECF0B00F37B72 /* DumpShell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumpShell.h; sourceTree = "<group>"; };
1AC3595818CECF0B00F37B72 /* DynamicTreeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicTreeTest.h; sourceTree = "<group>"; };
1AC3595918CECF0B00F37B72 /* EdgeShapes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EdgeShapes.h; sourceTree = "<group>"; };
1AC3595A18CECF0B00F37B72 /* EdgeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EdgeTest.h; sourceTree = "<group>"; };
1AC3595B18CECF0B00F37B72 /* Gears.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Gears.h; sourceTree = "<group>"; };
1AC3595C18CECF0B00F37B72 /* Mobile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mobile.h; sourceTree = "<group>"; };
1AC3595D18CECF0B00F37B72 /* MobileBalanced.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobileBalanced.h; sourceTree = "<group>"; };
1AC3595E18CECF0B00F37B72 /* MotorJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MotorJoint.h; sourceTree = "<group>"; };
1AC3595F18CECF0B00F37B72 /* OneSidedPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OneSidedPlatform.h; sourceTree = "<group>"; };
1AC3596018CECF0B00F37B72 /* Pinball.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pinball.h; sourceTree = "<group>"; };
1AC3596118CECF0B00F37B72 /* PolyCollision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolyCollision.h; sourceTree = "<group>"; };
1AC3596218CECF0B00F37B72 /* PolyShapes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolyShapes.h; sourceTree = "<group>"; };
1AC3596318CECF0B00F37B72 /* Prismatic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prismatic.h; sourceTree = "<group>"; };
1AC3596418CECF0B00F37B72 /* Pulleys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pulleys.h; sourceTree = "<group>"; };
1AC3596518CECF0B00F37B72 /* Pyramid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pyramid.h; sourceTree = "<group>"; };
1AC3596618CECF0B00F37B72 /* RayCast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RayCast.h; sourceTree = "<group>"; };
1AC3596718CECF0B00F37B72 /* Revolute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Revolute.h; sourceTree = "<group>"; };
1AC3596818CECF0B00F37B72 /* Rope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Rope.h; sourceTree = "<group>"; };
1AC3596918CECF0B00F37B72 /* RopeJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RopeJoint.h; sourceTree = "<group>"; };
1AC3596A18CECF0B00F37B72 /* SensorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SensorTest.h; sourceTree = "<group>"; };
1AC3596B18CECF0B00F37B72 /* ShapeEditing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShapeEditing.h; sourceTree = "<group>"; };
1AC3596C18CECF0B00F37B72 /* SliderCrank.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderCrank.h; sourceTree = "<group>"; };
1AC3596D18CECF0B00F37B72 /* SphereStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SphereStack.h; sourceTree = "<group>"; };
1AC3596E18CECF0B00F37B72 /* TheoJansen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TheoJansen.h; sourceTree = "<group>"; };
1AC3596F18CECF0B00F37B72 /* Tiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tiles.h; sourceTree = "<group>"; };
1AC3597018CECF0B00F37B72 /* TimeOfImpact.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeOfImpact.h; sourceTree = "<group>"; };
1AC3597118CECF0B00F37B72 /* Tumbler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tumbler.h; sourceTree = "<group>"; };
1AC3597218CECF0B00F37B72 /* VaryingFriction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VaryingFriction.h; sourceTree = "<group>"; };
1AC3597318CECF0B00F37B72 /* VaryingRestitution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VaryingRestitution.h; sourceTree = "<group>"; };
1AC3597418CECF0B00F37B72 /* VerticalStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VerticalStack.h; sourceTree = "<group>"; };
1AC3597518CECF0B00F37B72 /* Web.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Web.h; sourceTree = "<group>"; };
1AC3597718CECF0B00F37B72 /* Bug-1159.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-1159.cpp"; sourceTree = "<group>"; };
1AC3597818CECF0B00F37B72 /* Bug-1159.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-1159.h"; sourceTree = "<group>"; };
1AC3597918CECF0B00F37B72 /* Bug-1174.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-1174.cpp"; sourceTree = "<group>"; };
1AC3597A18CECF0B00F37B72 /* Bug-1174.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-1174.h"; sourceTree = "<group>"; };
1AC3597B18CECF0B00F37B72 /* Bug-350.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-350.cpp"; sourceTree = "<group>"; };
1AC3597C18CECF0B00F37B72 /* Bug-350.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-350.h"; sourceTree = "<group>"; };
1AC3597D18CECF0B00F37B72 /* Bug-422.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-422.cpp"; sourceTree = "<group>"; };
1AC3597E18CECF0B00F37B72 /* Bug-422.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-422.h"; sourceTree = "<group>"; };
1AC3598018CECF0B00F37B72 /* Bug-458.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-458.cpp"; sourceTree = "<group>"; };
1AC3598118CECF0B00F37B72 /* Bug-458.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-458.h"; sourceTree = "<group>"; };
1AC3598218CECF0B00F37B72 /* QuestionContainerSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QuestionContainerSprite.cpp; sourceTree = "<group>"; };
1AC3598318CECF0B00F37B72 /* QuestionContainerSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuestionContainerSprite.h; sourceTree = "<group>"; };
1AC3598418CECF0B00F37B72 /* Bug-624.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-624.cpp"; sourceTree = "<group>"; };
1AC3598518CECF0B00F37B72 /* Bug-624.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-624.h"; sourceTree = "<group>"; };
1AC3598618CECF0B00F37B72 /* Bug-886.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-886.cpp"; sourceTree = "<group>"; };
1AC3598718CECF0B00F37B72 /* Bug-886.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-886.h"; sourceTree = "<group>"; };
1AC3598818CECF0B00F37B72 /* Bug-899.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-899.cpp"; sourceTree = "<group>"; };
1AC3598918CECF0B00F37B72 /* Bug-899.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-899.h"; sourceTree = "<group>"; };
1AC3598A18CECF0B00F37B72 /* Bug-914.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-914.cpp"; sourceTree = "<group>"; };
1AC3598B18CECF0B00F37B72 /* Bug-914.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-914.h"; sourceTree = "<group>"; };
1AC3598C18CECF0B00F37B72 /* BugsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BugsTest.cpp; sourceTree = "<group>"; };
1AC3598D18CECF0B00F37B72 /* BugsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BugsTest.h; sourceTree = "<group>"; };
1AC3598F18CECF0B00F37B72 /* ChipmunkTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChipmunkTest.cpp; sourceTree = "<group>"; };
1AC3599018CECF0B00F37B72 /* ChipmunkTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChipmunkTest.h; sourceTree = "<group>"; };
1AC3599218CECF0B00F37B72 /* ClickAndMoveTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClickAndMoveTest.cpp; sourceTree = "<group>"; };
1AC3599318CECF0B00F37B72 /* ClickAndMoveTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClickAndMoveTest.h; sourceTree = "<group>"; };
fixed deprecation warnings
2014-05-09 07:42:36 +08:00
1AC3599518CECF0B00F37B72 /* ClippingNodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ClippingNodeTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC3599618CECF0B00F37B72 /* ClippingNodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClippingNodeTest.h; sourceTree = "<group>"; };
1AC3599818CECF0B00F37B72 /* CocosDenshionTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocosDenshionTest.cpp; sourceTree = "<group>"; };
1AC3599918CECF0B00F37B72 /* CocosDenshionTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocosDenshionTest.h; sourceTree = "<group>"; };
1AC3599B18CECF0B00F37B72 /* ConfigurationTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConfigurationTest.cpp; sourceTree = "<group>"; };
1AC3599C18CECF0B00F37B72 /* ConfigurationTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConfigurationTest.h; sourceTree = "<group>"; };
1AC3599E18CECF0B00F37B72 /* ConsoleTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsoleTest.cpp; sourceTree = "<group>"; };
1AC3599F18CECF0B00F37B72 /* ConsoleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleTest.h; sourceTree = "<group>"; };
1AC359A018CECF0B00F37B72 /* controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller.cpp; sourceTree = "<group>"; };
1AC359A118CECF0B00F37B72 /* controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller.h; sourceTree = "<group>"; };
1AC359A318CECF0B00F37B72 /* CurlTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CurlTest.cpp; sourceTree = "<group>"; };
1AC359A418CECF0B00F37B72 /* CurlTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurlTest.h; sourceTree = "<group>"; };
1AC359A618CECF0B00F37B72 /* CurrentLanguageTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CurrentLanguageTest.cpp; sourceTree = "<group>"; };
1AC359A718CECF0B00F37B72 /* CurrentLanguageTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentLanguageTest.h; sourceTree = "<group>"; };
1AC359A918CECF0B00F37B72 /* DataVisitorTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DataVisitorTest.cpp; sourceTree = "<group>"; };
1AC359AA18CECF0B00F37B72 /* DataVisitorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataVisitorTest.h; sourceTree = "<group>"; };
1AC359AC18CECF0B00F37B72 /* DrawPrimitivesTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawPrimitivesTest.cpp; sourceTree = "<group>"; };
1AC359AD18CECF0B00F37B72 /* DrawPrimitivesTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawPrimitivesTest.h; sourceTree = "<group>"; };
1AC359AF18CECF0B00F37B72 /* EffectsAdvancedTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EffectsAdvancedTest.cpp; sourceTree = "<group>"; };
1AC359B018CECF0B00F37B72 /* EffectsAdvancedTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EffectsAdvancedTest.h; sourceTree = "<group>"; };
1AC359B218CECF0B00F37B72 /* EffectsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EffectsTest.cpp; sourceTree = "<group>"; };
1AC359B318CECF0B00F37B72 /* EffectsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EffectsTest.h; sourceTree = "<group>"; };
1AC359B718CECF0B00F37B72 /* AnimationsLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationsLayerLoader.h; sourceTree = "<group>"; };
1AC359B818CECF0B00F37B72 /* AnimationsTestLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnimationsTestLayer.cpp; sourceTree = "<group>"; };
1AC359B918CECF0B00F37B72 /* AnimationsTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationsTestLayer.h; sourceTree = "<group>"; };
1AC359BB18CECF0B00F37B72 /* ButtonTestLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ButtonTestLayer.cpp; sourceTree = "<group>"; };
1AC359BC18CECF0B00F37B72 /* ButtonTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ButtonTestLayer.h; sourceTree = "<group>"; };
1AC359BD18CECF0B00F37B72 /* ButtonTestLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ButtonTestLayerLoader.h; sourceTree = "<group>"; };
1AC359BE18CECF0B00F37B72 /* CocosBuilderTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocosBuilderTest.cpp; sourceTree = "<group>"; };
1AC359BF18CECF0B00F37B72 /* CocosBuilderTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocosBuilderTest.h; sourceTree = "<group>"; };
1AC359C118CECF0B00F37B72 /* HelloCocosBuilderLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HelloCocosBuilderLayer.cpp; sourceTree = "<group>"; };
1AC359C218CECF0B00F37B72 /* HelloCocosBuilderLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloCocosBuilderLayer.h; sourceTree = "<group>"; };
1AC359C318CECF0B00F37B72 /* HelloCocosBuilderLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloCocosBuilderLayerLoader.h; sourceTree = "<group>"; };
1AC359C518CECF0B00F37B72 /* LabelTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTestLayer.h; sourceTree = "<group>"; };
1AC359C618CECF0B00F37B72 /* LabelTestLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTestLayerLoader.h; sourceTree = "<group>"; };
1AC359C818CECF0B00F37B72 /* MenuTestLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MenuTestLayer.cpp; sourceTree = "<group>"; };
1AC359C918CECF0B00F37B72 /* MenuTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuTestLayer.h; sourceTree = "<group>"; };
1AC359CA18CECF0B00F37B72 /* MenuTestLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuTestLayerLoader.h; sourceTree = "<group>"; };
1AC359CC18CECF0B00F37B72 /* ParticleSystemTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParticleSystemTestLayer.h; sourceTree = "<group>"; };
1AC359CD18CECF0B00F37B72 /* ParticleSystemTestLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParticleSystemTestLayerLoader.h; sourceTree = "<group>"; };
1AC359CF18CECF0B00F37B72 /* ScrollViewTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollViewTestLayer.h; sourceTree = "<group>"; };
1AC359D018CECF0B00F37B72 /* ScrollViewTestLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollViewTestLayerLoader.h; sourceTree = "<group>"; };
1AC359D218CECF0B00F37B72 /* SpriteTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteTestLayer.h; sourceTree = "<group>"; };
1AC359D318CECF0B00F37B72 /* SpriteTestLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteTestLayerLoader.h; sourceTree = "<group>"; };
1AC359D518CECF0B00F37B72 /* TestHeaderLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestHeaderLayer.cpp; sourceTree = "<group>"; };
1AC359D618CECF0B00F37B72 /* TestHeaderLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestHeaderLayer.h; sourceTree = "<group>"; };
1AC359D718CECF0B00F37B72 /* TestHeaderLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestHeaderLayerLoader.h; sourceTree = "<group>"; };
1AC359D918CECF0B00F37B72 /* TimelineCallbackLayerLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineCallbackLayerLoader.h; sourceTree = "<group>"; };
1AC359DA18CECF0B00F37B72 /* TimelineCallbackTestLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimelineCallbackTestLayer.cpp; sourceTree = "<group>"; };
1AC359DB18CECF0B00F37B72 /* TimelineCallbackTestLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineCallbackTestLayer.h; sourceTree = "<group>"; };
fixed deprecation warnings
2014-05-09 07:42:36 +08:00
1AC359DD18CECF0B00F37B72 /* ArmatureScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ArmatureScene.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC359DE18CECF0B00F37B72 /* ArmatureScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArmatureScene.h; sourceTree = "<group>"; };
1AC359E018CECF0B00F37B72 /* ComponentsTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComponentsTestScene.cpp; sourceTree = "<group>"; };
1AC359E118CECF0B00F37B72 /* ComponentsTestScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComponentsTestScene.h; sourceTree = "<group>"; };
1AC359E218CECF0B00F37B72 /* EnemyController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnemyController.cpp; sourceTree = "<group>"; };
1AC359E318CECF0B00F37B72 /* EnemyController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnemyController.h; sourceTree = "<group>"; };
1AC359E418CECF0B00F37B72 /* GameOverScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GameOverScene.cpp; sourceTree = "<group>"; };
1AC359E518CECF0B00F37B72 /* GameOverScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameOverScene.h; sourceTree = "<group>"; };
1AC359E618CECF0B00F37B72 /* PlayerController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerController.cpp; sourceTree = "<group>"; };
1AC359E718CECF0B00F37B72 /* PlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerController.h; sourceTree = "<group>"; };
1AC359E818CECF0B00F37B72 /* ProjectileController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProjectileController.cpp; sourceTree = "<group>"; };
1AC359E918CECF0B00F37B72 /* ProjectileController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectileController.h; sourceTree = "<group>"; };
1AC359EA18CECF0B00F37B72 /* SceneController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SceneController.cpp; sourceTree = "<group>"; };
1AC359EB18CECF0B00F37B72 /* SceneController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneController.h; sourceTree = "<group>"; };
1AC35A5918CECF0B00F37B72 /* SceneEditorTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SceneEditorTest.cpp; sourceTree = "<group>"; };
1AC35A5A18CECF0B00F37B72 /* SceneEditorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneEditorTest.h; sourceTree = "<group>"; };
1AC35A5C18CECF0B00F37B72 /* acts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = acts.cpp; sourceTree = "<group>"; };
1AC35A5D18CECF0B00F37B72 /* acts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = acts.h; sourceTree = "<group>"; };
1AC35A5E18CECF0B00F37B72 /* cons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cons.cpp; sourceTree = "<group>"; };
1AC35A5F18CECF0B00F37B72 /* cons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cons.h; sourceTree = "<group>"; };
1AC35A6018CECF0B00F37B72 /* EventDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventDef.h; sourceTree = "<group>"; };
1AC35A6318CECF0B00F37B72 /* CCControlButtonTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlButtonTest.cpp; sourceTree = "<group>"; };
1AC35A6418CECF0B00F37B72 /* CCControlButtonTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlButtonTest.h; sourceTree = "<group>"; };
1AC35A6618CECF0B00F37B72 /* CCControlColourPickerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlColourPickerTest.cpp; sourceTree = "<group>"; };
1AC35A6718CECF0B00F37B72 /* CCControlColourPickerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlColourPickerTest.h; sourceTree = "<group>"; };
1AC35A6918CECF0B00F37B72 /* CCControlPotentiometerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlPotentiometerTest.cpp; sourceTree = "<group>"; };
1AC35A6A18CECF0B00F37B72 /* CCControlPotentiometerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlPotentiometerTest.h; sourceTree = "<group>"; };
1AC35A6B18CECF0B00F37B72 /* CCControlScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlScene.cpp; sourceTree = "<group>"; };
1AC35A6C18CECF0B00F37B72 /* CCControlScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlScene.h; sourceTree = "<group>"; };
1AC35A6D18CECF0B00F37B72 /* CCControlSceneManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlSceneManager.cpp; sourceTree = "<group>"; };
1AC35A6E18CECF0B00F37B72 /* CCControlSceneManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlSceneManager.h; sourceTree = "<group>"; };
1AC35A7018CECF0B00F37B72 /* CCControlSliderTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlSliderTest.cpp; sourceTree = "<group>"; };
1AC35A7118CECF0B00F37B72 /* CCControlSliderTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlSliderTest.h; sourceTree = "<group>"; };
1AC35A7318CECF0B00F37B72 /* CCControlStepperTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlStepperTest.cpp; sourceTree = "<group>"; };
1AC35A7418CECF0B00F37B72 /* CCControlStepperTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlStepperTest.h; sourceTree = "<group>"; };
1AC35A7618CECF0B00F37B72 /* CCControlSwitchTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControlSwitchTest.cpp; sourceTree = "<group>"; };
1AC35A7718CECF0B00F37B72 /* CCControlSwitchTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControlSwitchTest.h; sourceTree = "<group>"; };
1AC35A7918CECF0B00F37B72 /* EditBoxTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditBoxTest.cpp; sourceTree = "<group>"; };
1AC35A7A18CECF0B00F37B72 /* EditBoxTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditBoxTest.h; sourceTree = "<group>"; };
1AC35A7B18CECF0B00F37B72 /* ExtensionsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtensionsTest.cpp; sourceTree = "<group>"; };
1AC35A7C18CECF0B00F37B72 /* ExtensionsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtensionsTest.h; sourceTree = "<group>"; };
1AC35A7E18CECF0B00F37B72 /* HttpClientTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpClientTest.cpp; sourceTree = "<group>"; };
1AC35A7F18CECF0B00F37B72 /* HttpClientTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpClientTest.h; sourceTree = "<group>"; };
1AC35A8018CECF0B00F37B72 /* SocketIOTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketIOTest.cpp; sourceTree = "<group>"; };
1AC35A8118CECF0B00F37B72 /* SocketIOTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketIOTest.h; sourceTree = "<group>"; };
1AC35A8218CECF0B00F37B72 /* WebSocketTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketTest.cpp; sourceTree = "<group>"; };
1AC35A8318CECF0B00F37B72 /* WebSocketTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketTest.h; sourceTree = "<group>"; };
1AC35A8518CECF0B00F37B72 /* NotificationCenterTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NotificationCenterTest.cpp; sourceTree = "<group>"; };
1AC35A8618CECF0B00F37B72 /* NotificationCenterTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationCenterTest.h; sourceTree = "<group>"; };
1AC35A8818CECF0B00F37B72 /* Scale9SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Scale9SpriteTest.cpp; sourceTree = "<group>"; };
1AC35A8918CECF0B00F37B72 /* Scale9SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scale9SpriteTest.h; sourceTree = "<group>"; };
1AC35A8B18CECF0B00F37B72 /* CustomTableViewCell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomTableViewCell.cpp; sourceTree = "<group>"; };
1AC35A8C18CECF0B00F37B72 /* CustomTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomTableViewCell.h; sourceTree = "<group>"; };
1AC35A8D18CECF0B00F37B72 /* TableViewTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TableViewTestScene.cpp; sourceTree = "<group>"; };
1AC35A8E18CECF0B00F37B72 /* TableViewTestScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableViewTestScene.h; sourceTree = "<group>"; };
1AC35A9018CECF0B00F37B72 /* FileUtilsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUtilsTest.cpp; sourceTree = "<group>"; };
1AC35A9118CECF0B00F37B72 /* FileUtilsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUtilsTest.h; sourceTree = "<group>"; };
1AC35A9318CECF0B00F37B72 /* FontTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontTest.cpp; sourceTree = "<group>"; };
1AC35A9418CECF0B00F37B72 /* FontTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontTest.h; sourceTree = "<group>"; };
1AC35A9618CECF0B00F37B72 /* MouseTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseTest.cpp; sourceTree = "<group>"; };
1AC35A9718CECF0B00F37B72 /* MouseTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MouseTest.h; sourceTree = "<group>"; };
1AC35A9918CECF0B00F37B72 /* IntervalTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntervalTest.cpp; sourceTree = "<group>"; };
1AC35A9A18CECF0B00F37B72 /* IntervalTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntervalTest.h; sourceTree = "<group>"; };
fixed deprecation warnings
2014-05-09 07:42:36 +08:00
1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = LabelTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35AA318CECF0C00F37B72 /* LabelTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTest.h; sourceTree = "<group>"; };
1AC35AA418CECF0C00F37B72 /* LabelTestNew.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTestNew.cpp; sourceTree = "<group>"; };
1AC35AA518CECF0C00F37B72 /* LabelTestNew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTestNew.h; sourceTree = "<group>"; };
1AC35AA718CECF0C00F37B72 /* LayerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerTest.cpp; sourceTree = "<group>"; };
1AC35AA818CECF0C00F37B72 /* LayerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTest.h; sourceTree = "<group>"; };
1AC35AAA18CECF0C00F37B72 /* MenuTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MenuTest.cpp; sourceTree = "<group>"; };
1AC35AAB18CECF0C00F37B72 /* MenuTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuTest.h; sourceTree = "<group>"; };
1AC35AAD18CECF0C00F37B72 /* MotionStreakTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MotionStreakTest.cpp; sourceTree = "<group>"; };
1AC35AAE18CECF0C00F37B72 /* MotionStreakTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MotionStreakTest.h; sourceTree = "<group>"; };
fixed deprecation warnings
2014-05-09 07:42:36 +08:00
1AC35AB018CECF0C00F37B72 /* MutiTouchTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = MutiTouchTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35AB118CECF0C00F37B72 /* MutiTouchTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutiTouchTest.h; sourceTree = "<group>"; };
1AC35AB318CECF0C00F37B72 /* NewEventDispatcherTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewEventDispatcherTest.cpp; sourceTree = "<group>"; };
1AC35AB418CECF0C00F37B72 /* NewEventDispatcherTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewEventDispatcherTest.h; sourceTree = "<group>"; };
1AC35AB618CECF0C00F37B72 /* NewRendererTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NewRendererTest.cpp; sourceTree = "<group>"; };
1AC35AB718CECF0C00F37B72 /* NewRendererTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewRendererTest.h; sourceTree = "<group>"; };
fixed deprecation warnings
2014-05-09 07:42:36 +08:00
1AC35AB918CECF0C00F37B72 /* NodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = NodeTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35ABA18CECF0C00F37B72 /* NodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeTest.h; sourceTree = "<group>"; };
1AC35ABC18CECF0C00F37B72 /* ParallaxTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParallaxTest.cpp; sourceTree = "<group>"; };
1AC35ABD18CECF0C00F37B72 /* ParallaxTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallaxTest.h; sourceTree = "<group>"; };
1AC35ABF18CECF0C00F37B72 /* ParticleTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParticleTest.cpp; sourceTree = "<group>"; };
1AC35AC018CECF0C00F37B72 /* ParticleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParticleTest.h; sourceTree = "<group>"; };
1AC35AC218CECF0C00F37B72 /* PerformanceAllocTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceAllocTest.cpp; sourceTree = "<group>"; };
1AC35AC318CECF0C00F37B72 /* PerformanceAllocTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceAllocTest.h; sourceTree = "<group>"; };
1AC35AC418CECF0C00F37B72 /* PerformanceContainerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceContainerTest.cpp; sourceTree = "<group>"; };
1AC35AC518CECF0C00F37B72 /* PerformanceContainerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceContainerTest.h; sourceTree = "<group>"; };
1AC35AC618CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceEventDispatcherTest.cpp; sourceTree = "<group>"; };
1AC35AC718CECF0C00F37B72 /* PerformanceEventDispatcherTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceEventDispatcherTest.h; sourceTree = "<group>"; };
1AC35AC818CECF0C00F37B72 /* PerformanceLabelTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceLabelTest.cpp; sourceTree = "<group>"; };
1AC35AC918CECF0C00F37B72 /* PerformanceLabelTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceLabelTest.h; sourceTree = "<group>"; };
1AC35ACA18CECF0C00F37B72 /* PerformanceNodeChildrenTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceNodeChildrenTest.cpp; sourceTree = "<group>"; };
1AC35ACB18CECF0C00F37B72 /* PerformanceNodeChildrenTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceNodeChildrenTest.h; sourceTree = "<group>"; };
1AC35ACC18CECF0C00F37B72 /* PerformanceParticleTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceParticleTest.cpp; sourceTree = "<group>"; };
1AC35ACD18CECF0C00F37B72 /* PerformanceParticleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceParticleTest.h; sourceTree = "<group>"; };
1AC35ACE18CECF0C00F37B72 /* PerformanceRendererTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceRendererTest.cpp; sourceTree = "<group>"; };
1AC35ACF18CECF0C00F37B72 /* PerformanceRendererTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceRendererTest.h; sourceTree = "<group>"; };
1AC35AD018CECF0C00F37B72 /* PerformanceScenarioTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceScenarioTest.cpp; sourceTree = "<group>"; };
1AC35AD118CECF0C00F37B72 /* PerformanceScenarioTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceScenarioTest.h; sourceTree = "<group>"; };
1AC35AD218CECF0C00F37B72 /* PerformanceSpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceSpriteTest.cpp; sourceTree = "<group>"; };
1AC35AD318CECF0C00F37B72 /* PerformanceSpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceSpriteTest.h; sourceTree = "<group>"; };
1AC35AD418CECF0C00F37B72 /* PerformanceTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceTest.cpp; sourceTree = "<group>"; };
1AC35AD518CECF0C00F37B72 /* PerformanceTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceTest.h; sourceTree = "<group>"; };
1AC35AD618CECF0C00F37B72 /* PerformanceTextureTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceTextureTest.cpp; sourceTree = "<group>"; };
1AC35AD718CECF0C00F37B72 /* PerformanceTextureTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceTextureTest.h; sourceTree = "<group>"; };
1AC35AD818CECF0C00F37B72 /* PerformanceTouchesTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceTouchesTest.cpp; sourceTree = "<group>"; };
1AC35AD918CECF0C00F37B72 /* PerformanceTouchesTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceTouchesTest.h; sourceTree = "<group>"; };
1AC35ADB18CECF0C00F37B72 /* PhysicsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhysicsTest.cpp; sourceTree = "<group>"; };
1AC35ADC18CECF0C00F37B72 /* PhysicsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhysicsTest.h; sourceTree = "<group>"; };
1AC35ADE18CECF0C00F37B72 /* ReleasePoolTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReleasePoolTest.cpp; sourceTree = "<group>"; };
1AC35ADF18CECF0C00F37B72 /* ReleasePoolTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReleasePoolTest.h; sourceTree = "<group>"; };
1AC35AE118CECF0C00F37B72 /* RenderTextureTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTextureTest.cpp; sourceTree = "<group>"; };
1AC35AE218CECF0C00F37B72 /* RenderTextureTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTextureTest.h; sourceTree = "<group>"; };
1AC35AE418CECF0C00F37B72 /* RotateWorldTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RotateWorldTest.cpp; sourceTree = "<group>"; };
1AC35AE518CECF0C00F37B72 /* RotateWorldTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RotateWorldTest.h; sourceTree = "<group>"; };
1AC35AE718CECF0C00F37B72 /* SceneTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SceneTest.cpp; sourceTree = "<group>"; };
1AC35AE818CECF0C00F37B72 /* SceneTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneTest.h; sourceTree = "<group>"; };
1AC35AEA18CECF0C00F37B72 /* SchedulerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SchedulerTest.cpp; sourceTree = "<group>"; };
1AC35AEB18CECF0C00F37B72 /* SchedulerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SchedulerTest.h; sourceTree = "<group>"; };
1AC35AED18CECF0C00F37B72 /* ShaderTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShaderTest.cpp; sourceTree = "<group>"; };
1AC35AEE18CECF0C00F37B72 /* ShaderTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShaderTest.h; sourceTree = "<group>"; };
1AC35AEF18CECF0C00F37B72 /* ShaderTest2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShaderTest2.cpp; sourceTree = "<group>"; };
1AC35AF018CECF0C00F37B72 /* ShaderTest2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShaderTest2.h; sourceTree = "<group>"; };
1AC35AF218CECF0C00F37B72 /* SpineTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpineTest.cpp; sourceTree = "<group>"; };
1AC35AF318CECF0C00F37B72 /* SpineTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpineTest.h; sourceTree = "<group>"; };
fixed deprecation warnings
2014-05-09 07:42:36 +08:00
1AC35AF518CECF0C00F37B72 /* SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = SpriteTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35AF618CECF0C00F37B72 /* SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteTest.h; sourceTree = "<group>"; };
1AC35AF718CECF0C00F37B72 /* testBasic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testBasic.cpp; sourceTree = "<group>"; };
1AC35AF818CECF0C00F37B72 /* testBasic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = testBasic.h; sourceTree = "<group>"; };
1AC35AF918CECF0C00F37B72 /* testResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = testResource.h; sourceTree = "<group>"; };
1AC35AFA18CECF0C00F37B72 /* tests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tests.h; sourceTree = "<group>"; };
1AC35AFC18CECF0C00F37B72 /* TextInputTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextInputTest.cpp; sourceTree = "<group>"; };
1AC35AFD18CECF0C00F37B72 /* TextInputTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextInputTest.h; sourceTree = "<group>"; };
1AC35AFF18CECF0C00F37B72 /* Texture2dTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Texture2dTest.cpp; sourceTree = "<group>"; };
1AC35B0018CECF0C00F37B72 /* Texture2dTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Texture2dTest.h; sourceTree = "<group>"; };
1AC35B0218CECF0C00F37B72 /* TextureCacheTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureCacheTest.cpp; sourceTree = "<group>"; };
1AC35B0318CECF0C00F37B72 /* TextureCacheTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureCacheTest.h; sourceTree = "<group>"; };
1AC35B0518CECF0C00F37B72 /* TextureAtlasEncryptionTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureAtlasEncryptionTest.cpp; sourceTree = "<group>"; };
1AC35B0618CECF0C00F37B72 /* TextureAtlasEncryptionTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureAtlasEncryptionTest.h; sourceTree = "<group>"; };
1AC35B0818CECF0C00F37B72 /* TileMapTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileMapTest.cpp; sourceTree = "<group>"; };
1AC35B0918CECF0C00F37B72 /* TileMapTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TileMapTest.h; sourceTree = "<group>"; };
1AC35B0B18CECF0C00F37B72 /* Ball.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ball.cpp; sourceTree = "<group>"; };
1AC35B0C18CECF0C00F37B72 /* Ball.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ball.h; sourceTree = "<group>"; };
1AC35B0D18CECF0C00F37B72 /* Paddle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Paddle.cpp; sourceTree = "<group>"; };
1AC35B0E18CECF0C00F37B72 /* Paddle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Paddle.h; sourceTree = "<group>"; };
1AC35B0F18CECF0C00F37B72 /* TouchesTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TouchesTest.cpp; sourceTree = "<group>"; };
1AC35B1018CECF0C00F37B72 /* TouchesTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TouchesTest.h; sourceTree = "<group>"; };
1AC35B1218CECF0C00F37B72 /* TransitionsTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransitionsTest.cpp; sourceTree = "<group>"; };
1AC35B1318CECF0C00F37B72 /* TransitionsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransitionsTest.h; sourceTree = "<group>"; };
1AC35B1518CECF0C00F37B72 /* UnitTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnitTest.cpp; sourceTree = "<group>"; };
1AC35B1618CECF0C00F37B72 /* UnitTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnitTest.h; sourceTree = "<group>"; };
1AC35B1818CECF0C00F37B72 /* UserDefaultTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserDefaultTest.cpp; sourceTree = "<group>"; };
1AC35B1918CECF0C00F37B72 /* UserDefaultTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserDefaultTest.h; sourceTree = "<group>"; };
1AC35B1A18CECF0C00F37B72 /* VisibleRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisibleRect.cpp; sourceTree = "<group>"; };
1AC35B1B18CECF0C00F37B72 /* VisibleRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisibleRect.h; sourceTree = "<group>"; };
1AC35B1D18CECF0C00F37B72 /* ZwoptexTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZwoptexTest.cpp; sourceTree = "<group>"; };
1AC35B1E18CECF0C00F37B72 /* ZwoptexTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZwoptexTest.h; sourceTree = "<group>"; };
1AC35C6F18CECF1400F37B72 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
1AC35C7018CECF1400F37B72 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = "<group>"; };
1AC35C7118CECF1400F37B72 /* testsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = testsAppDelegate.h; sourceTree = "<group>"; };
1AC35C7218CECF1400F37B72 /* testsAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = testsAppDelegate.mm; sourceTree = "<group>"; };
1AC35C7318CECF1400F37B72 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
1AC35C7418CECF1400F37B72 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
1AC35C7518CECF1400F37B72 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
1AC35C7618CECF1400F37B72 /* Icon-100.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-100.png"; sourceTree = "<group>"; };
1AC35C7718CECF1400F37B72 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
1AC35C7818CECF1400F37B72 /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = "<group>"; };
1AC35C7918CECF1400F37B72 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
1AC35C7A18CECF1400F37B72 /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = "<group>"; };
1AC35C7B18CECF1400F37B72 /* Icon-29.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-29.png"; sourceTree = "<group>"; };
1AC35C7C18CECF1400F37B72 /* Icon-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-40.png"; sourceTree = "<group>"; };
1AC35C7D18CECF1400F37B72 /* Icon-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-50.png"; sourceTree = "<group>"; };
1AC35C7E18CECF1400F37B72 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
1AC35C7F18CECF1400F37B72 /* Icon-58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-58.png"; sourceTree = "<group>"; };
1AC35C8018CECF1400F37B72 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
1AC35C8118CECF1400F37B72 /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = "<group>"; };
1AC35C8218CECF1400F37B72 /* Icon-80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-80.png"; sourceTree = "<group>"; };
1AC35C8418CECF1400F37B72 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
1AC35C9C18CECF1E00F37B72 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1AC35C9E18CECF1E00F37B72 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
1AC35C9F18CECF1E00F37B72 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
1AC35CA018CECF1E00F37B72 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
1AC35CA918CED84500F37B72 /* animations */ = {isa = PBXFileReference; lastKnownFileType = folder; name = animations; path = "../tests/cpp-tests/Resources/animations"; sourceTree = "<group>"; };
1AC35CAC18CED84500F37B72 /* background.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = background.mp3; path = "../tests/cpp-tests/Resources/background.mp3"; sourceTree = "<group>"; };
1AC35CAD18CED84500F37B72 /* background.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; name = background.ogg; path = "../tests/cpp-tests/Resources/background.ogg"; sourceTree = "<group>"; };
1AC35CAE18CED84500F37B72 /* ccb */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ccb; path = "../tests/cpp-tests/Resources/ccb"; sourceTree = "<group>"; };
1AC35CAF18CED84500F37B72 /* CocosBuilderExample.ccbproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = CocosBuilderExample.ccbproj; path = "../tests/cpp-tests/Resources/CocosBuilderExample.ccbproj"; sourceTree = "<group>"; };
1AC35CB018CED84500F37B72 /* CocosBuilderExample.ccbresourcelog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocosBuilderExample.ccbresourcelog; path = "../tests/cpp-tests/Resources/CocosBuilderExample.ccbresourcelog"; sourceTree = "<group>"; };
1AC35CB318CED84500F37B72 /* components */ = {isa = PBXFileReference; lastKnownFileType = folder; name = components; path = "../tests/cpp-tests/Resources/components"; sourceTree = "<group>"; };
1AC35CB418CED84500F37B72 /* configs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = configs; path = "../tests/cpp-tests/Resources/configs"; sourceTree = "<group>"; };
1AC35CB518CED84500F37B72 /* effect1.raw */ = {isa = PBXFileReference; lastKnownFileType = file; name = effect1.raw; path = "../tests/cpp-tests/Resources/effect1.raw"; sourceTree = "<group>"; };
1AC35CB618CED84500F37B72 /* effect1.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = effect1.wav; path = "../tests/cpp-tests/Resources/effect1.wav"; sourceTree = "<group>"; };
1AC35CB718CED84500F37B72 /* effect2.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; name = effect2.ogg; path = "../tests/cpp-tests/Resources/effect2.ogg"; sourceTree = "<group>"; };
1AC35CB818CED84500F37B72 /* extensions */ = {isa = PBXFileReference; lastKnownFileType = folder; name = extensions; path = "../tests/cpp-tests/Resources/extensions"; sourceTree = "<group>"; };
1AC35CB918CED84500F37B72 /* fileLookup.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = fileLookup.plist; path = "../tests/cpp-tests/Resources/fileLookup.plist"; sourceTree = "<group>"; };
1AC35CBA18CED84500F37B72 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = "../tests/cpp-tests/Resources/fonts"; sourceTree = "<group>"; };
1AC35CBC18CED84500F37B72 /* hd */ = {isa = PBXFileReference; lastKnownFileType = folder; name = hd; path = "../tests/cpp-tests/Resources/hd"; sourceTree = "<group>"; };
1AC35CBD18CED84500F37B72 /* Hello.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Hello.png; path = "../tests/cpp-tests/Resources/Hello.png"; sourceTree = "<group>"; };
1AC35CBE18CED84500F37B72 /* Images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Images; path = "../tests/cpp-tests/Resources/Images"; sourceTree = "<group>"; };
1AC35CC118CED84500F37B72 /* Misc */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Misc; path = "../tests/cpp-tests/Resources/Misc"; sourceTree = "<group>"; };
1AC35CC218CED84500F37B72 /* music.mid */ = {isa = PBXFileReference; lastKnownFileType = audio.midi; name = music.mid; path = "../tests/cpp-tests/Resources/music.mid"; sourceTree = "<group>"; };
1AC35CC318CED84500F37B72 /* Particles */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Particles; path = "../tests/cpp-tests/Resources/Particles"; sourceTree = "<group>"; };
1AC35CC418CED84500F37B72 /* pew-pew-lei.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "pew-pew-lei.wav"; path = "../tests/cpp-tests/Resources/pew-pew-lei.wav"; sourceTree = "<group>"; };
1AC35CC618CED84500F37B72 /* Shaders */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Shaders; path = "../tests/cpp-tests/Resources/Shaders"; sourceTree = "<group>"; };
1AC35CC718CED84500F37B72 /* spine */ = {isa = PBXFileReference; lastKnownFileType = folder; name = spine; path = "../tests/cpp-tests/Resources/spine"; sourceTree = "<group>"; };
1AC35CC818CED84500F37B72 /* TileMaps */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TileMaps; path = "../tests/cpp-tests/Resources/TileMaps"; sourceTree = "<group>"; };
1AC35CC918CED84500F37B72 /* zwoptex */ = {isa = PBXFileReference; lastKnownFileType = folder; name = zwoptex; path = "../tests/cpp-tests/Resources/zwoptex"; sourceTree = "<group>"; };
1AC35D0C18CED89100F37B72 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1AC35D0E18CED89E00F37B72 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1AC35D2718CEDE7200F37B72 /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; name = res; path = "../tests/lua-empty-test/res"; sourceTree = "<group>"; };
1AC35D2818CEDE7200F37B72 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = "../tests/lua-empty-test/src"; sourceTree = "<group>"; };
1AC35D2F18CEDE8B00F37B72 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = "<group>"; };
1AC35D3018CEDE8B00F37B72 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
1AC35D3418CEDE9400F37B72 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
1AC35D3518CEDE9400F37B72 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; };
1AC35D3618CEDE9400F37B72 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
1AC35D3718CEDE9400F37B72 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
1AC35D3818CEDE9400F37B72 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
1AC35D3918CEDE9400F37B72 /* HelloLua_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloLua_Prefix.pch; sourceTree = "<group>"; };
1AC35D3A18CEDE9400F37B72 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
1AC35D3B18CEDE9400F37B72 /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = "<group>"; };
1AC35D3C18CEDE9400F37B72 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
1AC35D3D18CEDE9400F37B72 /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = "<group>"; };
1AC35D3E18CEDE9400F37B72 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
1AC35D3F18CEDE9400F37B72 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
1AC35D4018CEDE9400F37B72 /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = "<group>"; };
1AC35D4118CEDE9400F37B72 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1AC35D4218CEDE9400F37B72 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
1AC35D4318CEDE9400F37B72 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
1AC35D4418CEDE9400F37B72 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = "<group>"; };
1AC35D5518CEDE9E00F37B72 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1AC35D5718CEDE9E00F37B72 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
1AC35D5818CEDE9E00F37B72 /* HelloLua_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelloLua_Prefix.pch; sourceTree = "<group>"; };
1AC35D5918CEDE9E00F37B72 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
1AC35D5A18CEDE9E00F37B72 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1AC35D5B18CEDE9E00F37B72 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
1AC35D7418CEE58500F37B72 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = "../tests/lua-tests/src"; sourceTree = "<group>"; };
1AC35D7818CEE59900F37B72 /* cocosbuilderRes */ = {isa = PBXFileReference; lastKnownFileType = folder; name = cocosbuilderRes; path = "../tests/lua-tests/res/cocosbuilderRes"; sourceTree = "<group>"; };
1AC35D7D18CEE5B100F37B72 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = "<group>"; };
1AC35D7E18CEE5B100F37B72 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
1AC35D7F18CEE5B100F37B72 /* lua_assetsmanager_test_sample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_assetsmanager_test_sample.cpp; sourceTree = "<group>"; };
1AC35D8018CEE5B100F37B72 /* lua_assetsmanager_test_sample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_assetsmanager_test_sample.h; sourceTree = "<group>"; };
1AC35D8618CEE5D100F37B72 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
1AC35D8718CEE5D100F37B72 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; };
1AC35D8818CEE5D100F37B72 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
1AC35D8918CEE5D100F37B72 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
1AC35D8A18CEE5D100F37B72 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
1AC35D8B18CEE5D100F37B72 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
1AC35D8C18CEE5D100F37B72 /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = "<group>"; };
1AC35D8D18CEE5D100F37B72 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
1AC35D8E18CEE5D100F37B72 /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = "<group>"; };
1AC35D8F18CEE5D100F37B72 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
1AC35D9018CEE5D100F37B72 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
1AC35D9118CEE5D100F37B72 /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = "<group>"; };
1AC35D9218CEE5D100F37B72 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1AC35D9318CEE5D100F37B72 /* LuaObjectCBridgeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaObjectCBridgeTest.h; sourceTree = "<group>"; };
1AC35D9418CEE5D100F37B72 /* LuaObjectCBridgeTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LuaObjectCBridgeTest.mm; sourceTree = "<group>"; };
1AC35D9518CEE5D100F37B72 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
1AC35D9618CEE5D100F37B72 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
1AC35D9718CEE5D100F37B72 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = "<group>"; };
1AC35DA918CEE5DA00F37B72 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1AC35DAB18CEE5DA00F37B72 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
1AC35DAC18CEE5DA00F37B72 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = "<group>"; };
1AC35DAD18CEE5DA00F37B72 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1AC35DAE18CEE5DA00F37B72 /* LuaObjectCBridgeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaObjectCBridgeTest.h; sourceTree = "<group>"; };
1AC35DAF18CEE5DA00F37B72 /* LuaObjectCBridgeTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LuaObjectCBridgeTest.mm; sourceTree = "<group>"; };
1AC35DB018CEE5DA00F37B72 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
1AF152D718FD252A00A52F3D /* PerformanceCallbackTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceCallbackTest.cpp; sourceTree = "<group>"; };
1AF152D818FD252A00A52F3D /* PerformanceCallbackTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceCallbackTest.h; sourceTree = "<group>"; };
1D6058910D05DD3D006BFB54 /* cpp-tests Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-tests Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1F33634D18E37E840074764D /* RefPtrTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RefPtrTest.cpp; sourceTree = "<group>"; };
1F33634E18E37E840074764D /* RefPtrTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefPtrTest.h; sourceTree = "<group>"; };
add cocostudio parser test template
2014-07-07 17:38:11 +08:00
29080D1A191B574B0066F8DF /* UITest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UITest.cpp; path = ../UITest.cpp; sourceTree = "<group>"; };
29080D1B191B574B0066F8DF /* UITest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UITest.h; path = ../UITest.h; sourceTree = "<group>"; };
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocosGUIScene.cpp; sourceTree = "<group>"; };
29080D20191B595E0066F8DF /* CocosGUIScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocosGUIScene.h; sourceTree = "<group>"; };
29080D21191B595E0066F8DF /* CocoStudioGUITest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocoStudioGUITest.cpp; sourceTree = "<group>"; };
29080D22191B595E0066F8DF /* CocoStudioGUITest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoStudioGUITest.h; sourceTree = "<group>"; };
add cocostudio parser test template
2014-07-07 17:38:11 +08:00
29080D23191B595E0066F8DF /* CustomGUIScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CustomGUIScene.cpp; path = ../CustomGUIScene.cpp; sourceTree = "<group>"; };
29080D24191B595E0066F8DF /* CustomGUIScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomGUIScene.h; path = ../CustomGUIScene.h; sourceTree = "<group>"; };
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D27191B595E0066F8DF /* CustomImageTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomImageTest.cpp; sourceTree = "<group>"; };
29080D28191B595E0066F8DF /* CustomImageTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomImageTest.h; sourceTree = "<group>"; };
29080D2A191B595E0066F8DF /* CustomParticleWidgetTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomParticleWidgetTest.cpp; sourceTree = "<group>"; };
29080D2B191B595E0066F8DF /* CustomParticleWidgetTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomParticleWidgetTest.h; sourceTree = "<group>"; };
29080D2D191B595E0066F8DF /* CustomImageView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomImageView.cpp; sourceTree = "<group>"; };
29080D2E191B595E0066F8DF /* CustomImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomImageView.h; sourceTree = "<group>"; };
29080D2F191B595E0066F8DF /* CustomImageViewReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomImageViewReader.cpp; sourceTree = "<group>"; };
29080D30191B595E0066F8DF /* CustomImageViewReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomImageViewReader.h; sourceTree = "<group>"; };
29080D31191B595E0066F8DF /* CustomParticleWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomParticleWidget.cpp; sourceTree = "<group>"; };
29080D32191B595E0066F8DF /* CustomParticleWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomParticleWidget.h; sourceTree = "<group>"; };
29080D33191B595E0066F8DF /* CustomParticleWidgetReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomParticleWidgetReader.cpp; sourceTree = "<group>"; };
29080D34191B595E0066F8DF /* CustomParticleWidgetReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomParticleWidgetReader.h; sourceTree = "<group>"; };
29080D35191B595E0066F8DF /* CustomReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomReader.cpp; sourceTree = "<group>"; };
29080D36191B595E0066F8DF /* CustomReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomReader.h; sourceTree = "<group>"; };
29080D37191B595E0066F8DF /* GUIEditorTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIEditorTest.cpp; sourceTree = "<group>"; };
29080D38191B595E0066F8DF /* GUIEditorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIEditorTest.h; sourceTree = "<group>"; };
29080D3A191B595E0066F8DF /* UIButtonTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIButtonTest.cpp; sourceTree = "<group>"; };
29080D3B191B595E0066F8DF /* UIButtonTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIButtonTest.h; sourceTree = "<group>"; };
29080D3C191B595E0066F8DF /* UIButtonTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIButtonTest_Editor.cpp; sourceTree = "<group>"; };
29080D3D191B595E0066F8DF /* UIButtonTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIButtonTest_Editor.h; sourceTree = "<group>"; };
29080D3F191B595E0066F8DF /* UICheckBoxTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UICheckBoxTest.cpp; sourceTree = "<group>"; };
29080D40191B595E0066F8DF /* UICheckBoxTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICheckBoxTest.h; sourceTree = "<group>"; };
29080D41191B595E0066F8DF /* UICheckBoxTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UICheckBoxTest_Editor.cpp; sourceTree = "<group>"; };
29080D42191B595E0066F8DF /* UICheckBoxTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICheckBoxTest_Editor.h; sourceTree = "<group>"; };
29080D44191B595E0066F8DF /* UIFocusTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIFocusTest.cpp; sourceTree = "<group>"; };
29080D45191B595E0066F8DF /* UIFocusTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIFocusTest.h; sourceTree = "<group>"; };
29080D47191B595E0066F8DF /* UIImageViewTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIImageViewTest.cpp; sourceTree = "<group>"; };
29080D48191B595E0066F8DF /* UIImageViewTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIImageViewTest.h; sourceTree = "<group>"; };
29080D49191B595E0066F8DF /* UIImageViewTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIImageViewTest_Editor.cpp; sourceTree = "<group>"; };
29080D4A191B595E0066F8DF /* UIImageViewTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIImageViewTest_Editor.h; sourceTree = "<group>"; };
29080D4C191B595E0066F8DF /* UILayoutTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutTest.cpp; sourceTree = "<group>"; };
29080D4D191B595E0066F8DF /* UILayoutTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutTest.h; sourceTree = "<group>"; };
29080D4E191B595E0066F8DF /* UILayoutTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutTest_Editor.cpp; sourceTree = "<group>"; };
29080D4F191B595E0066F8DF /* UILayoutTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutTest_Editor.h; sourceTree = "<group>"; };
29080D51191B595E0066F8DF /* UIListViewTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIListViewTest.cpp; sourceTree = "<group>"; };
29080D52191B595E0066F8DF /* UIListViewTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIListViewTest.h; sourceTree = "<group>"; };
29080D53191B595E0066F8DF /* UIListViewTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIListViewTest_Editor.cpp; sourceTree = "<group>"; };
29080D54191B595E0066F8DF /* UIListViewTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIListViewTest_Editor.h; sourceTree = "<group>"; };
29080D56191B595E0066F8DF /* UILoadingBarTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILoadingBarTest.cpp; sourceTree = "<group>"; };
29080D57191B595E0066F8DF /* UILoadingBarTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILoadingBarTest.h; sourceTree = "<group>"; };
29080D58191B595E0066F8DF /* UILoadingBarTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILoadingBarTest_Editor.cpp; sourceTree = "<group>"; };
29080D59191B595E0066F8DF /* UILoadingBarTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILoadingBarTest_Editor.h; sourceTree = "<group>"; };
29080D5B191B595E0066F8DF /* UIPageViewTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIPageViewTest.cpp; sourceTree = "<group>"; };
29080D5C191B595E0066F8DF /* UIPageViewTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIPageViewTest.h; sourceTree = "<group>"; };
29080D5D191B595E0066F8DF /* UIPageViewTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIPageViewTest_Editor.cpp; sourceTree = "<group>"; };
29080D5E191B595E0066F8DF /* UIPageViewTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIPageViewTest_Editor.h; sourceTree = "<group>"; };
29080D60191B595E0066F8DF /* UIRichTextTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIRichTextTest.cpp; sourceTree = "<group>"; };
29080D61191B595E0066F8DF /* UIRichTextTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIRichTextTest.h; sourceTree = "<group>"; };
29080D62191B595E0066F8DF /* UIScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScene.cpp; sourceTree = "<group>"; };
29080D63191B595E0066F8DF /* UIScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScene.h; sourceTree = "<group>"; };
29080D64191B595E0066F8DF /* UIScene_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScene_Editor.cpp; sourceTree = "<group>"; };
29080D65191B595E0066F8DF /* UIScene_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScene_Editor.h; sourceTree = "<group>"; };
29080D66191B595E0066F8DF /* UISceneManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UISceneManager.cpp; sourceTree = "<group>"; };
29080D67191B595E0066F8DF /* UISceneManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UISceneManager.h; sourceTree = "<group>"; };
29080D68191B595E0066F8DF /* UISceneManager_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UISceneManager_Editor.cpp; sourceTree = "<group>"; };
29080D69191B595E0066F8DF /* UISceneManager_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UISceneManager_Editor.h; sourceTree = "<group>"; };
29080D6B191B595E0066F8DF /* UIScrollViewTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScrollViewTest.cpp; sourceTree = "<group>"; };
29080D6C191B595E0066F8DF /* UIScrollViewTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScrollViewTest.h; sourceTree = "<group>"; };
29080D6D191B595E0066F8DF /* UIScrollViewTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScrollViewTest_Editor.cpp; sourceTree = "<group>"; };
29080D6E191B595E0066F8DF /* UIScrollViewTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScrollViewTest_Editor.h; sourceTree = "<group>"; };
29080D70191B595E0066F8DF /* UISliderTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UISliderTest.cpp; sourceTree = "<group>"; };
29080D71191B595E0066F8DF /* UISliderTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UISliderTest.h; sourceTree = "<group>"; };
29080D72191B595E0066F8DF /* UISliderTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UISliderTest_Editor.cpp; sourceTree = "<group>"; };
29080D73191B595E0066F8DF /* UISliderTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UISliderTest_Editor.h; sourceTree = "<group>"; };
29080D75191B595E0066F8DF /* UITextAtlasTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UITextAtlasTest.cpp; sourceTree = "<group>"; };
29080D76191B595E0066F8DF /* UITextAtlasTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextAtlasTest.h; sourceTree = "<group>"; };
29080D77191B595E0066F8DF /* UITextAtlasTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UITextAtlasTest_Editor.cpp; sourceTree = "<group>"; };
29080D78191B595E0066F8DF /* UITextAtlasTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextAtlasTest_Editor.h; sourceTree = "<group>"; };
29080D7A191B595E0066F8DF /* UITextBMFontTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UITextBMFontTest.cpp; sourceTree = "<group>"; };
29080D7B191B595E0066F8DF /* UITextBMFontTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextBMFontTest.h; sourceTree = "<group>"; };
29080D7C191B595E0066F8DF /* UITextBMFontTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UITextBMFontTest_Editor.cpp; sourceTree = "<group>"; };
29080D7D191B595E0066F8DF /* UITextBMFontTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextBMFontTest_Editor.h; sourceTree = "<group>"; };
29080D7F191B595E0066F8DF /* UITextFieldTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UITextFieldTest.cpp; sourceTree = "<group>"; };
29080D80191B595E0066F8DF /* UITextFieldTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextFieldTest.h; sourceTree = "<group>"; };
29080D81191B595E0066F8DF /* UITextFieldTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UITextFieldTest_Editor.cpp; sourceTree = "<group>"; };
29080D82191B595E0066F8DF /* UITextFieldTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextFieldTest_Editor.h; sourceTree = "<group>"; };
29080D84191B595E0066F8DF /* UITextTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UITextTest.cpp; sourceTree = "<group>"; };
29080D85191B595E0066F8DF /* UITextTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextTest.h; sourceTree = "<group>"; };
29080D86191B595E0066F8DF /* UITextTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UITextTest_Editor.cpp; sourceTree = "<group>"; };
29080D87191B595E0066F8DF /* UITextTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITextTest_Editor.h; sourceTree = "<group>"; };
29080D89191B595E0066F8DF /* UIWidgetAddNodeTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidgetAddNodeTest.cpp; sourceTree = "<group>"; };
29080D8A191B595E0066F8DF /* UIWidgetAddNodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest.h; sourceTree = "<group>"; };
29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidgetAddNodeTest_Editor.cpp; sourceTree = "<group>"; };
29080D8C191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest_Editor.h; sourceTree = "<group>"; };
fix ios project bug
2014-07-11 14:55:00 +08:00
290E94B3196FC16900694919 /* CocostudioParserTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CocostudioParserTest.cpp; path = ../CocostudioParserTest.cpp; sourceTree = "<group>"; };
290E94B4196FC16900694919 /* CocostudioParserTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocostudioParserTest.h; path = ../CocostudioParserTest.h; sourceTree = "<group>"; };
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
295824571987415900F9746D /* UIScale9SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScale9SpriteTest.cpp; sourceTree = "<group>"; };
295824581987415900F9746D /* UIScale9SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScale9SpriteTest.h; sourceTree = "<group>"; };
add Cocostudio 1.3,1.4, 1.5 ui tests
2014-07-08 17:02:50 +08:00
29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocostudioParserJsonTest.cpp; sourceTree = "<group>"; };
29FBBBFD196A9ECD00E65826 /* CocostudioParserJsonTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocostudioParserJsonTest.h; sourceTree = "<group>"; };
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionTimelineTestScene.cpp; sourceTree = "<group>"; };
38FA2E72194AEBE100FF2BE4 /* ActionTimelineTestScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActionTimelineTestScene.h; sourceTree = "<group>"; };
38FA2E75194AECF800FF2BE4 /* ActionTimeline */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ActionTimeline; path = "../tests/cpp-tests/Resources/ActionTimeline"; sourceTree = "<group>"; };
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6176B71960FA6300DE83F5 /* AppDelegate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = "<group>"; };
3E6176B81960FA6300DE83F5 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
3E6176B91960FA6300DE83F5 /* AppMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppMacros.h; sourceTree = "<group>"; };
3E6176BA1960FA6300DE83F5 /* GameControllerTest.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GameControllerTest.cpp; sourceTree = "<group>"; };
3E6176BB1960FA6300DE83F5 /* GameControllerTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GameControllerTest.h; sourceTree = "<group>"; };
3E6176DD1960FA6300DE83F5 /* AppController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
3E6176DE1960FA6300DE83F5 /* AppController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; };
3E6176DF1960FA6300DE83F5 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
3E6176E01960FA6300DE83F5 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
3E6176E11960FA6300DE83F5 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
3E6176E21960FA6300DE83F5 /* Icon-100.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-100.png"; sourceTree = "<group>"; };
3E6176E31960FA6300DE83F5 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = "<group>"; };
3E6176E41960FA6300DE83F5 /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = "<group>"; };
3E6176E51960FA6300DE83F5 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = "<group>"; };
3E6176E61960FA6300DE83F5 /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = "<group>"; };
3E6176E71960FA6300DE83F5 /* Icon-40.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-40.png"; sourceTree = "<group>"; };
3E6176E81960FA6300DE83F5 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = "<group>"; };
3E6176E91960FA6300DE83F5 /* Icon-58.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-58.png"; sourceTree = "<group>"; };
3E6176EA1960FA6300DE83F5 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
3E6176EB1960FA6300DE83F5 /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = "<group>"; };
3E6176EC1960FA6300DE83F5 /* Icon-80.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-80.png"; sourceTree = "<group>"; };
3E6176ED1960FA6300DE83F5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3E6176EE1960FA6300DE83F5 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
3E6176EF1960FA6300DE83F5 /* RootViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
3E6176F01960FA6300DE83F5 /* RootViewController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = "<group>"; };
3E6177311960FAED00DE83F5 /* game-controller-test IOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "game-controller-test IOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3E6177381960FBB800DE83F5 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
3E61773A1960FBC300DE83F5 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; };
3E61773C1960FBD100DE83F5 /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/GameController.framework; sourceTree = DEVELOPER_DIR; };
3E6177F01960FEFE00DE83F5 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = Resources/fonts; sourceTree = "<group>"; };
3E6177F11960FEFE00DE83F5 /* ipad */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ipad; path = Resources/ipad; sourceTree = "<group>"; };
3E6177F21960FEFE00DE83F5 /* ipadhd */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ipadhd; path = Resources/ipadhd; sourceTree = "<group>"; };
3E6177F31960FEFE00DE83F5 /* iphone */ = {isa = PBXFileReference; lastKnownFileType = folder; name = iphone; path = Resources/iphone; sourceTree = "<group>"; };
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sprite3DTest.cpp; path = Sprite3DTest/Sprite3DTest.cpp; sourceTree = "<group>"; };
3E92EA811921A1400094CD21 /* Sprite3DTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sprite3DTest.h; path = Sprite3DTest/Sprite3DTest.h; sourceTree = "<group>"; };
3E92EA841921A7720094CD21 /* Sprite3DTest */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Sprite3DTest; path = "../tests/cpp-tests/Resources/Sprite3DTest"; sourceTree = "<group>"; };
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Camera3DTest.cpp; path = Camera3DTest/Camera3DTest.cpp; sourceTree = "<group>"; };
3E9E75CF199324CB005B7047 /* Camera3DTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Camera3DTest.h; path = Camera3DTest/Camera3DTest.h; sourceTree = "<group>"; };
Update XCode project.pbxproj for add files related to VideoWidget.
2014-05-08 18:28:28 +08:00
3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; name = cocosvideo.mp4; path = "../tests/cpp-tests/Resources/cocosvideo.mp4"; sourceTree = "<group>"; };
3EA0FB65191B933000B170C8 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/MediaPlayer.framework; sourceTree = DEVELOPER_DIR; };
update XCode project.pbxproj
2014-05-09 11:37:14 +08:00
3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIVideoPlayerTest.cpp; sourceTree = "<group>"; };
3EA0FB71191C844400B170C8 /* UIVideoPlayerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayerTest.h; sourceTree = "<group>"; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = cocos2d_libs.xcodeproj; sourceTree = "<group>"; };
add TestCase for reparentChildren bug
2014-05-13 13:50:31 +08:00
59620E8D1921E5CF002021B6 /* Bug-Child.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-Child.cpp"; sourceTree = "<group>"; };
59620E8E1921E5CF002021B6 /* Bug-Child.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-Child.h"; sourceTree = "<group>"; };
1. move drawnode3d to Sprite3DTest 2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
5EBEECAE1995247000429821 /* DrawNode3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DrawNode3D.cpp; path = Sprite3DTest/DrawNode3D.cpp; sourceTree = "<group>"; };
5EBEECAF1995247000429821 /* DrawNode3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DrawNode3D.h; path = Sprite3DTest/DrawNode3D.h; sourceTree = "<group>"; };
Add ShaderTest sample and shader code
2014-05-10 02:48:11 +08:00
70A7F72D191D3E4900F0F206 /* shaderTest.psh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = shaderTest.psh.h; sourceTree = "<group>"; };
70A7F730191D421B00F0F206 /* ShaderTest.vsh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShaderTest.vsh.h; sourceTree = "<group>"; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
A035A71117822E9E00987F6C /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
A07A52291783A1D20073F6A7 /* cpp-tests iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-tests iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A07A52B71783AE6D0073F6A7 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
A07A52B91783AE900073F6A7 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
A07A52BB1783AEB80073F6A7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
A07A52C11783B01F0073F6A7 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; };
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
B2507B6A192589AF00FA4972 /* Shaders3D */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Shaders3D; path = "../tests/cpp-tests/Resources/Shaders3D"; sourceTree = "<group>"; };
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
C04F93581941B05400E9FEAB /* TileMapTest2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileMapTest2.cpp; sourceTree = "<group>"; };
C04F93591941B05400E9FEAB /* TileMapTest2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TileMapTest2.h; sourceTree = "<group>"; };
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
C08689C018D370C90093E810 /* background.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = background.caf; path = "../tests/cpp-tests/Resources/background.caf"; sourceTree = "<group>"; };
D60AE43317F7FFE100757E4B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
EDCC747E17C455FD007B692C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA025196EE56C005877BB /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */,
15427B79198B879900DC375D /* libluacocos2d iOS.a in Frameworks */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA9E0196EEBD4005877BB /* MediaPlayer.framework in Frameworks */,
15CBA9DE196EEAF8005877BB /* GameController.framework in Frameworks */,
15CBA9DD196EEAA6005877BB /* libz.dylib in Frameworks */,
15CBA9DB196EEA90005877BB /* CoreMotion.framework in Frameworks */,
15CBA9D7196EEA63005877BB /* AudioToolbox.framework in Frameworks */,
15CBA9D4196EEA33005877BB /* OpenAL.framework in Frameworks */,
15CBA9D9196EEA7D005877BB /* QuartzCore.framework in Frameworks */,
15CBA9D5196EEA43005877BB /* CoreGraphics.framework in Frameworks */,
15CBA9D2196EEA33005877BB /* OpenGLES.framework in Frameworks */,
15CBA9D0196EEA05005877BB /* UIKit.framework in Frameworks */,
15CBA9CF196EE9FB005877BB /* AVFoundation.framework in Frameworks */,
15CBA9D1196EEA1D005877BB /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE29F18CDF6DA004CD58F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */,
1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */,
1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */,
1A0EE2A818CDF6DA004CD58F /* Foundation.framework in Frameworks */,
1A0EE2A918CDF6DA004CD58F /* AudioToolbox.framework in Frameworks */,
1A0EE2AA18CDF6DA004CD58F /* ApplicationServices.framework in Frameworks */,
1A0EE2AB18CDF6DA004CD58F /* OpenAL.framework in Frameworks */,
1A0EE2AC18CDF6DA004CD58F /* QuartzCore.framework in Frameworks */,
1A0EE2AD18CDF6DA004CD58F /* OpenGL.framework in Frameworks */,
1A0EE2AE18CDF6DA004CD58F /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1A0EE2C818CDF733004CD58F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15EFA270198B25B9000C57D3 /* libcocos2d Mac.a in Frameworks */,
15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE2C918CDF733004CD58F /* libcurl.dylib in Frameworks */,
1A0EE2CA18CDF733004CD58F /* libz.dylib in Frameworks */,
1A0EE2CB18CDF733004CD58F /* IOKit.framework in Frameworks */,
1A0EE2CC18CDF733004CD58F /* Foundation.framework in Frameworks */,
1A0EE2CD18CDF733004CD58F /* AudioToolbox.framework in Frameworks */,
1A0EE2CE18CDF733004CD58F /* ApplicationServices.framework in Frameworks */,
1A0EE2CF18CDF733004CD58F /* OpenAL.framework in Frameworks */,
1A0EE2D018CDF733004CD58F /* QuartzCore.framework in Frameworks */,
1A0EE2D118CDF733004CD58F /* OpenGL.framework in Frameworks */,
1A0EE2D718CDF733004CD58F /* Cocoa.framework in Frameworks */,
);
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
runOnlyForDeploymentPostprocessing = 0;
};
1A0EE40018CDF775004CD58F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
1A0EE40318CDF775004CD58F /* libcocos2d iOS.a in Frameworks */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
1A0EE40618CDF775004CD58F /* CoreMotion.framework in Frameworks */,
1A0EE40718CDF775004CD58F /* libz.dylib in Frameworks */,
1A0EE40818CDF775004CD58F /* Foundation.framework in Frameworks */,
1A0EE40918CDF775004CD58F /* AudioToolbox.framework in Frameworks */,
1A0EE40A18CDF775004CD58F /* OpenAL.framework in Frameworks */,
1A0EE40B18CDF775004CD58F /* QuartzCore.framework in Frameworks */,
1A0EE40C18CDF775004CD58F /* CoreGraphics.framework in Frameworks */,
1A0EE40D18CDF775004CD58F /* OpenGLES.framework in Frameworks */,
1A0EE40E18CDF775004CD58F /* UIKit.framework in Frameworks */,
1A0EE40F18CDF775004CD58F /* AVFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1A0EE42B18CDF799004CD58F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
15AE17DB19A7235300C27E9E /* libcurl.a in Frameworks */,
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15EFA68B198B3AD8000C57D3 /* libcocos2d iOS.a in Frameworks */,
15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */,
1A0EE42C18CDF799004CD58F /* libz.dylib in Frameworks */,
1A0EE42D18CDF799004CD58F /* CoreMotion.framework in Frameworks */,
1A0EE42E18CDF799004CD58F /* AudioToolbox.framework in Frameworks */,
1A0EE42F18CDF799004CD58F /* OpenAL.framework in Frameworks */,
1A0EE43018CDF799004CD58F /* QuartzCore.framework in Frameworks */,
1A0EE43118CDF799004CD58F /* CoreGraphics.framework in Frameworks */,
1A0EE43218CDF799004CD58F /* OpenGLES.framework in Frameworks */,
1A0EE43318CDF799004CD58F /* UIKit.framework in Frameworks */,
1A0EE43418CDF799004CD58F /* AVFoundation.framework in Frameworks */,
1A0EE43518CDF799004CD58F /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1ABCA28318CD91510087CE3A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15EFA273198B265A000C57D3 /* libluacocos2d Mac.a in Frameworks */,
1ABCA2C318CD92420087CE3A /* libcocos2d Mac.a in Frameworks */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */,
1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */,
1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */,
1ABCA35E18CD9AA50087CE3A /* Foundation.framework in Frameworks */,
1ABCA35D18CD9A9E0087CE3A /* AudioToolbox.framework in Frameworks */,
1ABCA35B18CD9A950087CE3A /* ApplicationServices.framework in Frameworks */,
1ABCA35918CD9A8F0087CE3A /* OpenAL.framework in Frameworks */,
1ABCA35718CD9A890087CE3A /* QuartzCore.framework in Frameworks */,
1ABCA35518CD9A820087CE3A /* OpenGL.framework in Frameworks */,
1ABCA28718CD91510087CE3A /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1ABCA2CA18CD93580087CE3A /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
15AE17DC19A725A000C27E9E /* libcurl.a in Frameworks */,
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */,
15EFA666198B34D7000C57D3 /* libcocos2d iOS.a in Frameworks */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */,
1ABCA3B018CDA06D0087CE3A /* libz.dylib in Frameworks */,
1ABCA3AA18CD9F1A0087CE3A /* CoreMotion.framework in Frameworks */,
1ABCA3A918CD9F130087CE3A /* AudioToolbox.framework in Frameworks */,
1ABCA3A718CD9F0D0087CE3A /* OpenAL.framework in Frameworks */,
1ABCA3A518CD9F060087CE3A /* QuartzCore.framework in Frameworks */,
1ABCA3A318CD9EFE0087CE3A /* CoreGraphics.framework in Frameworks */,
1ABCA3A118CD9EF60087CE3A /* OpenGLES.framework in Frameworks */,
1ABCA39F18CD9EE50087CE3A /* UIKit.framework in Frameworks */,
1ABCA39D18CD9ED80087CE3A /* AVFoundation.framework in Frameworks */,
1ABCA2CE18CD93580087CE3A /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1D60588F0D05DD3D006BFB54 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
EDCC747F17C455FD007B692C /* IOKit.framework in Frameworks */,
1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */,
15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */,
15C64833165F3AFD007D4F18 /* Foundation.framework in Frameworks */,
15C6482D165F3988007D4F18 /* AudioToolbox.framework in Frameworks */,
15C6482B165F3979007D4F18 /* ApplicationServices.framework in Frameworks */,
15C64829165F396B007D4F18 /* OpenAL.framework in Frameworks */,
15C64827165F394E007D4F18 /* QuartzCore.framework in Frameworks */,
15C64825165F3934007D4F18 /* OpenGL.framework in Frameworks */,
A05FCACA177C124500BE600E /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3E6177201960FAED00DE83F5 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3E61773D1960FBD200DE83F5 /* GameController.framework in Frameworks */,
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
3E6177221960FAED00DE83F5 /* libcocos2d iOS.a in Frameworks */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
3E6177241960FAED00DE83F5 /* CoreMotion.framework in Frameworks */,
3E6177251960FAED00DE83F5 /* libz.dylib in Frameworks */,
3E6177261960FAED00DE83F5 /* Foundation.framework in Frameworks */,
3E6177271960FAED00DE83F5 /* AudioToolbox.framework in Frameworks */,
3E6177281960FAED00DE83F5 /* OpenAL.framework in Frameworks */,
3E6177291960FAED00DE83F5 /* QuartzCore.framework in Frameworks */,
3E61772A1960FAED00DE83F5 /* CoreGraphics.framework in Frameworks */,
3E61772B1960FAED00DE83F5 /* OpenGLES.framework in Frameworks */,
3E61772C1960FAED00DE83F5 /* UIKit.framework in Frameworks */,
3E61772D1960FAED00DE83F5 /* AVFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
A07A52171783A1D20073F6A7 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
15EE465B19A7200300AF29F1 /* libcurl.a in Frameworks */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */,
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */,
A07A521E1783A1D20073F6A7 /* libz.dylib in Frameworks */,
A07A521F1783A1D20073F6A7 /* Foundation.framework in Frameworks */,
A07A52201783A1D20073F6A7 /* AudioToolbox.framework in Frameworks */,
A07A52221783A1D20073F6A7 /* OpenAL.framework in Frameworks */,
A07A52231783A1D20073F6A7 /* QuartzCore.framework in Frameworks */,
A07A52BE1783AF1E0073F6A7 /* CoreGraphics.framework in Frameworks */,
A07A52BF1783AF210073F6A7 /* OpenGLES.framework in Frameworks */,
A07A52C01783AF250073F6A7 /* UIKit.framework in Frameworks */,
A07A52C31783B02C0073F6A7 /* AVFoundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
15CBA087196EE66D005877BB /* lua-game-controller-test */ = {
isa = PBXGroup;
children = (
15CBA089196EE66D005877BB /* project */,
15CBA9A6196EE6DB005877BB /* res */,
15CBA9A4196EE6B1005877BB /* src */,
);
name = "lua-game-controller-test";
path = "../tests/lua-game-controller-test";
sourceTree = "<group>";
};
15CBA089196EE66D005877BB /* project */ = {
isa = PBXGroup;
children = (
15CBA08A196EE66D005877BB /* Classes */,
15CBA08E196EE66D005877BB /* proj.android */,
15CBA53D196EE671005877BB /* proj.ios */,
);
path = project;
sourceTree = "<group>";
};
15CBA08A196EE66D005877BB /* Classes */ = {
isa = PBXGroup;
children = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */,
15427B7C198B880100DC375D /* lua_cocos2dx_controller_manual.hpp */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */,
15CBA9EC196F7BD8005877BB /* lua_cocos2dx_controller_auto.hpp */,
15CBA08B196EE66D005877BB /* AppDelegate.cpp */,
15CBA08C196EE66D005877BB /* AppDelegate.h */,
);
path = Classes;
sourceTree = "<group>";
};
15CBA08E196EE66D005877BB /* proj.android */ = {
isa = PBXGroup;
children = (
15CBA08F196EE66D005877BB /* .classpath */,
15CBA090196EE66D005877BB /* .project */,
15CBA091196EE66D005877BB /* AndroidManifest.xml */,
15CBA092196EE66D005877BB /* ant.properties */,
15CBA093196EE66D005877BB /* assets */,
15CBA0D8196EE66D005877BB /* bin */,
15CBA104196EE66E005877BB /* build-cfg.json */,
15CBA105196EE66E005877BB /* build.xml */,
15CBA106196EE66E005877BB /* gen */,
15CBA10F196EE66E005877BB /* jni */,
15CBA113196EE66E005877BB /* libs */,
15CBA116196EE66E005877BB /* local.properties */,
15CBA117196EE66E005877BB /* obj */,
15CBA52D196EE671005877BB /* proguard-project.txt */,
15CBA52E196EE671005877BB /* project.properties */,
15CBA52F196EE671005877BB /* res */,
15CBA538196EE671005877BB /* src */,
);
path = proj.android;
sourceTree = "<group>";
};
15CBA093196EE66D005877BB /* assets */ = {
isa = PBXGroup;
children = (
15CBA094196EE66D005877BB /* AudioEngine.lua */,
15CBA095196EE66D005877BB /* CCBReaderLoad.lua */,
15CBA096196EE66D005877BB /* Cocos2d.lua */,
15CBA097196EE66D005877BB /* Cocos2dConstants.lua */,
15CBA098196EE66D005877BB /* CocoStudio.lua */,
15CBA099196EE66D005877BB /* Deprecated.lua */,
15CBA09A196EE66D005877BB /* DeprecatedClass.lua */,
15CBA09B196EE66D005877BB /* DeprecatedEnum.lua */,
15CBA09C196EE66D005877BB /* DeprecatedOpenglEnum.lua */,
15CBA09D196EE66D005877BB /* DrawPrimitives.lua */,
15CBA09E196EE66D005877BB /* extern.lua */,
15CBA09F196EE66D005877BB /* ftp.lua */,
15CBA0A0196EE66D005877BB /* GuiConstants.lua */,
15CBA0A1196EE66D005877BB /* headers.lua */,
15CBA0A2196EE66D005877BB /* http.lua */,
15CBA0A3196EE66D005877BB /* json.lua */,
15CBA0A4196EE66D005877BB /* ltn12.lua */,
15CBA0A5196EE66D005877BB /* luaj.lua */,
15CBA0A6196EE66D005877BB /* luaoc.lua */,
15CBA0A7196EE66D005877BB /* mbox.lua */,
15CBA0A8196EE66D005877BB /* mime.lua */,
15CBA0A9196EE66D005877BB /* Opengl.lua */,
15CBA0AA196EE66D005877BB /* OpenglConstants.lua */,
15CBA0AB196EE66D005877BB /* res */,
15CBA0D0196EE66D005877BB /* smtp.lua */,
15CBA0D1196EE66D005877BB /* socket.lua */,
15CBA0D2196EE66D005877BB /* src */,
15CBA0D5196EE66D005877BB /* StudioConstants.lua */,
15CBA0D6196EE66D005877BB /* tp.lua */,
15CBA0D7196EE66D005877BB /* url.lua */,
);
path = assets;
sourceTree = "<group>";
};
15CBA0AB196EE66D005877BB /* res */ = {
isa = PBXGroup;
children = (
15CBA0AC196EE66D005877BB /* fonts */,
15CBA0AE196EE66D005877BB /* ipad */,
15CBA0BE196EE66D005877BB /* ipadhd */,
15CBA0CD196EE66D005877BB /* iphone */,
);
path = res;
sourceTree = "<group>";
};
15CBA0AC196EE66D005877BB /* fonts */ = {
isa = PBXGroup;
children = (
15CBA0AD196EE66D005877BB /* Marker Felt.ttf */,
);
path = fonts;
sourceTree = "<group>";
};
15CBA0AE196EE66D005877BB /* ipad */ = {
isa = PBXGroup;
children = (
15CBA0AF196EE66D005877BB /* A.png */,
15CBA0B0196EE66D005877BB /* B.png */,
15CBA0B1196EE66D005877BB /* CloseNormal.png */,
15CBA0B2196EE66D005877BB /* CloseSelected.png */,
15CBA0B3196EE66D005877BB /* controller-1.png */,
15CBA0B4196EE66D005877BB /* controller-2.png */,
15CBA0B5196EE66D005877BB /* dpad-key.png */,
15CBA0B6196EE66D005877BB /* dPad.png */,
15CBA0B7196EE66D005877BB /* joystick.png */,
15CBA0B8196EE66D005877BB /* L1.png */,
15CBA0B9196EE66D005877BB /* L2.png */,
15CBA0BA196EE66D005877BB /* R1.png */,
15CBA0BB196EE66D005877BB /* R2.png */,
15CBA0BC196EE66D005877BB /* X.png */,
15CBA0BD196EE66D005877BB /* Y.png */,
);
path = ipad;
sourceTree = "<group>";
};
15CBA0BE196EE66D005877BB /* ipadhd */ = {
isa = PBXGroup;
children = (
15CBA0BF196EE66D005877BB /* A.png */,
15CBA0C0196EE66D005877BB /* B.png */,
15CBA0C1196EE66D005877BB /* CloseNormal.png */,
15CBA0C2196EE66D005877BB /* CloseSelected.png */,
15CBA0C3196EE66D005877BB /* controller-1.png */,
15CBA0C4196EE66D005877BB /* controller-2.png */,
15CBA0C5196EE66D005877BB /* dPad.png */,
15CBA0C6196EE66D005877BB /* joystick.png */,
15CBA0C7196EE66D005877BB /* L1.png */,
15CBA0C8196EE66D005877BB /* L2.png */,
15CBA0C9196EE66D005877BB /* R1.png */,
15CBA0CA196EE66D005877BB /* R2.png */,
15CBA0CB196EE66D005877BB /* X.png */,
15CBA0CC196EE66D005877BB /* Y.png */,
);
path = ipadhd;
sourceTree = "<group>";
};
15CBA0CD196EE66D005877BB /* iphone */ = {
isa = PBXGroup;
children = (
15CBA0CE196EE66D005877BB /* CloseNormal.png */,
15CBA0CF196EE66D005877BB /* CloseSelected.png */,
);
path = iphone;
sourceTree = "<group>";
};
15CBA0D2196EE66D005877BB /* src */ = {
isa = PBXGroup;
children = (
15CBA0D3196EE66D005877BB /* GameControllerTest.lua */,
15CBA0D4196EE66D005877BB /* main.lua */,
);
path = src;
sourceTree = "<group>";
};
15CBA0D8196EE66D005877BB /* bin */ = {
isa = PBXGroup;
children = (
15CBA0D9196EE66D005877BB /* AndroidManifest.xml */,
15CBA0DA196EE66D005877BB /* AndroidManifest.xml.d */,
15CBA0DB196EE66D005877BB /* build.prop */,
15CBA0DC196EE66D005877BB /* classes */,
15CBA0EB196EE66D005877BB /* classes.dex */,
15CBA0EC196EE66D005877BB /* classes.dex.d */,
15CBA0ED196EE66D005877BB /* dexedLibs */,
15CBA0F3196EE66E005877BB /* jarlist.cache */,
15CBA0F4196EE66E005877BB /* LuaGameControllerTest-debug-unaligned.apk */,
15CBA0F5196EE66E005877BB /* LuaGameControllerTest-debug-unaligned.apk.d */,
15CBA0F6196EE66E005877BB /* LuaGameControllerTest-debug.apk */,
15CBA0F7196EE66E005877BB /* LuaGameControllerTest.ap_ */,
15CBA0F8196EE66E005877BB /* LuaGameControllerTest.ap_.d */,
15CBA0F9196EE66E005877BB /* LuaGameControllerTest.apk */,
15CBA0FA196EE66E005877BB /* proguard.txt */,
15CBA0FB196EE66E005877BB /* R.txt */,
15CBA0FC196EE66E005877BB /* res */,
15CBA103196EE66E005877BB /* resources.ap_ */,
);
path = bin;
sourceTree = "<group>";
};
15CBA0DC196EE66D005877BB /* classes */ = {
isa = PBXGroup;
children = (
15CBA0DD196EE66D005877BB /* org */,
15CBA0EA196EE66D005877BB /* R.java.d */,
);
path = classes;
sourceTree = "<group>";
};
15CBA0DD196EE66D005877BB /* org */ = {
isa = PBXGroup;
children = (
15CBA0DE196EE66D005877BB /* cocos2dx */,
);
path = org;
sourceTree = "<group>";
};
15CBA0DE196EE66D005877BB /* cocos2dx */ = {
isa = PBXGroup;
children = (
15CBA0DF196EE66D005877BB /* lib */,
15CBA0E3196EE66D005877BB /* LuaGameControllerTest */,
);
path = cocos2dx;
sourceTree = "<group>";
};
15CBA0DF196EE66D005877BB /* lib */ = {
isa = PBXGroup;
children = (
15CBA0E0196EE66D005877BB /* R$drawable.class */,
15CBA0E1196EE66D005877BB /* R$string.class */,
15CBA0E2196EE66D005877BB /* R.class */,
);
path = lib;
sourceTree = "<group>";
};
15CBA0E3196EE66D005877BB /* LuaGameControllerTest */ = {
isa = PBXGroup;
children = (
15CBA0E4196EE66D005877BB /* AppActivity.class */,
15CBA0E5196EE66D005877BB /* BuildConfig.class */,
15CBA0E6196EE66D005877BB /* R$attr.class */,
15CBA0E7196EE66D005877BB /* R$drawable.class */,
15CBA0E8196EE66D005877BB /* R$string.class */,
15CBA0E9196EE66D005877BB /* R.class */,
);
path = LuaGameControllerTest;
sourceTree = "<group>";
};
15CBA0ED196EE66D005877BB /* dexedLibs */ = {
isa = PBXGroup;
children = (
15CBA0EE196EE66D005877BB /* com.bda.controller-2a2221a1ab7454168b1de77b0fcb60b5.jar */,
15CBA0EF196EE66D005877BB /* libcocos2dx-6607f245d91af6aef71b17fa98444a4b.jar */,
15CBA0F0196EE66E005877BB /* libcontrollermanualadapter-e17761caab08972308a4bbfa589d7d02.jar */,
15CBA0F1196EE66E005877BB /* nibiru_lib_2_1_7-67e12061a63fd16ecf47bdef1767938c.jar */,
15CBA0F2196EE66E005877BB /* ouya-sdk-f5c122a155623a2270a639db2ebe8685.jar */,
);
path = dexedLibs;
sourceTree = "<group>";
};
15CBA0FC196EE66E005877BB /* res */ = {
isa = PBXGroup;
children = (
15CBA0FD196EE66E005877BB /* drawable-hdpi */,
15CBA0FF196EE66E005877BB /* drawable-ldpi */,
15CBA101196EE66E005877BB /* drawable-mdpi */,
);
path = res;
sourceTree = "<group>";
};
15CBA0FD196EE66E005877BB /* drawable-hdpi */ = {
isa = PBXGroup;
children = (
15CBA0FE196EE66E005877BB /* icon.png */,
);
path = "drawable-hdpi";
sourceTree = "<group>";
};
15CBA0FF196EE66E005877BB /* drawable-ldpi */ = {
isa = PBXGroup;
children = (
15CBA100196EE66E005877BB /* icon.png */,
);
path = "drawable-ldpi";
sourceTree = "<group>";
};
15CBA101196EE66E005877BB /* drawable-mdpi */ = {
isa = PBXGroup;
children = (
15CBA102196EE66E005877BB /* icon.png */,
);
path = "drawable-mdpi";
sourceTree = "<group>";
};
15CBA106196EE66E005877BB /* gen */ = {
isa = PBXGroup;
children = (
15CBA107196EE66E005877BB /* org */,
15CBA10E196EE66E005877BB /* R.java.d */,
);
path = gen;
sourceTree = "<group>";
};
15CBA107196EE66E005877BB /* org */ = {
isa = PBXGroup;
children = (
15CBA108196EE66E005877BB /* cocos2dx */,
);
path = org;
sourceTree = "<group>";
};
15CBA108196EE66E005877BB /* cocos2dx */ = {
isa = PBXGroup;
children = (
15CBA109196EE66E005877BB /* lib */,
15CBA10B196EE66E005877BB /* LuaGameControllerTest */,
);
path = cocos2dx;
sourceTree = "<group>";
};
15CBA109196EE66E005877BB /* lib */ = {
isa = PBXGroup;
children = (
15CBA10A196EE66E005877BB /* R.java */,
);
path = lib;
sourceTree = "<group>";
};
15CBA10B196EE66E005877BB /* LuaGameControllerTest */ = {
isa = PBXGroup;
children = (
15CBA10C196EE66E005877BB /* BuildConfig.java */,
15CBA10D196EE66E005877BB /* R.java */,
);
path = LuaGameControllerTest;
sourceTree = "<group>";
};
15CBA10F196EE66E005877BB /* jni */ = {
isa = PBXGroup;
children = (
15CBA110196EE66E005877BB /* Android.mk */,
15CBA111196EE66E005877BB /* Application.mk */,
15CBA112196EE66E005877BB /* main.cpp */,
);
path = jni;
sourceTree = "<group>";
};
15CBA113196EE66E005877BB /* libs */ = {
isa = PBXGroup;
children = (
15CBA114196EE66E005877BB /* armeabi */,
);
path = libs;
sourceTree = "<group>";
};
15CBA114196EE66E005877BB /* armeabi */ = {
isa = PBXGroup;
children = (
15CBA115196EE66E005877BB /* liblua_game_controller.so */,
);
path = armeabi;
sourceTree = "<group>";
};
15CBA117196EE66E005877BB /* obj */ = {
isa = PBXGroup;
children = (
15CBA118196EE66E005877BB /* local */,
);
path = obj;
sourceTree = "<group>";
};
15CBA118196EE66E005877BB /* local */ = {
isa = PBXGroup;
children = (
15CBA119196EE66E005877BB /* armeabi */,
);
path = local;
sourceTree = "<group>";
};
15CBA119196EE66E005877BB /* armeabi */ = {
isa = PBXGroup;
children = (
15CBA11A196EE66E005877BB /* libbox2d.a */,
15CBA11B196EE66E005877BB /* libchipmunk.a */,
15CBA11C196EE66E005877BB /* libcocos2d.a */,
15CBA11D196EE66E005877BB /* libcocos2dandroid.a */,
15CBA11E196EE66E005877BB /* libcocosbuilder.a */,
15CBA11F196EE66E005877BB /* libcocosdenshion.a */,
15CBA120196EE66E005877BB /* libcocostudio.a */,
15CBA121196EE66E005877BB /* libcpufeatures.a */,
15CBA122196EE66E005877BB /* libextension.a */,
15CBA123196EE66E005877BB /* liblua.a */,
15CBA124196EE66E005877BB /* liblua_game_controller.so */,
15CBA125196EE66E005877BB /* libnetwork.a */,
15CBA126196EE66E005877BB /* libspine.a */,
15CBA127196EE66E005877BB /* libui.a */,
15CBA128196EE66E005877BB /* objs-debug */,
);
path = armeabi;
sourceTree = "<group>";
};
15CBA128196EE66E005877BB /* objs-debug */ = {
isa = PBXGroup;
children = (
15CBA129196EE66E005877BB /* box2d_static */,
15CBA18D196EE66E005877BB /* chipmunk_static */,
15CBA1CA196EE66E005877BB /* cocos2dx_static */,
15CBA33B196EE66F005877BB /* cocos2dxandroid_static */,
15CBA359196EE66F005877BB /* cocos_extension_static */,
15CBA38C196EE66F005877BB /* cocos_lua_static */,
15CBA404196EE670005877BB /* cocos_network_static */,
15CBA40B196EE670005877BB /* cocos_ui_static */,
15CBA43E196EE670005877BB /* cocosbuilder_static */,
15CBA46B196EE670005877BB /* cocosdenshion_static */,
15CBA473196EE670005877BB /* cocostudio_static */,
15CBA4EF196EE671005877BB /* cpufeatures */,
15CBA4F2196EE671005877BB /* lua_game_controller_test_shared */,
15CBA4FA196EE671005877BB /* spine_static */,
);
path = "objs-debug";
sourceTree = "<group>";
};
15CBA129196EE66E005877BB /* box2d_static */ = {
isa = PBXGroup;
children = (
15CBA12A196EE66E005877BB /* Collision */,
15CBA144196EE66E005877BB /* Common */,
15CBA151196EE66E005877BB /* Dynamics */,
15CBA18A196EE66E005877BB /* Rope */,
);
path = box2d_static;
sourceTree = "<group>";
};
15CBA12A196EE66E005877BB /* Collision */ = {
isa = PBXGroup;
children = (
15CBA12B196EE66E005877BB /* b2BroadPhase.o */,
15CBA12C196EE66E005877BB /* b2BroadPhase.o.d */,
15CBA12D196EE66E005877BB /* b2CollideCircle.o */,
15CBA12E196EE66E005877BB /* b2CollideCircle.o.d */,
15CBA12F196EE66E005877BB /* b2CollideEdge.o */,
15CBA130196EE66E005877BB /* b2CollideEdge.o.d */,
15CBA131196EE66E005877BB /* b2CollidePolygon.o */,
15CBA132196EE66E005877BB /* b2CollidePolygon.o.d */,
15CBA133196EE66E005877BB /* b2Collision.o */,
15CBA134196EE66E005877BB /* b2Collision.o.d */,
15CBA135196EE66E005877BB /* b2Distance.o */,
15CBA136196EE66E005877BB /* b2Distance.o.d */,
15CBA137196EE66E005877BB /* b2DynamicTree.o */,
15CBA138196EE66E005877BB /* b2DynamicTree.o.d */,
15CBA139196EE66E005877BB /* b2TimeOfImpact.o */,
15CBA13A196EE66E005877BB /* b2TimeOfImpact.o.d */,
15CBA13B196EE66E005877BB /* Shapes */,
);
path = Collision;
sourceTree = "<group>";
};
15CBA13B196EE66E005877BB /* Shapes */ = {
isa = PBXGroup;
children = (
15CBA13C196EE66E005877BB /* b2ChainShape.o */,
15CBA13D196EE66E005877BB /* b2ChainShape.o.d */,
15CBA13E196EE66E005877BB /* b2CircleShape.o */,
15CBA13F196EE66E005877BB /* b2CircleShape.o.d */,
15CBA140196EE66E005877BB /* b2EdgeShape.o */,
15CBA141196EE66E005877BB /* b2EdgeShape.o.d */,
15CBA142196EE66E005877BB /* b2PolygonShape.o */,
15CBA143196EE66E005877BB /* b2PolygonShape.o.d */,
);
path = Shapes;
sourceTree = "<group>";
};
15CBA144196EE66E005877BB /* Common */ = {
isa = PBXGroup;
children = (
15CBA145196EE66E005877BB /* b2BlockAllocator.o */,
15CBA146196EE66E005877BB /* b2BlockAllocator.o.d */,
15CBA147196EE66E005877BB /* b2Draw.o */,
15CBA148196EE66E005877BB /* b2Draw.o.d */,
15CBA149196EE66E005877BB /* b2Math.o */,
15CBA14A196EE66E005877BB /* b2Math.o.d */,
15CBA14B196EE66E005877BB /* b2Settings.o */,
15CBA14C196EE66E005877BB /* b2Settings.o.d */,
15CBA14D196EE66E005877BB /* b2StackAllocator.o */,
15CBA14E196EE66E005877BB /* b2StackAllocator.o.d */,
15CBA14F196EE66E005877BB /* b2Timer.o */,
15CBA150196EE66E005877BB /* b2Timer.o.d */,
);
path = Common;
sourceTree = "<group>";
};
15CBA151196EE66E005877BB /* Dynamics */ = {
isa = PBXGroup;
children = (
15CBA152196EE66E005877BB /* b2Body.o */,
15CBA153196EE66E005877BB /* b2Body.o.d */,
15CBA154196EE66E005877BB /* b2ContactManager.o */,
15CBA155196EE66E005877BB /* b2ContactManager.o.d */,
15CBA156196EE66E005877BB /* b2Fixture.o */,
15CBA157196EE66E005877BB /* b2Fixture.o.d */,
15CBA158196EE66E005877BB /* b2Island.o */,
15CBA159196EE66E005877BB /* b2Island.o.d */,
15CBA15A196EE66E005877BB /* b2World.o */,
15CBA15B196EE66E005877BB /* b2World.o.d */,
15CBA15C196EE66E005877BB /* b2WorldCallbacks.o */,
15CBA15D196EE66E005877BB /* b2WorldCallbacks.o.d */,
15CBA15E196EE66E005877BB /* Contacts */,
15CBA171196EE66E005877BB /* Joints */,
);
path = Dynamics;
sourceTree = "<group>";
};
15CBA15E196EE66E005877BB /* Contacts */ = {
isa = PBXGroup;
children = (
15CBA15F196EE66E005877BB /* b2ChainAndCircleContact.o */,
15CBA160196EE66E005877BB /* b2ChainAndCircleContact.o.d */,
15CBA161196EE66E005877BB /* b2ChainAndPolygonContact.o */,
15CBA162196EE66E005877BB /* b2ChainAndPolygonContact.o.d */,
15CBA163196EE66E005877BB /* b2CircleContact.o */,
15CBA164196EE66E005877BB /* b2CircleContact.o.d */,
15CBA165196EE66E005877BB /* b2Contact.o */,
15CBA166196EE66E005877BB /* b2Contact.o.d */,
15CBA167196EE66E005877BB /* b2ContactSolver.o */,
15CBA168196EE66E005877BB /* b2ContactSolver.o.d */,
15CBA169196EE66E005877BB /* b2EdgeAndCircleContact.o */,
15CBA16A196EE66E005877BB /* b2EdgeAndCircleContact.o.d */,
15CBA16B196EE66E005877BB /* b2EdgeAndPolygonContact.o */,
15CBA16C196EE66E005877BB /* b2EdgeAndPolygonContact.o.d */,
15CBA16D196EE66E005877BB /* b2PolygonAndCircleContact.o */,
15CBA16E196EE66E005877BB /* b2PolygonAndCircleContact.o.d */,
15CBA16F196EE66E005877BB /* b2PolygonContact.o */,
15CBA170196EE66E005877BB /* b2PolygonContact.o.d */,
);
path = Contacts;
sourceTree = "<group>";
};
15CBA171196EE66E005877BB /* Joints */ = {
isa = PBXGroup;
children = (
15CBA172196EE66E005877BB /* b2DistanceJoint.o */,
15CBA173196EE66E005877BB /* b2DistanceJoint.o.d */,
15CBA174196EE66E005877BB /* b2FrictionJoint.o */,
15CBA175196EE66E005877BB /* b2FrictionJoint.o.d */,
15CBA176196EE66E005877BB /* b2GearJoint.o */,
15CBA177196EE66E005877BB /* b2GearJoint.o.d */,
15CBA178196EE66E005877BB /* b2Joint.o */,
15CBA179196EE66E005877BB /* b2Joint.o.d */,
15CBA17A196EE66E005877BB /* b2MotorJoint.o */,
15CBA17B196EE66E005877BB /* b2MotorJoint.o.d */,
15CBA17C196EE66E005877BB /* b2MouseJoint.o */,
15CBA17D196EE66E005877BB /* b2MouseJoint.o.d */,
15CBA17E196EE66E005877BB /* b2PrismaticJoint.o */,
15CBA17F196EE66E005877BB /* b2PrismaticJoint.o.d */,
15CBA180196EE66E005877BB /* b2PulleyJoint.o */,
15CBA181196EE66E005877BB /* b2PulleyJoint.o.d */,
15CBA182196EE66E005877BB /* b2RevoluteJoint.o */,
15CBA183196EE66E005877BB /* b2RevoluteJoint.o.d */,
15CBA184196EE66E005877BB /* b2RopeJoint.o */,
15CBA185196EE66E005877BB /* b2RopeJoint.o.d */,
15CBA186196EE66E005877BB /* b2WeldJoint.o */,
15CBA187196EE66E005877BB /* b2WeldJoint.o.d */,
15CBA188196EE66E005877BB /* b2WheelJoint.o */,
15CBA189196EE66E005877BB /* b2WheelJoint.o.d */,
);
path = Joints;
sourceTree = "<group>";
};
15CBA18A196EE66E005877BB /* Rope */ = {
isa = PBXGroup;
children = (
15CBA18B196EE66E005877BB /* b2Rope.o */,
15CBA18C196EE66E005877BB /* b2Rope.o.d */,
);
path = Rope;
sourceTree = "<group>";
};
15CBA18D196EE66E005877BB /* chipmunk_static */ = {
isa = PBXGroup;
children = (
15CBA18E196EE66E005877BB /* src */,
);
path = chipmunk_static;
sourceTree = "<group>";
};
15CBA18E196EE66E005877BB /* src */ = {
isa = PBXGroup;
children = (
15CBA18F196EE66E005877BB /* chipmunk.o */,
15CBA190196EE66E005877BB /* chipmunk.o.d */,
15CBA191196EE66E005877BB /* constraints */,
15CBA1A8196EE66E005877BB /* cpArbiter.o */,
15CBA1A9196EE66E005877BB /* cpArbiter.o.d */,
15CBA1AA196EE66E005877BB /* cpArray.o */,
15CBA1AB196EE66E005877BB /* cpArray.o.d */,
15CBA1AC196EE66E005877BB /* cpBB.o */,
15CBA1AD196EE66E005877BB /* cpBB.o.d */,
15CBA1AE196EE66E005877BB /* cpBBTree.o */,
15CBA1AF196EE66E005877BB /* cpBBTree.o.d */,
15CBA1B0196EE66E005877BB /* cpBody.o */,
15CBA1B1196EE66E005877BB /* cpBody.o.d */,
15CBA1B2196EE66E005877BB /* cpCollision.o */,
15CBA1B3196EE66E005877BB /* cpCollision.o.d */,
15CBA1B4196EE66E005877BB /* cpHashSet.o */,
15CBA1B5196EE66E005877BB /* cpHashSet.o.d */,
15CBA1B6196EE66E005877BB /* cpPolyShape.o */,
15CBA1B7196EE66E005877BB /* cpPolyShape.o.d */,
15CBA1B8196EE66E005877BB /* cpShape.o */,
15CBA1B9196EE66E005877BB /* cpShape.o.d */,
15CBA1BA196EE66E005877BB /* cpSpace.o */,
15CBA1BB196EE66E005877BB /* cpSpace.o.d */,
15CBA1BC196EE66E005877BB /* cpSpaceComponent.o */,
15CBA1BD196EE66E005877BB /* cpSpaceComponent.o.d */,
15CBA1BE196EE66E005877BB /* cpSpaceHash.o */,
15CBA1BF196EE66E005877BB /* cpSpaceHash.o.d */,
15CBA1C0196EE66E005877BB /* cpSpaceQuery.o */,
15CBA1C1196EE66E005877BB /* cpSpaceQuery.o.d */,
15CBA1C2196EE66E005877BB /* cpSpaceStep.o */,
15CBA1C3196EE66E005877BB /* cpSpaceStep.o.d */,
15CBA1C4196EE66E005877BB /* cpSpatialIndex.o */,
15CBA1C5196EE66E005877BB /* cpSpatialIndex.o.d */,
15CBA1C6196EE66E005877BB /* cpSweep1D.o */,
15CBA1C7196EE66E005877BB /* cpSweep1D.o.d */,
15CBA1C8196EE66E005877BB /* cpVect.o */,
15CBA1C9196EE66E005877BB /* cpVect.o.d */,
);
path = src;
sourceTree = "<group>";
};
15CBA191196EE66E005877BB /* constraints */ = {
isa = PBXGroup;
children = (
15CBA192196EE66E005877BB /* cpConstraint.o */,
15CBA193196EE66E005877BB /* cpConstraint.o.d */,
15CBA194196EE66E005877BB /* cpDampedRotarySpring.o */,
15CBA195196EE66E005877BB /* cpDampedRotarySpring.o.d */,
15CBA196196EE66E005877BB /* cpDampedSpring.o */,
15CBA197196EE66E005877BB /* cpDampedSpring.o.d */,
15CBA198196EE66E005877BB /* cpGearJoint.o */,
15CBA199196EE66E005877BB /* cpGearJoint.o.d */,
15CBA19A196EE66E005877BB /* cpGrooveJoint.o */,
15CBA19B196EE66E005877BB /* cpGrooveJoint.o.d */,
15CBA19C196EE66E005877BB /* cpPinJoint.o */,
15CBA19D196EE66E005877BB /* cpPinJoint.o.d */,
15CBA19E196EE66E005877BB /* cpPivotJoint.o */,
15CBA19F196EE66E005877BB /* cpPivotJoint.o.d */,
15CBA1A0196EE66E005877BB /* cpRatchetJoint.o */,
15CBA1A1196EE66E005877BB /* cpRatchetJoint.o.d */,
15CBA1A2196EE66E005877BB /* cpRotaryLimitJoint.o */,
15CBA1A3196EE66E005877BB /* cpRotaryLimitJoint.o.d */,
15CBA1A4196EE66E005877BB /* cpSimpleMotor.o */,
15CBA1A5196EE66E005877BB /* cpSimpleMotor.o.d */,
15CBA1A6196EE66E005877BB /* cpSlideJoint.o */,
15CBA1A7196EE66E005877BB /* cpSlideJoint.o.d */,
);
path = constraints;
sourceTree = "<group>";
};
15CBA1CA196EE66E005877BB /* cocos2dx_static */ = {
isa = PBXGroup;
children = (
15CBA1CB196EE66E005877BB /* 2d */,
15CBA24E196EE66F005877BB /* 3d */,
15CBA261196EE66F005877BB /* __ */,
15CBA276196EE66F005877BB /* base */,
15CBA2D5196EE66F005877BB /* cocos2d.o */,
15CBA2D6196EE66F005877BB /* cocos2d.o.d */,
15CBA2D7196EE66F005877BB /* deprecated */,
15CBA2E4196EE66F005877BB /* math */,
15CBA2F9196EE66F005877BB /* physics */,
15CBA30F196EE66F005877BB /* platform */,
15CBA31A196EE66F005877BB /* renderer */,
);
path = cocos2dx_static;
sourceTree = "<group>";
};
15CBA1CB196EE66E005877BB /* 2d */ = {
isa = PBXGroup;
children = (
15CBA1CC196EE66E005877BB /* CCAction.o */,
15CBA1CD196EE66E005877BB /* CCAction.o.d */,
15CBA1CE196EE66E005877BB /* CCActionCamera.o */,
15CBA1CF196EE66E005877BB /* CCActionCamera.o.d */,
15CBA1D0196EE66E005877BB /* CCActionCatmullRom.o */,
15CBA1D1196EE66E005877BB /* CCActionCatmullRom.o.d */,
15CBA1D2196EE66E005877BB /* CCActionEase.o */,
15CBA1D3196EE66E005877BB /* CCActionEase.o.d */,
15CBA1D4196EE66E005877BB /* CCActionGrid.o */,
15CBA1D5196EE66E005877BB /* CCActionGrid.o.d */,
15CBA1D6196EE66E005877BB /* CCActionGrid3D.o */,
15CBA1D7196EE66E005877BB /* CCActionGrid3D.o.d */,
15CBA1D8196EE66E005877BB /* CCActionInstant.o */,
15CBA1D9196EE66E005877BB /* CCActionInstant.o.d */,
15CBA1DA196EE66E005877BB /* CCActionInterval.o */,
15CBA1DB196EE66E005877BB /* CCActionInterval.o.d */,
15CBA1DC196EE66E005877BB /* CCActionManager.o */,
15CBA1DD196EE66E005877BB /* CCActionManager.o.d */,
15CBA1DE196EE66E005877BB /* CCActionPageTurn3D.o */,
15CBA1DF196EE66E005877BB /* CCActionPageTurn3D.o.d */,
15CBA1E0196EE66E005877BB /* CCActionProgressTimer.o */,
15CBA1E1196EE66E005877BB /* CCActionProgressTimer.o.d */,
15CBA1E2196EE66E005877BB /* CCActionTiledGrid.o */,
15CBA1E3196EE66E005877BB /* CCActionTiledGrid.o.d */,
15CBA1E4196EE66E005877BB /* CCActionTween.o */,
15CBA1E5196EE66E005877BB /* CCActionTween.o.d */,
15CBA1E6196EE66E005877BB /* CCAnimation.o */,
15CBA1E7196EE66E005877BB /* CCAnimation.o.d */,
15CBA1E8196EE66E005877BB /* CCAnimationCache.o */,
15CBA1E9196EE66E005877BB /* CCAnimationCache.o.d */,
15CBA1EA196EE66E005877BB /* CCAtlasNode.o */,
15CBA1EB196EE66E005877BB /* CCAtlasNode.o.d */,
15CBA1EC196EE66E005877BB /* CCClippingNode.o */,
15CBA1ED196EE66E005877BB /* CCClippingNode.o.d */,
15CBA1EE196EE66E005877BB /* CCComponent.o */,
15CBA1EF196EE66E005877BB /* CCComponent.o.d */,
15CBA1F0196EE66E005877BB /* CCComponentContainer.o */,
15CBA1F1196EE66E005877BB /* CCComponentContainer.o.d */,
15CBA1F2196EE66E005877BB /* CCDrawingPrimitives.o */,
15CBA1F3196EE66E005877BB /* CCDrawingPrimitives.o.d */,
15CBA1F4196EE66E005877BB /* CCDrawNode.o */,
15CBA1F5196EE66E005877BB /* CCDrawNode.o.d */,
15CBA1F6196EE66E005877BB /* CCFastTMXLayer.o */,
15CBA1F7196EE66E005877BB /* CCFastTMXLayer.o.d */,
15CBA1F8196EE66E005877BB /* CCFastTMXTiledMap.o */,
15CBA1F9196EE66E005877BB /* CCFastTMXTiledMap.o.d */,
15CBA1FA196EE66E005877BB /* CCFont.o */,
15CBA1FB196EE66E005877BB /* CCFont.o.d */,
15CBA1FC196EE66E005877BB /* CCFontAtlas.o */,
15CBA1FD196EE66E005877BB /* CCFontAtlas.o.d */,
15CBA1FE196EE66E005877BB /* CCFontAtlasCache.o */,
15CBA1FF196EE66E005877BB /* CCFontAtlasCache.o.d */,
15CBA200196EE66E005877BB /* CCFontCharMap.o */,
15CBA201196EE66E005877BB /* CCFontCharMap.o.d */,
15CBA202196EE66E005877BB /* CCFontFNT.o */,
15CBA203196EE66E005877BB /* CCFontFNT.o.d */,
15CBA204196EE66E005877BB /* CCFontFreeType.o */,
15CBA205196EE66E005877BB /* CCFontFreeType.o.d */,
15CBA206196EE66E005877BB /* CCGLBufferedNode.o */,
15CBA207196EE66E005877BB /* CCGLBufferedNode.o.d */,
15CBA208196EE66E005877BB /* CCGrabber.o */,
15CBA209196EE66E005877BB /* CCGrabber.o.d */,
15CBA20A196EE66E005877BB /* CCGrid.o */,
15CBA20B196EE66E005877BB /* CCGrid.o.d */,
15CBA20C196EE66E005877BB /* CCLabel.o */,
15CBA20D196EE66E005877BB /* CCLabel.o.d */,
15CBA20E196EE66E005877BB /* CCLabelAtlas.o */,
15CBA20F196EE66E005877BB /* CCLabelAtlas.o.d */,
15CBA210196EE66E005877BB /* CCLabelBMFont.o */,
15CBA211196EE66E005877BB /* CCLabelBMFont.o.d */,
15CBA212196EE66E005877BB /* CCLabelTextFormatter.o */,
15CBA213196EE66E005877BB /* CCLabelTextFormatter.o.d */,
15CBA214196EE66E005877BB /* CCLabelTTF.o */,
15CBA215196EE66E005877BB /* CCLabelTTF.o.d */,
15CBA216196EE66E005877BB /* CCLayer.o */,
15CBA217196EE66E005877BB /* CCLayer.o.d */,
15CBA218196EE66E005877BB /* CCMenu.o */,
15CBA219196EE66E005877BB /* CCMenu.o.d */,
15CBA21A196EE66E005877BB /* CCMenuItem.o */,
15CBA21B196EE66E005877BB /* CCMenuItem.o.d */,
15CBA21C196EE66E005877BB /* CCMotionStreak.o */,
15CBA21D196EE66E005877BB /* CCMotionStreak.o.d */,
15CBA21E196EE66E005877BB /* CCNode.o */,
15CBA21F196EE66E005877BB /* CCNode.o.d */,
15CBA220196EE66E005877BB /* CCNodeGrid.o */,
15CBA221196EE66E005877BB /* CCNodeGrid.o.d */,
15CBA222196EE66E005877BB /* CCParallaxNode.o */,
15CBA223196EE66E005877BB /* CCParallaxNode.o.d */,
15CBA224196EE66E005877BB /* CCParticleBatchNode.o */,
15CBA225196EE66E005877BB /* CCParticleBatchNode.o.d */,
15CBA226196EE66E005877BB /* CCParticleExamples.o */,
15CBA227196EE66E005877BB /* CCParticleExamples.o.d */,
15CBA228196EE66E005877BB /* CCParticleSystem.o */,
15CBA229196EE66E005877BB /* CCParticleSystem.o.d */,
15CBA22A196EE66E005877BB /* CCParticleSystemQuad.o */,
15CBA22B196EE66E005877BB /* CCParticleSystemQuad.o.d */,
15CBA22C196EE66E005877BB /* CCProgressTimer.o */,
15CBA22D196EE66E005877BB /* CCProgressTimer.o.d */,
15CBA22E196EE66E005877BB /* CCRenderTexture.o */,
15CBA22F196EE66E005877BB /* CCRenderTexture.o.d */,
15CBA230196EE66E005877BB /* CCScene.o */,
15CBA231196EE66E005877BB /* CCScene.o.d */,
15CBA232196EE66E005877BB /* CCSprite.o */,
15CBA233196EE66E005877BB /* CCSprite.o.d */,
15CBA234196EE66E005877BB /* CCSpriteBatchNode.o */,
15CBA235196EE66E005877BB /* CCSpriteBatchNode.o.d */,
15CBA236196EE66E005877BB /* CCSpriteFrame.o */,
15CBA237196EE66E005877BB /* CCSpriteFrame.o.d */,
15CBA238196EE66E005877BB /* CCSpriteFrameCache.o */,
15CBA239196EE66E005877BB /* CCSpriteFrameCache.o.d */,
15CBA23A196EE66E005877BB /* CCTextFieldTTF.o */,
15CBA23B196EE66E005877BB /* CCTextFieldTTF.o.d */,
15CBA23C196EE66E005877BB /* CCTileMapAtlas.o */,
15CBA23D196EE66E005877BB /* CCTileMapAtlas.o.d */,
15CBA23E196EE66E005877BB /* CCTMXLayer.o */,
15CBA23F196EE66E005877BB /* CCTMXLayer.o.d */,
15CBA240196EE66E005877BB /* CCTMXObjectGroup.o */,
15CBA241196EE66E005877BB /* CCTMXObjectGroup.o.d */,
15CBA242196EE66E005877BB /* CCTMXTiledMap.o */,
15CBA243196EE66E005877BB /* CCTMXTiledMap.o.d */,
15CBA244196EE66E005877BB /* CCTMXXMLParser.o */,
15CBA245196EE66E005877BB /* CCTMXXMLParser.o.d */,
15CBA246196EE66E005877BB /* CCTransition.o */,
15CBA247196EE66E005877BB /* CCTransition.o.d */,
15CBA248196EE66E005877BB /* CCTransitionPageTurn.o */,
15CBA249196EE66E005877BB /* CCTransitionPageTurn.o.d */,
15CBA24A196EE66E005877BB /* CCTransitionProgress.o */,
15CBA24B196EE66E005877BB /* CCTransitionProgress.o.d */,
15CBA24C196EE66F005877BB /* CCTweenFunction.o */,
15CBA24D196EE66F005877BB /* CCTweenFunction.o.d */,
);
path = 2d;
sourceTree = "<group>";
};
15CBA24E196EE66F005877BB /* 3d */ = {
isa = PBXGroup;
children = (
15CBA24F196EE66F005877BB /* CCAnimate3D.o */,
15CBA250196EE66F005877BB /* CCAnimate3D.o.d */,
15CBA251196EE66F005877BB /* CCAnimation3D.o */,
15CBA252196EE66F005877BB /* CCAnimation3D.o.d */,
15CBA253196EE66F005877BB /* CCBundle3D.o */,
15CBA254196EE66F005877BB /* CCBundle3D.o.d */,
15CBA255196EE66F005877BB /* CCBundleReader.o */,
15CBA256196EE66F005877BB /* CCBundleReader.o.d */,
15CBA257196EE66F005877BB /* CCMesh.o */,
15CBA258196EE66F005877BB /* CCMesh.o.d */,
15CBA259196EE66F005877BB /* CCMeshSkin.o */,
15CBA25A196EE66F005877BB /* CCMeshSkin.o.d */,
15CBA25B196EE66F005877BB /* CCObjLoader.o */,
15CBA25C196EE66F005877BB /* CCObjLoader.o.d */,
15CBA25D196EE66F005877BB /* CCSprite3D.o */,
15CBA25E196EE66F005877BB /* CCSprite3D.o.d */,
15CBA25F196EE66F005877BB /* CCSprite3DMaterial.o */,
15CBA260196EE66F005877BB /* CCSprite3DMaterial.o.d */,
);
path = 3d;
sourceTree = "<group>";
};
15CBA261196EE66F005877BB /* __ */ = {
isa = PBXGroup;
children = (
15CBA262196EE66F005877BB /* external */,
);
path = __;
sourceTree = "<group>";
};
15CBA262196EE66F005877BB /* external */ = {
isa = PBXGroup;
children = (
15CBA263196EE66F005877BB /* ConvertUTF */,
15CBA268196EE66F005877BB /* edtaa3func */,
15CBA26B196EE66F005877BB /* tinyxml2 */,
15CBA26E196EE66F005877BB /* unzip */,
15CBA273196EE66F005877BB /* xxhash */,
);
path = external;
sourceTree = "<group>";
};
15CBA263196EE66F005877BB /* ConvertUTF */ = {
isa = PBXGroup;
children = (
15CBA264196EE66F005877BB /* ConvertUTF.o */,
15CBA265196EE66F005877BB /* ConvertUTF.o.d */,
15CBA266196EE66F005877BB /* ConvertUTFWrapper.o */,
15CBA267196EE66F005877BB /* ConvertUTFWrapper.o.d */,
);
path = ConvertUTF;
sourceTree = "<group>";
};
15CBA268196EE66F005877BB /* edtaa3func */ = {
isa = PBXGroup;
children = (
15CBA269196EE66F005877BB /* edtaa3func.o */,
15CBA26A196EE66F005877BB /* edtaa3func.o.d */,
);
path = edtaa3func;
sourceTree = "<group>";
};
15CBA26B196EE66F005877BB /* tinyxml2 */ = {
isa = PBXGroup;
children = (
15CBA26C196EE66F005877BB /* tinyxml2.o */,
15CBA26D196EE66F005877BB /* tinyxml2.o.d */,
);
path = tinyxml2;
sourceTree = "<group>";
};
15CBA26E196EE66F005877BB /* unzip */ = {
isa = PBXGroup;
children = (
15CBA26F196EE66F005877BB /* ioapi.o */,
15CBA270196EE66F005877BB /* ioapi.o.d */,
15CBA271196EE66F005877BB /* unzip.o */,
15CBA272196EE66F005877BB /* unzip.o.d */,
);
path = unzip;
sourceTree = "<group>";
};
15CBA273196EE66F005877BB /* xxhash */ = {
isa = PBXGroup;
children = (
15CBA274196EE66F005877BB /* xxhash.o */,
15CBA275196EE66F005877BB /* xxhash.o.d */,
);
path = xxhash;
sourceTree = "<group>";
};
15CBA276196EE66F005877BB /* base */ = {
isa = PBXGroup;
children = (
15CBA277196EE66F005877BB /* atitc.o */,
15CBA278196EE66F005877BB /* atitc.o.d */,
15CBA279196EE66F005877BB /* base64.o */,
15CBA27A196EE66F005877BB /* base64.o.d */,
15CBA27B196EE66F005877BB /* CCAutoreleasePool.o */,
15CBA27C196EE66F005877BB /* CCAutoreleasePool.o.d */,
15CBA27D196EE66F005877BB /* ccCArray.o */,
15CBA27E196EE66F005877BB /* ccCArray.o.d */,
15CBA27F196EE66F005877BB /* CCConfiguration.o */,
15CBA280196EE66F005877BB /* CCConfiguration.o.d */,
15CBA281196EE66F005877BB /* CCConsole.o */,
15CBA282196EE66F005877BB /* CCConsole.o.d */,
15CBA283196EE66F005877BB /* CCController-android.o */,
15CBA284196EE66F005877BB /* CCController-android.o.d */,
15CBA285196EE66F005877BB /* CCController.o */,
15CBA286196EE66F005877BB /* CCController.o.d */,
15CBA287196EE66F005877BB /* CCData.o */,
15CBA288196EE66F005877BB /* CCData.o.d */,
15CBA289196EE66F005877BB /* CCDataVisitor.o */,
15CBA28A196EE66F005877BB /* CCDataVisitor.o.d */,
15CBA28B196EE66F005877BB /* CCDirector.o */,
15CBA28C196EE66F005877BB /* CCDirector.o.d */,
15CBA28D196EE66F005877BB /* CCEvent.o */,
15CBA28E196EE66F005877BB /* CCEvent.o.d */,
15CBA28F196EE66F005877BB /* CCEventAcceleration.o */,
15CBA290196EE66F005877BB /* CCEventAcceleration.o.d */,
15CBA291196EE66F005877BB /* CCEventController.o */,
15CBA292196EE66F005877BB /* CCEventController.o.d */,
15CBA293196EE66F005877BB /* CCEventCustom.o */,
15CBA294196EE66F005877BB /* CCEventCustom.o.d */,
15CBA295196EE66F005877BB /* CCEventDispatcher.o */,
15CBA296196EE66F005877BB /* CCEventDispatcher.o.d */,
15CBA297196EE66F005877BB /* CCEventFocus.o */,
15CBA298196EE66F005877BB /* CCEventFocus.o.d */,
15CBA299196EE66F005877BB /* CCEventKeyboard.o */,
15CBA29A196EE66F005877BB /* CCEventKeyboard.o.d */,
15CBA29B196EE66F005877BB /* CCEventListener.o */,
15CBA29C196EE66F005877BB /* CCEventListener.o.d */,
15CBA29D196EE66F005877BB /* CCEventListenerAcceleration.o */,
15CBA29E196EE66F005877BB /* CCEventListenerAcceleration.o.d */,
15CBA29F196EE66F005877BB /* CCEventListenerController.o */,
15CBA2A0196EE66F005877BB /* CCEventListenerController.o.d */,
15CBA2A1196EE66F005877BB /* CCEventListenerCustom.o */,
15CBA2A2196EE66F005877BB /* CCEventListenerCustom.o.d */,
15CBA2A3196EE66F005877BB /* CCEventListenerFocus.o */,
15CBA2A4196EE66F005877BB /* CCEventListenerFocus.o.d */,
15CBA2A5196EE66F005877BB /* CCEventListenerKeyboard.o */,
15CBA2A6196EE66F005877BB /* CCEventListenerKeyboard.o.d */,
15CBA2A7196EE66F005877BB /* CCEventListenerMouse.o */,
15CBA2A8196EE66F005877BB /* CCEventListenerMouse.o.d */,
15CBA2A9196EE66F005877BB /* CCEventListenerTouch.o */,
15CBA2AA196EE66F005877BB /* CCEventListenerTouch.o.d */,
15CBA2AB196EE66F005877BB /* CCEventMouse.o */,
15CBA2AC196EE66F005877BB /* CCEventMouse.o.d */,
15CBA2AD196EE66F005877BB /* CCEventTouch.o */,
15CBA2AE196EE66F005877BB /* CCEventTouch.o.d */,
15CBA2AF196EE66F005877BB /* ccFPSImages.o */,
15CBA2B0196EE66F005877BB /* ccFPSImages.o.d */,
15CBA2B1196EE66F005877BB /* CCIMEDispatcher.o */,
15CBA2B2196EE66F005877BB /* CCIMEDispatcher.o.d */,
15CBA2B3196EE66F005877BB /* CCNS.o */,
15CBA2B4196EE66F005877BB /* CCNS.o.d */,
15CBA2B5196EE66F005877BB /* CCProfiling.o */,
15CBA2B6196EE66F005877BB /* CCProfiling.o.d */,
15CBA2B7196EE66F005877BB /* CCRef.o */,
15CBA2B8196EE66F005877BB /* CCRef.o.d */,
15CBA2B9196EE66F005877BB /* CCScheduler.o */,
15CBA2BA196EE66F005877BB /* CCScheduler.o.d */,
15CBA2BB196EE66F005877BB /* CCScriptSupport.o */,
15CBA2BC196EE66F005877BB /* CCScriptSupport.o.d */,
15CBA2BD196EE66F005877BB /* CCTouch.o */,
15CBA2BE196EE66F005877BB /* CCTouch.o.d */,
15CBA2BF196EE66F005877BB /* ccTypes.o */,
15CBA2C0196EE66F005877BB /* ccTypes.o.d */,
15CBA2C1196EE66F005877BB /* CCUserDefault.o */,
15CBA2C2196EE66F005877BB /* CCUserDefault.o.d */,
15CBA2C3196EE66F005877BB /* CCUserDefaultAndroid.o */,
15CBA2C4196EE66F005877BB /* CCUserDefaultAndroid.o.d */,
15CBA2C5196EE66F005877BB /* ccUTF8.o */,
15CBA2C6196EE66F005877BB /* ccUTF8.o.d */,
15CBA2C7196EE66F005877BB /* ccUtils.o */,
15CBA2C8196EE66F005877BB /* ccUtils.o.d */,
15CBA2C9196EE66F005877BB /* CCValue.o */,
15CBA2CA196EE66F005877BB /* CCValue.o.d */,
15CBA2CB196EE66F005877BB /* etc1.o */,
15CBA2CC196EE66F005877BB /* etc1.o.d */,
15CBA2CD196EE66F005877BB /* ObjectFactory.o */,
15CBA2CE196EE66F005877BB /* ObjectFactory.o.d */,
15CBA2CF196EE66F005877BB /* s3tc.o */,
15CBA2D0196EE66F005877BB /* s3tc.o.d */,
15CBA2D1196EE66F005877BB /* TGAlib.o */,
15CBA2D2196EE66F005877BB /* TGAlib.o.d */,
15CBA2D3196EE66F005877BB /* ZipUtils.o */,
15CBA2D4196EE66F005877BB /* ZipUtils.o.d */,
);
path = base;
sourceTree = "<group>";
};
15CBA2D7196EE66F005877BB /* deprecated */ = {
isa = PBXGroup;
children = (
15CBA2D8196EE66F005877BB /* CCArray.o */,
15CBA2D9196EE66F005877BB /* CCArray.o.d */,
15CBA2DA196EE66F005877BB /* CCDeprecated.o */,
15CBA2DB196EE66F005877BB /* CCDeprecated.o.d */,
15CBA2DC196EE66F005877BB /* CCDictionary.o */,
15CBA2DD196EE66F005877BB /* CCDictionary.o.d */,
15CBA2DE196EE66F005877BB /* CCNotificationCenter.o */,
15CBA2DF196EE66F005877BB /* CCNotificationCenter.o.d */,
15CBA2E0196EE66F005877BB /* CCSet.o */,
15CBA2E1196EE66F005877BB /* CCSet.o.d */,
15CBA2E2196EE66F005877BB /* CCString.o */,
15CBA2E3196EE66F005877BB /* CCString.o.d */,
);
path = deprecated;
sourceTree = "<group>";
};
15CBA2E4196EE66F005877BB /* math */ = {
isa = PBXGroup;
children = (
15CBA2E5196EE66F005877BB /* CCAffineTransform.o */,
15CBA2E6196EE66F005877BB /* CCAffineTransform.o.d */,
15CBA2E7196EE66F005877BB /* CCGeometry.o */,
15CBA2E8196EE66F005877BB /* CCGeometry.o.d */,
15CBA2E9196EE66F005877BB /* CCVertex.o */,
15CBA2EA196EE66F005877BB /* CCVertex.o.d */,
15CBA2EB196EE66F005877BB /* Mat4.o */,
15CBA2EC196EE66F005877BB /* Mat4.o.d */,
15CBA2ED196EE66F005877BB /* MathUtil.o */,
15CBA2EE196EE66F005877BB /* MathUtil.o.d */,
15CBA2EF196EE66F005877BB /* Quaternion.o */,
15CBA2F0196EE66F005877BB /* Quaternion.o.d */,
15CBA2F1196EE66F005877BB /* TransformUtils.o */,
15CBA2F2196EE66F005877BB /* TransformUtils.o.d */,
15CBA2F3196EE66F005877BB /* Vec2.o */,
15CBA2F4196EE66F005877BB /* Vec2.o.d */,
15CBA2F5196EE66F005877BB /* Vec3.o */,
15CBA2F6196EE66F005877BB /* Vec3.o.d */,
15CBA2F7196EE66F005877BB /* Vec4.o */,
15CBA2F8196EE66F005877BB /* Vec4.o.d */,
);
path = math;
sourceTree = "<group>";
};
15CBA2F9196EE66F005877BB /* physics */ = {
isa = PBXGroup;
children = (
15CBA2FA196EE66F005877BB /* CCPhysicsBody.o */,
15CBA2FB196EE66F005877BB /* CCPhysicsBody.o.d */,
15CBA2FC196EE66F005877BB /* CCPhysicsContact.o */,
15CBA2FD196EE66F005877BB /* CCPhysicsContact.o.d */,
15CBA2FE196EE66F005877BB /* CCPhysicsJoint.o */,
15CBA2FF196EE66F005877BB /* CCPhysicsJoint.o.d */,
15CBA300196EE66F005877BB /* CCPhysicsShape.o */,
15CBA301196EE66F005877BB /* CCPhysicsShape.o.d */,
15CBA302196EE66F005877BB /* CCPhysicsWorld.o */,
15CBA303196EE66F005877BB /* CCPhysicsWorld.o.d */,
15CBA304196EE66F005877BB /* chipmunk */,
);
path = physics;
sourceTree = "<group>";
};
15CBA304196EE66F005877BB /* chipmunk */ = {
isa = PBXGroup;
children = (
15CBA305196EE66F005877BB /* CCPhysicsBodyInfo_chipmunk.o */,
15CBA306196EE66F005877BB /* CCPhysicsBodyInfo_chipmunk.o.d */,
15CBA307196EE66F005877BB /* CCPhysicsContactInfo_chipmunk.o */,
15CBA308196EE66F005877BB /* CCPhysicsContactInfo_chipmunk.o.d */,
15CBA309196EE66F005877BB /* CCPhysicsJointInfo_chipmunk.o */,
15CBA30A196EE66F005877BB /* CCPhysicsJointInfo_chipmunk.o.d */,
15CBA30B196EE66F005877BB /* CCPhysicsShapeInfo_chipmunk.o */,
15CBA30C196EE66F005877BB /* CCPhysicsShapeInfo_chipmunk.o.d */,
15CBA30D196EE66F005877BB /* CCPhysicsWorldInfo_chipmunk.o */,
15CBA30E196EE66F005877BB /* CCPhysicsWorldInfo_chipmunk.o.d */,
);
path = chipmunk;
sourceTree = "<group>";
};
15CBA30F196EE66F005877BB /* platform */ = {
isa = PBXGroup;
children = (
15CBA310196EE66F005877BB /* CCFileUtils.o */,
15CBA311196EE66F005877BB /* CCFileUtils.o.d */,
15CBA312196EE66F005877BB /* CCGLViewProtocol.o */,
15CBA313196EE66F005877BB /* CCGLViewProtocol.o.d */,
15CBA314196EE66F005877BB /* CCImage.o */,
15CBA315196EE66F005877BB /* CCImage.o.d */,
15CBA316196EE66F005877BB /* CCSAXParser.o */,
15CBA317196EE66F005877BB /* CCSAXParser.o.d */,
15CBA318196EE66F005877BB /* CCThread.o */,
15CBA319196EE66F005877BB /* CCThread.o.d */,
);
path = platform;
sourceTree = "<group>";
};
15CBA31A196EE66F005877BB /* renderer */ = {
isa = PBXGroup;
children = (
15CBA31B196EE66F005877BB /* CCBatchCommand.o */,
15CBA31C196EE66F005877BB /* CCBatchCommand.o.d */,
15CBA31D196EE66F005877BB /* CCCustomCommand.o */,
15CBA31E196EE66F005877BB /* CCCustomCommand.o.d */,
15CBA31F196EE66F005877BB /* CCGLProgram.o */,
15CBA320196EE66F005877BB /* CCGLProgram.o.d */,
15CBA321196EE66F005877BB /* CCGLProgramCache.o */,
15CBA322196EE66F005877BB /* CCGLProgramCache.o.d */,
15CBA323196EE66F005877BB /* CCGLProgramState.o */,
15CBA324196EE66F005877BB /* CCGLProgramState.o.d */,
15CBA325196EE66F005877BB /* CCGLProgramStateCache.o */,
15CBA326196EE66F005877BB /* CCGLProgramStateCache.o.d */,
15CBA327196EE66F005877BB /* ccGLStateCache.o */,
15CBA328196EE66F005877BB /* ccGLStateCache.o.d */,
15CBA329196EE66F005877BB /* CCGroupCommand.o */,
15CBA32A196EE66F005877BB /* CCGroupCommand.o.d */,
15CBA32B196EE66F005877BB /* CCMeshCommand.o */,
15CBA32C196EE66F005877BB /* CCMeshCommand.o.d */,
15CBA32D196EE66F005877BB /* CCQuadCommand.o */,
15CBA32E196EE66F005877BB /* CCQuadCommand.o.d */,
15CBA32F196EE66F005877BB /* CCRenderCommand.o */,
15CBA330196EE66F005877BB /* CCRenderCommand.o.d */,
15CBA331196EE66F005877BB /* CCRenderer.o */,
15CBA332196EE66F005877BB /* CCRenderer.o.d */,
15CBA333196EE66F005877BB /* ccShaders.o */,
15CBA334196EE66F005877BB /* ccShaders.o.d */,
15CBA335196EE66F005877BB /* CCTexture2D.o */,
15CBA336196EE66F005877BB /* CCTexture2D.o.d */,
15CBA337196EE66F005877BB /* CCTextureAtlas.o */,
15CBA338196EE66F005877BB /* CCTextureAtlas.o.d */,
15CBA339196EE66F005877BB /* CCTextureCache.o */,
15CBA33A196EE66F005877BB /* CCTextureCache.o.d */,
);
path = renderer;
sourceTree = "<group>";
};
15CBA33B196EE66F005877BB /* cocos2dxandroid_static */ = {
isa = PBXGroup;
children = (
15CBA33C196EE66F005877BB /* CCApplication.o */,
15CBA33D196EE66F005877BB /* CCApplication.o.d */,
15CBA33E196EE66F005877BB /* CCCommon.o */,
15CBA33F196EE66F005877BB /* CCCommon.o.d */,
15CBA340196EE66F005877BB /* CCDevice.o */,
15CBA341196EE66F005877BB /* CCDevice.o.d */,
15CBA342196EE66F005877BB /* CCFileUtilsAndroid.o */,
15CBA343196EE66F005877BB /* CCFileUtilsAndroid.o.d */,
15CBA344196EE66F005877BB /* CCGLView.o */,
15CBA345196EE66F005877BB /* CCGLView.o.d */,
15CBA346196EE66F005877BB /* javaactivity.o */,
15CBA347196EE66F005877BB /* javaactivity.o.d */,
15CBA348196EE66F005877BB /* jni */,
);
path = cocos2dxandroid_static;
sourceTree = "<group>";
};
15CBA348196EE66F005877BB /* jni */ = {
isa = PBXGroup;
children = (
15CBA349196EE66F005877BB /* DPIJni.o */,
15CBA34A196EE66F005877BB /* DPIJni.o.d */,
15CBA34B196EE66F005877BB /* IMEJni.o */,
15CBA34C196EE66F005877BB /* IMEJni.o.d */,
15CBA34D196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxAccelerometer.o */,
15CBA34E196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxAccelerometer.o.d */,
15CBA34F196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxBitmap.o */,
15CBA350196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxBitmap.o.d */,
15CBA351196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxHelper.o */,
15CBA352196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxHelper.o.d */,
15CBA353196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxRenderer.o */,
15CBA354196EE66F005877BB /* Java_org_cocos2dx_lib_Cocos2dxRenderer.o.d */,
15CBA355196EE66F005877BB /* JniHelper.o */,
15CBA356196EE66F005877BB /* JniHelper.o.d */,
15CBA357196EE66F005877BB /* TouchesJni.o */,
15CBA358196EE66F005877BB /* TouchesJni.o.d */,
);
path = jni;
sourceTree = "<group>";
};
15CBA359196EE66F005877BB /* cocos_extension_static */ = {
isa = PBXGroup;
children = (
15CBA35A196EE66F005877BB /* assets-manager */,
15CBA35D196EE66F005877BB /* GUI */,
15CBA387196EE66F005877BB /* physics-nodes */,
);
path = cocos_extension_static;
sourceTree = "<group>";
};
15CBA35A196EE66F005877BB /* assets-manager */ = {
isa = PBXGroup;
children = (
15CBA35B196EE66F005877BB /* AssetsManager.o */,
15CBA35C196EE66F005877BB /* AssetsManager.o.d */,
);
path = "assets-manager";
sourceTree = "<group>";
};
15CBA35D196EE66F005877BB /* GUI */ = {
isa = PBXGroup;
children = (
15CBA35E196EE66F005877BB /* CCControlExtension */,
15CBA377196EE66F005877BB /* CCEditBox */,
15CBA380196EE66F005877BB /* CCScrollView */,
);
path = GUI;
sourceTree = "<group>";
};
15CBA35E196EE66F005877BB /* CCControlExtension */ = {
isa = PBXGroup;
children = (
15CBA35F196EE66F005877BB /* CCControl.o */,
15CBA360196EE66F005877BB /* CCControl.o.d */,
15CBA361196EE66F005877BB /* CCControlButton.o */,
15CBA362196EE66F005877BB /* CCControlButton.o.d */,
15CBA363196EE66F005877BB /* CCControlColourPicker.o */,
15CBA364196EE66F005877BB /* CCControlColourPicker.o.d */,
15CBA365196EE66F005877BB /* CCControlHuePicker.o */,
15CBA366196EE66F005877BB /* CCControlHuePicker.o.d */,
15CBA367196EE66F005877BB /* CCControlPotentiometer.o */,
15CBA368196EE66F005877BB /* CCControlPotentiometer.o.d */,
15CBA369196EE66F005877BB /* CCControlSaturationBrightnessPicker.o */,
15CBA36A196EE66F005877BB /* CCControlSaturationBrightnessPicker.o.d */,
15CBA36B196EE66F005877BB /* CCControlSlider.o */,
15CBA36C196EE66F005877BB /* CCControlSlider.o.d */,
15CBA36D196EE66F005877BB /* CCControlStepper.o */,
15CBA36E196EE66F005877BB /* CCControlStepper.o.d */,
15CBA36F196EE66F005877BB /* CCControlSwitch.o */,
15CBA370196EE66F005877BB /* CCControlSwitch.o.d */,
15CBA371196EE66F005877BB /* CCControlUtils.o */,
15CBA372196EE66F005877BB /* CCControlUtils.o.d */,
15CBA373196EE66F005877BB /* CCInvocation.o */,
15CBA374196EE66F005877BB /* CCInvocation.o.d */,
15CBA375196EE66F005877BB /* CCScale9Sprite.o */,
15CBA376196EE66F005877BB /* CCScale9Sprite.o.d */,
);
path = CCControlExtension;
sourceTree = "<group>";
};
15CBA377196EE66F005877BB /* CCEditBox */ = {
isa = PBXGroup;
children = (
15CBA378196EE66F005877BB /* CCEditBox.o */,
15CBA379196EE66F005877BB /* CCEditBox.o.d */,
15CBA37A196EE66F005877BB /* CCEditBoxImplAndroid.o */,
15CBA37B196EE66F005877BB /* CCEditBoxImplAndroid.o.d */,
15CBA37C196EE66F005877BB /* CCEditBoxImplNone.o */,
15CBA37D196EE66F005877BB /* CCEditBoxImplNone.o.d */,
15CBA37E196EE66F005877BB /* CCEditBoxImplWin.o */,
15CBA37F196EE66F005877BB /* CCEditBoxImplWin.o.d */,
);
path = CCEditBox;
sourceTree = "<group>";
};
15CBA380196EE66F005877BB /* CCScrollView */ = {
isa = PBXGroup;
children = (
15CBA381196EE66F005877BB /* CCScrollView.o */,
15CBA382196EE66F005877BB /* CCScrollView.o.d */,
15CBA383196EE66F005877BB /* CCTableView.o */,
15CBA384196EE66F005877BB /* CCTableView.o.d */,
15CBA385196EE66F005877BB /* CCTableViewCell.o */,
15CBA386196EE66F005877BB /* CCTableViewCell.o.d */,
);
path = CCScrollView;
sourceTree = "<group>";
};
15CBA387196EE66F005877BB /* physics-nodes */ = {
isa = PBXGroup;
children = (
15CBA388196EE66F005877BB /* CCPhysicsDebugNode.o */,
15CBA389196EE66F005877BB /* CCPhysicsDebugNode.o.d */,
15CBA38A196EE66F005877BB /* CCPhysicsSprite.o */,
15CBA38B196EE66F005877BB /* CCPhysicsSprite.o.d */,
);
path = "physics-nodes";
sourceTree = "<group>";
};
15CBA38C196EE66F005877BB /* cocos_lua_static */ = {
isa = PBXGroup;
children = (
15CBA38D196EE66F005877BB /* __ */,
15CBA3BF196EE670005877BB /* auto */,
15CBA3CE196EE670005877BB /* manual */,
);
path = cocos_lua_static;
sourceTree = "<group>";
};
15CBA38D196EE66F005877BB /* __ */ = {
isa = PBXGroup;
children = (
15CBA38E196EE66F005877BB /* __ */,
);
path = __;
sourceTree = "<group>";
};
15CBA38E196EE66F005877BB /* __ */ = {
isa = PBXGroup;
children = (
15CBA38F196EE66F005877BB /* __ */,
);
path = __;
sourceTree = "<group>";
};
15CBA38F196EE66F005877BB /* __ */ = {
isa = PBXGroup;
children = (
15CBA390196EE66F005877BB /* external */,
);
path = __;
sourceTree = "<group>";
};
15CBA390196EE66F005877BB /* external */ = {
isa = PBXGroup;
children = (
15CBA391196EE66F005877BB /* lua */,
15CBA3BC196EE670005877BB /* xxtea */,
);
path = external;
sourceTree = "<group>";
};
15CBA391196EE66F005877BB /* lua */ = {
isa = PBXGroup;
children = (
15CBA392196EE66F005877BB /* luasocket */,
15CBA3B1196EE670005877BB /* tolua */,
);
path = lua;
sourceTree = "<group>";
};
15CBA392196EE66F005877BB /* luasocket */ = {
isa = PBXGroup;
children = (
15CBA393196EE66F005877BB /* auxiliar.o */,
15CBA394196EE670005877BB /* auxiliar.o.d */,
15CBA395196EE670005877BB /* buffer.o */,
15CBA396196EE670005877BB /* buffer.o.d */,
15CBA397196EE670005877BB /* except.o */,
15CBA398196EE670005877BB /* except.o.d */,
15CBA399196EE670005877BB /* inet.o */,
15CBA39A196EE670005877BB /* inet.o.d */,
15CBA39B196EE670005877BB /* io.o */,
15CBA39C196EE670005877BB /* io.o.d */,
15CBA39D196EE670005877BB /* luasocket.o */,
15CBA39E196EE670005877BB /* luasocket.o.d */,
15CBA39F196EE670005877BB /* mime.o */,
15CBA3A0196EE670005877BB /* mime.o.d */,
15CBA3A1196EE670005877BB /* options.o */,
15CBA3A2196EE670005877BB /* options.o.d */,
15CBA3A3196EE670005877BB /* select.o */,
15CBA3A4196EE670005877BB /* select.o.d */,
15CBA3A5196EE670005877BB /* serial.o */,
15CBA3A6196EE670005877BB /* serial.o.d */,
15CBA3A7196EE670005877BB /* tcp.o */,
15CBA3A8196EE670005877BB /* tcp.o.d */,
15CBA3A9196EE670005877BB /* timeout.o */,
15CBA3AA196EE670005877BB /* timeout.o.d */,
15CBA3AB196EE670005877BB /* udp.o */,
15CBA3AC196EE670005877BB /* udp.o.d */,
15CBA3AD196EE670005877BB /* unix.o */,
15CBA3AE196EE670005877BB /* unix.o.d */,
15CBA3AF196EE670005877BB /* usocket.o */,
15CBA3B0196EE670005877BB /* usocket.o.d */,
);
path = luasocket;
sourceTree = "<group>";
};
15CBA3B1196EE670005877BB /* tolua */ = {
isa = PBXGroup;
children = (
15CBA3B2196EE670005877BB /* tolua_event.o */,
15CBA3B3196EE670005877BB /* tolua_event.o.d */,
15CBA3B4196EE670005877BB /* tolua_is.o */,
15CBA3B5196EE670005877BB /* tolua_is.o.d */,
15CBA3B6196EE670005877BB /* tolua_map.o */,
15CBA3B7196EE670005877BB /* tolua_map.o.d */,
15CBA3B8196EE670005877BB /* tolua_push.o */,
15CBA3B9196EE670005877BB /* tolua_push.o.d */,
15CBA3BA196EE670005877BB /* tolua_to.o */,
15CBA3BB196EE670005877BB /* tolua_to.o.d */,
);
path = tolua;
sourceTree = "<group>";
};
15CBA3BC196EE670005877BB /* xxtea */ = {
isa = PBXGroup;
children = (
15CBA3BD196EE670005877BB /* xxtea.o */,
15CBA3BE196EE670005877BB /* xxtea.o.d */,
);
path = xxtea;
sourceTree = "<group>";
};
15CBA3BF196EE670005877BB /* auto */ = {
isa = PBXGroup;
children = (
15CBA3C0196EE670005877BB /* lua_cocos2dx_auto.o */,
15CBA3C1196EE670005877BB /* lua_cocos2dx_auto.o.d */,
15CBA3C2196EE670005877BB /* lua_cocos2dx_controller_auto.o */,
15CBA3C3196EE670005877BB /* lua_cocos2dx_controller_auto.o.d */,
15CBA3C4196EE670005877BB /* lua_cocos2dx_extension_auto.o */,
15CBA3C5196EE670005877BB /* lua_cocos2dx_extension_auto.o.d */,
15CBA3C6196EE670005877BB /* lua_cocos2dx_physics_auto.o */,
15CBA3C7196EE670005877BB /* lua_cocos2dx_physics_auto.o.d */,
15CBA3C8196EE670005877BB /* lua_cocos2dx_spine_auto.o */,
15CBA3C9196EE670005877BB /* lua_cocos2dx_spine_auto.o.d */,
15CBA3CA196EE670005877BB /* lua_cocos2dx_studio_auto.o */,
15CBA3CB196EE670005877BB /* lua_cocos2dx_studio_auto.o.d */,
15CBA3CC196EE670005877BB /* lua_cocos2dx_ui_auto.o */,
15CBA3CD196EE670005877BB /* lua_cocos2dx_ui_auto.o.d */,
);
path = auto;
sourceTree = "<group>";
};
15CBA3CE196EE670005877BB /* manual */ = {
isa = PBXGroup;
children = (
15CBA3CF196EE670005877BB /* CCBProxy.o */,
15CBA3D0196EE670005877BB /* CCBProxy.o.d */,
15CBA3D1196EE670005877BB /* CCLuaBridge.o */,
15CBA3D2196EE670005877BB /* CCLuaBridge.o.d */,
15CBA3D3196EE670005877BB /* CCLuaEngine.o */,
15CBA3D4196EE670005877BB /* CCLuaEngine.o.d */,
15CBA3D5196EE670005877BB /* CCLuaStack.o */,
15CBA3D6196EE670005877BB /* CCLuaStack.o.d */,
15CBA3D7196EE670005877BB /* CCLuaValue.o */,
15CBA3D8196EE670005877BB /* CCLuaValue.o.d */,
15CBA3D9196EE670005877BB /* Cocos2dxLuaLoader.o */,
15CBA3DA196EE670005877BB /* Cocos2dxLuaLoader.o.d */,
15CBA3DB196EE670005877BB /* lua_cocos2dx_coco_studio_manual.o */,
15CBA3DC196EE670005877BB /* lua_cocos2dx_coco_studio_manual.o.d */,
15CBA3DD196EE670005877BB /* lua_cocos2dx_controller_manual.o */,
15CBA3DE196EE670005877BB /* lua_cocos2dx_controller_manual.o.d */,
15CBA3DF196EE670005877BB /* lua_cocos2dx_deprecated.o */,
15CBA3E0196EE670005877BB /* lua_cocos2dx_deprecated.o.d */,
15CBA3E1196EE670005877BB /* lua_cocos2dx_extension_manual.o */,
15CBA3E2196EE670005877BB /* lua_cocos2dx_extension_manual.o.d */,
15CBA3E3196EE670005877BB /* lua_cocos2dx_manual.o */,
15CBA3E4196EE670005877BB /* lua_cocos2dx_manual.o.d */,
15CBA3E5196EE670005877BB /* lua_cocos2dx_physics_manual.o */,
15CBA3E6196EE670005877BB /* lua_cocos2dx_physics_manual.o.d */,
15CBA3E7196EE670005877BB /* lua_cocos2dx_spine_manual.o */,
15CBA3E8196EE670005877BB /* lua_cocos2dx_spine_manual.o.d */,
15CBA3E9196EE670005877BB /* lua_cocos2dx_ui_manual.o */,
15CBA3EA196EE670005877BB /* lua_cocos2dx_ui_manual.o.d */,
15CBA3EB196EE670005877BB /* lua_debugger.o */,
15CBA3EC196EE670005877BB /* lua_debugger.o.d */,
15CBA3ED196EE670005877BB /* lua_extensions.o */,
15CBA3EE196EE670005877BB /* lua_extensions.o.d */,
15CBA3EF196EE670005877BB /* Lua_web_socket.o */,
15CBA3F0196EE670005877BB /* Lua_web_socket.o.d */,
15CBA3F1196EE670005877BB /* lua_xml_http_request.o */,
15CBA3F2196EE670005877BB /* lua_xml_http_request.o.d */,
15CBA3F3196EE670005877BB /* LuaBasicConversions.o */,
15CBA3F4196EE670005877BB /* LuaBasicConversions.o.d */,
15CBA3F5196EE670005877BB /* LuaOpengl.o */,
15CBA3F6196EE670005877BB /* LuaOpengl.o.d */,
15CBA3F7196EE670005877BB /* LuaScriptHandlerMgr.o */,
15CBA3F8196EE670005877BB /* LuaScriptHandlerMgr.o.d */,
15CBA3F9196EE670005877BB /* LuaSkeletonAnimation.o */,
15CBA3FA196EE670005877BB /* LuaSkeletonAnimation.o.d */,
15CBA3FB196EE670005877BB /* platform */,
15CBA402196EE670005877BB /* tolua_fix.o */,
15CBA403196EE670005877BB /* tolua_fix.o.d */,
);
path = manual;
sourceTree = "<group>";
};
15CBA3FB196EE670005877BB /* platform */ = {
isa = PBXGroup;
children = (
15CBA3FC196EE670005877BB /* android */,
);
path = platform;
sourceTree = "<group>";
};
15CBA3FC196EE670005877BB /* android */ = {
isa = PBXGroup;
children = (
15CBA3FD196EE670005877BB /* CCLuaJavaBridge.o */,
15CBA3FE196EE670005877BB /* CCLuaJavaBridge.o.d */,
15CBA3FF196EE670005877BB /* jni */,
);
path = android;
sourceTree = "<group>";
};
15CBA3FF196EE670005877BB /* jni */ = {
isa = PBXGroup;
children = (
15CBA400196EE670005877BB /* Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.o */,
15CBA401196EE670005877BB /* Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.o.d */,
);
path = jni;
sourceTree = "<group>";
};
15CBA404196EE670005877BB /* cocos_network_static */ = {
isa = PBXGroup;
children = (
15CBA405196EE670005877BB /* HttpClient.o */,
15CBA406196EE670005877BB /* HttpClient.o.d */,
15CBA407196EE670005877BB /* SocketIO.o */,
15CBA408196EE670005877BB /* SocketIO.o.d */,
15CBA409196EE670005877BB /* WebSocket.o */,
15CBA40A196EE670005877BB /* WebSocket.o.d */,
);
path = cocos_network_static;
sourceTree = "<group>";
};
15CBA40B196EE670005877BB /* cocos_ui_static */ = {
isa = PBXGroup;
children = (
15CBA40C196EE670005877BB /* CCProtectedNode.o */,
15CBA40D196EE670005877BB /* CCProtectedNode.o.d */,
15CBA40E196EE670005877BB /* CocosGUI.o */,
15CBA40F196EE670005877BB /* CocosGUI.o.d */,
15CBA410196EE670005877BB /* UIButton.o */,
15CBA411196EE670005877BB /* UIButton.o.d */,
15CBA412196EE670005877BB /* UICheckBox.o */,
15CBA413196EE670005877BB /* UICheckBox.o.d */,
15CBA414196EE670005877BB /* UIDeprecated.o */,
15CBA415196EE670005877BB /* UIDeprecated.o.d */,
15CBA416196EE670005877BB /* UIHBox.o */,
15CBA417196EE670005877BB /* UIHBox.o.d */,
15CBA418196EE670005877BB /* UIHelper.o */,
15CBA419196EE670005877BB /* UIHelper.o.d */,
15CBA41A196EE670005877BB /* UIImageView.o */,
15CBA41B196EE670005877BB /* UIImageView.o.d */,
15CBA41C196EE670005877BB /* UILayout.o */,
15CBA41D196EE670005877BB /* UILayout.o.d */,
15CBA41E196EE670005877BB /* UILayoutManager.o */,
15CBA41F196EE670005877BB /* UILayoutManager.o.d */,
15CBA420196EE670005877BB /* UILayoutParameter.o */,
15CBA421196EE670005877BB /* UILayoutParameter.o.d */,
15CBA422196EE670005877BB /* UIListView.o */,
15CBA423196EE670005877BB /* UIListView.o.d */,
15CBA424196EE670005877BB /* UILoadingBar.o */,
15CBA425196EE670005877BB /* UILoadingBar.o.d */,
15CBA426196EE670005877BB /* UIPageView.o */,
15CBA427196EE670005877BB /* UIPageView.o.d */,
15CBA428196EE670005877BB /* UIRelativeBox.o */,
15CBA429196EE670005877BB /* UIRelativeBox.o.d */,
15CBA42A196EE670005877BB /* UIRichText.o */,
15CBA42B196EE670005877BB /* UIRichText.o.d */,
15CBA42C196EE670005877BB /* UIScrollView.o */,
15CBA42D196EE670005877BB /* UIScrollView.o.d */,
15CBA42E196EE670005877BB /* UISlider.o */,
15CBA42F196EE670005877BB /* UISlider.o.d */,
15CBA430196EE670005877BB /* UIText.o */,
15CBA431196EE670005877BB /* UIText.o.d */,
15CBA432196EE670005877BB /* UITextAtlas.o */,
15CBA433196EE670005877BB /* UITextAtlas.o.d */,
15CBA434196EE670005877BB /* UITextBMFont.o */,
15CBA435196EE670005877BB /* UITextBMFont.o.d */,
15CBA436196EE670005877BB /* UITextField.o */,
15CBA437196EE670005877BB /* UITextField.o.d */,
15CBA438196EE670005877BB /* UIVBox.o */,
15CBA439196EE670005877BB /* UIVBox.o.d */,
15CBA43A196EE670005877BB /* UIVideoPlayerAndroid.o */,
15CBA43B196EE670005877BB /* UIVideoPlayerAndroid.o.d */,
15CBA43C196EE670005877BB /* UIWidget.o */,
15CBA43D196EE670005877BB /* UIWidget.o.d */,
);
path = cocos_ui_static;
sourceTree = "<group>";
};
15CBA43E196EE670005877BB /* cocosbuilder_static */ = {
isa = PBXGroup;
children = (
15CBA43F196EE670005877BB /* CCBAnimationManager.o */,
15CBA440196EE670005877BB /* CCBAnimationManager.o.d */,
15CBA441196EE670005877BB /* CCBFileLoader.o */,
15CBA442196EE670005877BB /* CCBFileLoader.o.d */,
15CBA443196EE670005877BB /* CCBKeyframe.o */,
15CBA444196EE670005877BB /* CCBKeyframe.o.d */,
15CBA445196EE670005877BB /* CCBReader.o */,
15CBA446196EE670005877BB /* CCBReader.o.d */,
15CBA447196EE670005877BB /* CCBSequence.o */,
15CBA448196EE670005877BB /* CCBSequence.o.d */,
15CBA449196EE670005877BB /* CCBSequenceProperty.o */,
15CBA44A196EE670005877BB /* CCBSequenceProperty.o.d */,
15CBA44B196EE670005877BB /* CCControlButtonLoader.o */,
15CBA44C196EE670005877BB /* CCControlButtonLoader.o.d */,
15CBA44D196EE670005877BB /* CCControlLoader.o */,
15CBA44E196EE670005877BB /* CCControlLoader.o.d */,
15CBA44F196EE670005877BB /* CCLabelBMFontLoader.o */,
15CBA450196EE670005877BB /* CCLabelBMFontLoader.o.d */,
15CBA451196EE670005877BB /* CCLabelTTFLoader.o */,
15CBA452196EE670005877BB /* CCLabelTTFLoader.o.d */,
15CBA453196EE670005877BB /* CCLayerColorLoader.o */,
15CBA454196EE670005877BB /* CCLayerColorLoader.o.d */,
15CBA455196EE670005877BB /* CCLayerGradientLoader.o */,
15CBA456196EE670005877BB /* CCLayerGradientLoader.o.d */,
15CBA457196EE670005877BB /* CCLayerLoader.o */,
15CBA458196EE670005877BB /* CCLayerLoader.o.d */,
15CBA459196EE670005877BB /* CCMenuItemImageLoader.o */,
15CBA45A196EE670005877BB /* CCMenuItemImageLoader.o.d */,
15CBA45B196EE670005877BB /* CCMenuItemLoader.o */,
15CBA45C196EE670005877BB /* CCMenuItemLoader.o.d */,
15CBA45D196EE670005877BB /* CCNode+CCBRelativePositioning.o */,
15CBA45E196EE670005877BB /* CCNode+CCBRelativePositioning.o.d */,
15CBA45F196EE670005877BB /* CCNodeLoader.o */,
15CBA460196EE670005877BB /* CCNodeLoader.o.d */,
15CBA461196EE670005877BB /* CCNodeLoaderLibrary.o */,
15CBA462196EE670005877BB /* CCNodeLoaderLibrary.o.d */,
15CBA463196EE670005877BB /* CCParticleSystemQuadLoader.o */,
15CBA464196EE670005877BB /* CCParticleSystemQuadLoader.o.d */,
15CBA465196EE670005877BB /* CCScale9SpriteLoader.o */,
15CBA466196EE670005877BB /* CCScale9SpriteLoader.o.d */,
15CBA467196EE670005877BB /* CCScrollViewLoader.o */,
15CBA468196EE670005877BB /* CCScrollViewLoader.o.d */,
15CBA469196EE670005877BB /* CCSpriteLoader.o */,
15CBA46A196EE670005877BB /* CCSpriteLoader.o.d */,
);
path = cocosbuilder_static;
sourceTree = "<group>";
};
15CBA46B196EE670005877BB /* cocosdenshion_static */ = {
isa = PBXGroup;
children = (
15CBA46C196EE670005877BB /* ccdandroidUtils.o */,
15CBA46D196EE670005877BB /* ccdandroidUtils.o.d */,
15CBA46E196EE670005877BB /* cddSimpleAudioEngine.o */,
15CBA46F196EE670005877BB /* cddSimpleAudioEngine.o.d */,
15CBA470196EE670005877BB /* jni */,
);
path = cocosdenshion_static;
sourceTree = "<group>";
};
15CBA470196EE670005877BB /* jni */ = {
isa = PBXGroup;
children = (
15CBA471196EE670005877BB /* cddandroidAndroidJavaEngine.o */,
15CBA472196EE670005877BB /* cddandroidAndroidJavaEngine.o.d */,
);
path = jni;
sourceTree = "<group>";
};
15CBA473196EE670005877BB /* cocostudio_static */ = {
isa = PBXGroup;
children = (
15CBA474196EE670005877BB /* ActionTimeline */,
15CBA47F196EE670005877BB /* CCActionFrame.o */,
15CBA480196EE670005877BB /* CCActionFrame.o.d */,
15CBA481196EE670005877BB /* CCActionFrameEasing.o */,
15CBA482196EE670005877BB /* CCActionFrameEasing.o.d */,
15CBA483196EE670005877BB /* CCActionManagerEx.o */,
15CBA484196EE670005877BB /* CCActionManagerEx.o.d */,
15CBA485196EE670005877BB /* CCActionNode.o */,
15CBA486196EE670005877BB /* CCActionNode.o.d */,
15CBA487196EE670005877BB /* CCActionObject.o */,
15CBA488196EE670005877BB /* CCActionObject.o.d */,
15CBA489196EE670005877BB /* CCArmature.o */,
15CBA48A196EE670005877BB /* CCArmature.o.d */,
15CBA48B196EE670005877BB /* CCArmatureAnimation.o */,
15CBA48C196EE670005877BB /* CCArmatureAnimation.o.d */,
15CBA48D196EE670005877BB /* CCArmatureDataManager.o */,
15CBA48E196EE670005877BB /* CCArmatureDataManager.o.d */,
15CBA48F196EE670005877BB /* CCArmatureDefine.o */,
15CBA490196EE670005877BB /* CCArmatureDefine.o.d */,
15CBA491196EE670005877BB /* CCBatchNode.o */,
15CBA492196EE670005877BB /* CCBatchNode.o.d */,
15CBA493196EE670005877BB /* CCBone.o */,
15CBA494196EE670005877BB /* CCBone.o.d */,
15CBA495196EE670005877BB /* CCColliderDetector.o */,
15CBA496196EE670005877BB /* CCColliderDetector.o.d */,
15CBA497196EE670005877BB /* CCComAttribute.o */,
15CBA498196EE670005877BB /* CCComAttribute.o.d */,
15CBA499196EE670005877BB /* CCComAudio.o */,
15CBA49A196EE670005877BB /* CCComAudio.o.d */,
15CBA49B196EE670005877BB /* CCComController.o */,
15CBA49C196EE670005877BB /* CCComController.o.d */,
15CBA49D196EE670005877BB /* CCComRender.o */,
15CBA49E196EE670005877BB /* CCComRender.o.d */,
15CBA49F196EE670005877BB /* CCDataReaderHelper.o */,
15CBA4A0196EE670005877BB /* CCDataReaderHelper.o.d */,
15CBA4A1196EE670005877BB /* CCDatas.o */,
15CBA4A2196EE670005877BB /* CCDatas.o.d */,
15CBA4A3196EE670005877BB /* CCDecorativeDisplay.o */,
15CBA4A4196EE670005877BB /* CCDecorativeDisplay.o.d */,
15CBA4A5196EE670005877BB /* CCDisplayFactory.o */,
15CBA4A6196EE670005877BB /* CCDisplayFactory.o.d */,
15CBA4A7196EE670005877BB /* CCDisplayManager.o */,
15CBA4A8196EE670005877BB /* CCDisplayManager.o.d */,
15CBA4A9196EE670005877BB /* CCInputDelegate.o */,
15CBA4AA196EE670005877BB /* CCInputDelegate.o.d */,
15CBA4AB196EE670005877BB /* CCProcessBase.o */,
15CBA4AC196EE670005877BB /* CCProcessBase.o.d */,
15CBA4AD196EE670005877BB /* CCSGUIReader.o */,
15CBA4AE196EE670005877BB /* CCSGUIReader.o.d */,
15CBA4AF196EE670005877BB /* CCSkin.o */,
15CBA4B0196EE670005877BB /* CCSkin.o.d */,
15CBA4B1196EE671005877BB /* CCSpriteFrameCacheHelper.o */,
15CBA4B2196EE671005877BB /* CCSpriteFrameCacheHelper.o.d */,
15CBA4B3196EE671005877BB /* CCSSceneReader.o */,
15CBA4B4196EE671005877BB /* CCSSceneReader.o.d */,
15CBA4B5196EE671005877BB /* CCTransformHelp.o */,
15CBA4B6196EE671005877BB /* CCTransformHelp.o.d */,
15CBA4B7196EE671005877BB /* CCTween.o */,
15CBA4B8196EE671005877BB /* CCTween.o.d */,
15CBA4B9196EE671005877BB /* CCUtilMath.o */,
15CBA4BA196EE671005877BB /* CCUtilMath.o.d */,
15CBA4BB196EE671005877BB /* CocoLoader.o */,
15CBA4BC196EE671005877BB /* CocoLoader.o.d */,
15CBA4BD196EE671005877BB /* DictionaryHelper.o */,
15CBA4BE196EE671005877BB /* DictionaryHelper.o.d */,
15CBA4BF196EE671005877BB /* TriggerBase.o */,
15CBA4C0196EE671005877BB /* TriggerBase.o.d */,
15CBA4C1196EE671005877BB /* TriggerMng.o */,
15CBA4C2196EE671005877BB /* TriggerMng.o.d */,
15CBA4C3196EE671005877BB /* TriggerObj.o */,
15CBA4C4196EE671005877BB /* TriggerObj.o.d */,
15CBA4C5196EE671005877BB /* WidgetReader */,
);
path = cocostudio_static;
sourceTree = "<group>";
};
15CBA474196EE670005877BB /* ActionTimeline */ = {
isa = PBXGroup;
children = (
15CBA475196EE670005877BB /* CCActionTimeline.o */,
15CBA476196EE670005877BB /* CCActionTimeline.o.d */,
15CBA477196EE670005877BB /* CCActionTimelineCache.o */,
15CBA478196EE670005877BB /* CCActionTimelineCache.o.d */,
15CBA479196EE670005877BB /* CCFrame.o */,
15CBA47A196EE670005877BB /* CCFrame.o.d */,
15CBA47B196EE670005877BB /* CCNodeReader.o */,
15CBA47C196EE670005877BB /* CCNodeReader.o.d */,
15CBA47D196EE670005877BB /* CCTimeLine.o */,
15CBA47E196EE670005877BB /* CCTimeLine.o.d */,
);
path = ActionTimeline;
sourceTree = "<group>";
};
15CBA4C5196EE671005877BB /* WidgetReader */ = {
isa = PBXGroup;
children = (
15CBA4C6196EE671005877BB /* ButtonReader */,
15CBA4C9196EE671005877BB /* CheckBoxReader */,
15CBA4CC196EE671005877BB /* ImageViewReader */,
15CBA4CF196EE671005877BB /* LayoutReader */,
15CBA4D2196EE671005877BB /* ListViewReader */,
15CBA4D5196EE671005877BB /* LoadingBarReader */,
15CBA4D8196EE671005877BB /* PageViewReader */,
15CBA4DB196EE671005877BB /* ScrollViewReader */,
15CBA4DE196EE671005877BB /* SliderReader */,
15CBA4E1196EE671005877BB /* TextAtlasReader */,
15CBA4E4196EE671005877BB /* TextBMFontReader */,
15CBA4E7196EE671005877BB /* TextFieldReader */,
15CBA4EA196EE671005877BB /* TextReader */,
15CBA4ED196EE671005877BB /* WidgetReader.o */,
15CBA4EE196EE671005877BB /* WidgetReader.o.d */,
);
path = WidgetReader;
sourceTree = "<group>";
};
15CBA4C6196EE671005877BB /* ButtonReader */ = {
isa = PBXGroup;
children = (
15CBA4C7196EE671005877BB /* ButtonReader.o */,
15CBA4C8196EE671005877BB /* ButtonReader.o.d */,
);
path = ButtonReader;
sourceTree = "<group>";
};
15CBA4C9196EE671005877BB /* CheckBoxReader */ = {
isa = PBXGroup;
children = (
15CBA4CA196EE671005877BB /* CheckBoxReader.o */,
15CBA4CB196EE671005877BB /* CheckBoxReader.o.d */,
);
path = CheckBoxReader;
sourceTree = "<group>";
};
15CBA4CC196EE671005877BB /* ImageViewReader */ = {
isa = PBXGroup;
children = (
15CBA4CD196EE671005877BB /* ImageViewReader.o */,
15CBA4CE196EE671005877BB /* ImageViewReader.o.d */,
);
path = ImageViewReader;
sourceTree = "<group>";
};
15CBA4CF196EE671005877BB /* LayoutReader */ = {
isa = PBXGroup;
children = (
15CBA4D0196EE671005877BB /* LayoutReader.o */,
15CBA4D1196EE671005877BB /* LayoutReader.o.d */,
);
path = LayoutReader;
sourceTree = "<group>";
};
15CBA4D2196EE671005877BB /* ListViewReader */ = {
isa = PBXGroup;
children = (
15CBA4D3196EE671005877BB /* ListViewReader.o */,
15CBA4D4196EE671005877BB /* ListViewReader.o.d */,
);
path = ListViewReader;
sourceTree = "<group>";
};
15CBA4D5196EE671005877BB /* LoadingBarReader */ = {
isa = PBXGroup;
children = (
15CBA4D6196EE671005877BB /* LoadingBarReader.o */,
15CBA4D7196EE671005877BB /* LoadingBarReader.o.d */,
);
path = LoadingBarReader;
sourceTree = "<group>";
};
15CBA4D8196EE671005877BB /* PageViewReader */ = {
isa = PBXGroup;
children = (
15CBA4D9196EE671005877BB /* PageViewReader.o */,
15CBA4DA196EE671005877BB /* PageViewReader.o.d */,
);
path = PageViewReader;
sourceTree = "<group>";
};
15CBA4DB196EE671005877BB /* ScrollViewReader */ = {
isa = PBXGroup;
children = (
15CBA4DC196EE671005877BB /* ScrollViewReader.o */,
15CBA4DD196EE671005877BB /* ScrollViewReader.o.d */,
);
path = ScrollViewReader;
sourceTree = "<group>";
};
15CBA4DE196EE671005877BB /* SliderReader */ = {
isa = PBXGroup;
children = (
15CBA4DF196EE671005877BB /* SliderReader.o */,
15CBA4E0196EE671005877BB /* SliderReader.o.d */,
);
path = SliderReader;
sourceTree = "<group>";
};
15CBA4E1196EE671005877BB /* TextAtlasReader */ = {
isa = PBXGroup;
children = (
15CBA4E2196EE671005877BB /* TextAtlasReader.o */,
15CBA4E3196EE671005877BB /* TextAtlasReader.o.d */,
);
path = TextAtlasReader;
sourceTree = "<group>";
};
15CBA4E4196EE671005877BB /* TextBMFontReader */ = {
isa = PBXGroup;
children = (
15CBA4E5196EE671005877BB /* TextBMFontReader.o */,
15CBA4E6196EE671005877BB /* TextBMFontReader.o.d */,
);
path = TextBMFontReader;
sourceTree = "<group>";
};
15CBA4E7196EE671005877BB /* TextFieldReader */ = {
isa = PBXGroup;
children = (
15CBA4E8196EE671005877BB /* TextFieldReader.o */,
15CBA4E9196EE671005877BB /* TextFieldReader.o.d */,
);
path = TextFieldReader;
sourceTree = "<group>";
};
15CBA4EA196EE671005877BB /* TextReader */ = {
isa = PBXGroup;
children = (
15CBA4EB196EE671005877BB /* TextReader.o */,
15CBA4EC196EE671005877BB /* TextReader.o.d */,
);
path = TextReader;
sourceTree = "<group>";
};
15CBA4EF196EE671005877BB /* cpufeatures */ = {
isa = PBXGroup;
children = (
15CBA4F0196EE671005877BB /* cpu-features.o */,
15CBA4F1196EE671005877BB /* cpu-features.o.d */,
);
path = cpufeatures;
sourceTree = "<group>";
};
15CBA4F2196EE671005877BB /* lua_game_controller_test_shared */ = {
isa = PBXGroup;
children = (
15CBA4F3196EE671005877BB /* __ */,
15CBA4F8196EE671005877BB /* main.o */,
15CBA4F9196EE671005877BB /* main.o.d */,
);
path = lua_game_controller_test_shared;
sourceTree = "<group>";
};
15CBA4F3196EE671005877BB /* __ */ = {
isa = PBXGroup;
children = (
15CBA4F4196EE671005877BB /* __ */,
);
path = __;
sourceTree = "<group>";
};
15CBA4F4196EE671005877BB /* __ */ = {
isa = PBXGroup;
children = (
15CBA4F5196EE671005877BB /* Classes */,
);
path = __;
sourceTree = "<group>";
};
15CBA4F5196EE671005877BB /* Classes */ = {
isa = PBXGroup;
children = (
15CBA4F6196EE671005877BB /* AppDelegate.o */,
15CBA4F7196EE671005877BB /* AppDelegate.o.d */,
);
path = Classes;
sourceTree = "<group>";
};
15CBA4FA196EE671005877BB /* spine_static */ = {
isa = PBXGroup;
children = (
15CBA4FB196EE671005877BB /* Animation.o */,
15CBA4FC196EE671005877BB /* Animation.o.d */,
15CBA4FD196EE671005877BB /* AnimationState.o */,
15CBA4FE196EE671005877BB /* AnimationState.o.d */,
15CBA4FF196EE671005877BB /* AnimationStateData.o */,
15CBA500196EE671005877BB /* AnimationStateData.o.d */,
15CBA501196EE671005877BB /* Atlas.o */,
15CBA502196EE671005877BB /* Atlas.o.d */,
15CBA503196EE671005877BB /* AtlasAttachmentLoader.o */,
15CBA504196EE671005877BB /* AtlasAttachmentLoader.o.d */,
15CBA505196EE671005877BB /* Attachment.o */,
15CBA506196EE671005877BB /* Attachment.o.d */,
15CBA507196EE671005877BB /* AttachmentLoader.o */,
15CBA508196EE671005877BB /* AttachmentLoader.o.d */,
15CBA509196EE671005877BB /* Bone.o */,
15CBA50A196EE671005877BB /* Bone.o.d */,
15CBA50B196EE671005877BB /* BoneData.o */,
15CBA50C196EE671005877BB /* BoneData.o.d */,
15CBA50D196EE671005877BB /* BoundingBoxAttachment.o */,
15CBA50E196EE671005877BB /* BoundingBoxAttachment.o.d */,
15CBA50F196EE671005877BB /* CCSkeleton.o */,
15CBA510196EE671005877BB /* CCSkeleton.o.d */,
15CBA511196EE671005877BB /* CCSkeletonAnimation.o */,
15CBA512196EE671005877BB /* CCSkeletonAnimation.o.d */,
15CBA513196EE671005877BB /* Event.o */,
15CBA514196EE671005877BB /* Event.o.d */,
15CBA515196EE671005877BB /* EventData.o */,
15CBA516196EE671005877BB /* EventData.o.d */,
15CBA517196EE671005877BB /* extension.o */,
15CBA518196EE671005877BB /* extension.o.d */,
15CBA519196EE671005877BB /* Json.o */,
15CBA51A196EE671005877BB /* Json.o.d */,
15CBA51B196EE671005877BB /* RegionAttachment.o */,
15CBA51C196EE671005877BB /* RegionAttachment.o.d */,
15CBA51D196EE671005877BB /* Skeleton.o */,
15CBA51E196EE671005877BB /* Skeleton.o.d */,
15CBA51F196EE671005877BB /* SkeletonBounds.o */,
15CBA520196EE671005877BB /* SkeletonBounds.o.d */,
15CBA521196EE671005877BB /* SkeletonData.o */,
15CBA522196EE671005877BB /* SkeletonData.o.d */,
15CBA523196EE671005877BB /* SkeletonJson.o */,
15CBA524196EE671005877BB /* SkeletonJson.o.d */,
15CBA525196EE671005877BB /* Skin.o */,
15CBA526196EE671005877BB /* Skin.o.d */,
15CBA527196EE671005877BB /* Slot.o */,
15CBA528196EE671005877BB /* Slot.o.d */,
15CBA529196EE671005877BB /* SlotData.o */,
15CBA52A196EE671005877BB /* SlotData.o.d */,
15CBA52B196EE671005877BB /* spine-cocos2dx.o */,
15CBA52C196EE671005877BB /* spine-cocos2dx.o.d */,
);
path = spine_static;
sourceTree = "<group>";
};
15CBA52F196EE671005877BB /* res */ = {
isa = PBXGroup;
children = (
15CBA530196EE671005877BB /* drawable-hdpi */,
15CBA532196EE671005877BB /* drawable-ldpi */,
15CBA534196EE671005877BB /* drawable-mdpi */,
15CBA536196EE671005877BB /* values */,
);
path = res;
sourceTree = "<group>";
};
15CBA530196EE671005877BB /* drawable-hdpi */ = {
isa = PBXGroup;
children = (
15CBA531196EE671005877BB /* icon.png */,
);
path = "drawable-hdpi";
sourceTree = "<group>";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA532196EE671005877BB /* drawable-ldpi */ = {
isa = PBXGroup;
children = (
15CBA533196EE671005877BB /* icon.png */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
path = "drawable-ldpi";
sourceTree = "<group>";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA534196EE671005877BB /* drawable-mdpi */ = {
isa = PBXGroup;
children = (
15CBA535196EE671005877BB /* icon.png */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
path = "drawable-mdpi";
sourceTree = "<group>";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA536196EE671005877BB /* values */ = {
isa = PBXGroup;
children = (
15CBA537196EE671005877BB /* strings.xml */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
path = values;
sourceTree = "<group>";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA538196EE671005877BB /* src */ = {
isa = PBXGroup;
children = (
15CBA539196EE671005877BB /* org */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
path = src;
sourceTree = "<group>";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA539196EE671005877BB /* org */ = {
isa = PBXGroup;
children = (
15CBA53A196EE671005877BB /* cocos2dx */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
path = org;
sourceTree = "<group>";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA53A196EE671005877BB /* cocos2dx */ = {
isa = PBXGroup;
children = (
15CBA53B196EE671005877BB /* LuaGameControllerTest */,
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
);
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
path = cocos2dx;
sourceTree = "<group>";
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
};
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA53B196EE671005877BB /* LuaGameControllerTest */ = {
isa = PBXGroup;
children = (
15CBA53C196EE671005877BB /* AppActivity.java */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
path = LuaGameControllerTest;
sourceTree = "<group>";
};
15CBA53D196EE671005877BB /* proj.ios */ = {
isa = PBXGroup;
children = (
15CBA53E196EE671005877BB /* AppController.h */,
15CBA53F196EE671005877BB /* AppController.mm */,
15CBA540196EE671005877BB /* Default-568h@2x.png */,
15CBA541196EE671005877BB /* Default.png */,
15CBA542196EE671005877BB /* Default@2x.png */,
15CBA543196EE671005877BB /* HelloLua_Prefix.pch */,
15CBA544196EE671005877BB /* Icon-114.png */,
15CBA545196EE671005877BB /* Icon-120.png */,
15CBA546196EE671005877BB /* Icon-144.png */,
15CBA547196EE671005877BB /* Icon-152.png */,
15CBA548196EE671005877BB /* Icon-57.png */,
15CBA549196EE671005877BB /* Icon-72.png */,
15CBA54A196EE671005877BB /* Icon-76.png */,
15CBA54B196EE671005877BB /* Info.plist */,
15CBA54C196EE671005877BB /* main.m */,
15CBA54D196EE671005877BB /* RootViewController.h */,
15CBA54E196EE671005877BB /* RootViewController.mm */,
);
path = proj.ios;
sourceTree = "<group>";
};
15CBA9A6196EE6DB005877BB /* res */ = {
isa = PBXGroup;
children = (
15CBA9A7196EE6DB005877BB /* .gitignore */,
);
path = res;
sourceTree = "<group>";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
1D6058910D05DD3D006BFB54 /* cpp-tests Mac.app */,
A07A52291783A1D20073F6A7 /* cpp-tests iOS.app */,
1ABCA28618CD91510087CE3A /* lua-tests Mac.app */,
1ABCA2CD18CD93580087CE3A /* lua-tests iOS.app */,
1A0EE2B218CDF6DA004CD58F /* cpp-empty-test Mac.app */,
1A0EE31418CDF733004CD58F /* lua-empty-test Mac.app */,
1A0EE41318CDF775004CD58F /* cpp-empty-test iOS.app */,
1A0EE47E18CDF799004CD58F /* lua-empty-test iOS.app */,
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6177311960FAED00DE83F5 /* game-controller-test IOS.app */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA063196EE56C005877BB /* lua-game-controller-test iOS.app */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
name = Products;
sourceTree = "<group>";
};
1ABCA27718CD90A40087CE3A /* Products */ = {
isa = PBXGroup;
children = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */,
15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
name = Products;
sourceTree = "<group>";
};
1ABCA28818CD91510087CE3A /* Other Frameworks */ = {
isa = PBXGroup;
children = (
1ABCA28918CD91510087CE3A /* AppKit.framework */,
1ABCA28A18CD91510087CE3A /* CoreData.framework */,
1ABCA28B18CD91510087CE3A /* Foundation.framework */,
);
name = "Other Frameworks";
sourceTree = "<group>";
};
1ABCA36418CD9E060087CE3A /* Lua Common */ = {
isa = PBXGroup;
children = (
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */,
15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */,
15D1FD6F1998642800302043 /* experimentalUIConstants.lua */,
15D1FD701998642800302043 /* GuiConstants.lua */,
15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */,
15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */,
15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */,
15D1FD5C1998641200302043 /* NetworkConstants.lua */,
15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */,
15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */,
15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */,
15D1FD50199863F900302043 /* ExtensionConstants.lua */,
15D1FD41199863E800302043 /* CocoStudio.lua */,
15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */,
15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */,
15D1FD44199863E800302043 /* StudioConstants.lua */,
15D1FD38199863CA00302043 /* AudioEngine.lua */,
15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */,
15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */,
15D1FD32199863BA00302043 /* CCBReaderLoad.lua */,
15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */,
15D1FCDE1998637C00302043 /* bitExtend.lua */,
15D1FCDF1998637C00302043 /* Cocos2d.lua */,
15D1FCE01998637C00302043 /* Cocos2dConstants.lua */,
15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */,
15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */,
15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */,
15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */,
15D1FCE51998637C00302043 /* DrawPrimitives.lua */,
15D1FCE61998637C00302043 /* extern.lua */,
15D1FCE71998637C00302043 /* json.lua */,
15D1FCE81998637C00302043 /* luaj.lua */,
15D1FCE91998637C00302043 /* luaoc.lua */,
15D1FCEA1998637C00302043 /* Opengl.lua */,
15D1FCEB1998637C00302043 /* OpenglConstants.lua */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FAA918DA8B6C00F6518C /* ftp.lua */,
1503FAAA18DA8B6C00F6518C /* headers.lua */,
1503FAAB18DA8B6C00F6518C /* http.lua */,
1503FAAC18DA8B6C00F6518C /* ltn12.lua */,
1503FAAD18DA8B6C00F6518C /* mbox.lua */,
1503FAAE18DA8B6C00F6518C /* mime.lua */,
1503FAAF18DA8B6C00F6518C /* smtp.lua */,
1503FAB018DA8B6C00F6518C /* socket.lua */,
1503FAB118DA8B6C00F6518C /* tp.lua */,
1503FAB218DA8B6C00F6518C /* url.lua */,
);
name = "Lua Common";
sourceTree = "<group>";
};
1AC358B618CEC19F00F37B72 /* cpp-empty-test */ = {
isa = PBXGroup;
children = (
1AC358BA18CEC1BF00F37B72 /* Classes */,
1AC358C418CEC1CA00F37B72 /* proj.ios */,
1AC358EC18CEC1D400F37B72 /* proj.mac */,
1AC358FD18CEC1EF00F37B72 /* Resources */,
);
name = "cpp-empty-test";
sourceTree = "<group>";
};
1AC358BA18CEC1BF00F37B72 /* Classes */ = {
isa = PBXGroup;
children = (
1AC358BB18CEC1BF00F37B72 /* AppDelegate.cpp */,
1AC358BC18CEC1BF00F37B72 /* AppDelegate.h */,
1AC358BD18CEC1BF00F37B72 /* AppMacros.h */,
1AC358BE18CEC1BF00F37B72 /* HelloWorldScene.cpp */,
1AC358BF18CEC1BF00F37B72 /* HelloWorldScene.h */,
);
name = Classes;
path = "../tests/cpp-empty-test/Classes";
sourceTree = "<group>";
};
1AC358C418CEC1CA00F37B72 /* proj.ios */ = {
isa = PBXGroup;
children = (
1AC358C518CEC1CA00F37B72 /* AppController.h */,
1AC358C618CEC1CA00F37B72 /* AppController.mm */,
1AC358C718CEC1CA00F37B72 /* Default-568h@2x.png */,
1AC358C818CEC1CA00F37B72 /* Default.png */,
1AC358C918CEC1CA00F37B72 /* Default@2x.png */,
1AC358CC18CEC1CB00F37B72 /* Icon-100.png */,
1AC358CD18CEC1CB00F37B72 /* Icon-114.png */,
1AC358CE18CEC1CB00F37B72 /* Icon-120.png */,
1AC358CF18CEC1CB00F37B72 /* Icon-144.png */,
1AC358D018CEC1CB00F37B72 /* Icon-152.png */,
1AC358D118CEC1CB00F37B72 /* Icon-40.png */,
1AC358D218CEC1CB00F37B72 /* Icon-57.png */,
1AC358D318CEC1CB00F37B72 /* Icon-58.png */,
1AC358D418CEC1CB00F37B72 /* Icon-72.png */,
1AC358D518CEC1CB00F37B72 /* Icon-76.png */,
1AC358D618CEC1CB00F37B72 /* Icon-80.png */,
1AC3590F18CEC26700F37B72 /* Info.plist */,
1AC358D718CEC1CB00F37B72 /* main.m */,
1AC358D818CEC1CB00F37B72 /* RootViewController.h */,
1AC358D918CEC1CB00F37B72 /* RootViewController.mm */,
);
name = proj.ios;
path = "../tests/cpp-empty-test/proj.ios";
sourceTree = "<group>";
};
1AC358EC18CEC1D400F37B72 /* proj.mac */ = {
isa = PBXGroup;
children = (
1AC358F318CEC1D400F37B72 /* Icon.icns */,
1AC3590D18CEC25300F37B72 /* Info.plist */,
1AC358ED18CEC1D400F37B72 /* InfoPlist.strings */,
1AC358F418CEC1D400F37B72 /* main.cpp */,
1AC358EF18CEC1D400F37B72 /* MainMenu.xib */,
);
name = proj.mac;
path = "../tests/cpp-empty-test/proj.mac";
sourceTree = "<group>";
};
1AC358FD18CEC1EF00F37B72 /* Resources */ = {
isa = PBXGroup;
children = (
1AC358FE18CEC1FB00F37B72 /* bang.png */,
1AC358FF18CEC1FB00F37B72 /* fonts */,
1AC3590018CEC1FB00F37B72 /* ipad */,
1AC3590118CEC1FB00F37B72 /* ipadhd */,
1AC3590218CEC1FB00F37B72 /* iphone */,
);
name = Resources;
sourceTree = "<group>";
};
1AC3592118CECEFF00F37B72 /* cpp-tests */ = {
isa = PBXGroup;
children = (
1AC3592418CECF0A00F37B72 /* Classes */,
1AC35C6D18CECF1400F37B72 /* proj.ios */,
1AC35C9A18CECF1E00F37B72 /* proj.mac */,
1AC35CA818CED83500F37B72 /* Resources */,
);
name = "cpp-tests";
sourceTree = "<group>";
};
1AC3592418CECF0A00F37B72 /* Classes */ = {
isa = PBXGroup;
children = (
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
3E9E75CB199324A8005B7047 /* Camera3DTest */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC3592818CECF0A00F37B72 /* ActionManagerTest */,
1AC3592B18CECF0A00F37B72 /* ActionsEaseTest */,
1AC3592E18CECF0A00F37B72 /* ActionsProgressTest */,
1AC3593118CECF0A00F37B72 /* ActionsTest */,
1AC3593418CECF0A00F37B72 /* AppDelegate.cpp */,
1AC3593518CECF0A00F37B72 /* AppDelegate.h */,
1AC3593618CECF0A00F37B72 /* BaseTest.cpp */,
1AC3593718CECF0A00F37B72 /* BaseTest.h */,
1AC3593818CECF0A00F37B72 /* Box2DTest */,
1AC3593B18CECF0A00F37B72 /* Box2DTestBed */,
1AC3597618CECF0B00F37B72 /* BugsTest */,
1AC3598E18CECF0B00F37B72 /* ChipmunkTest */,
1AC3599118CECF0B00F37B72 /* ClickAndMoveTest */,
1AC3599418CECF0B00F37B72 /* ClippingNodeTest */,
1AC3599718CECF0B00F37B72 /* CocosDenshionTest */,
1AC3599A18CECF0B00F37B72 /* ConfigurationTest */,
1AC3599D18CECF0B00F37B72 /* ConsoleTest */,
1AC359A018CECF0B00F37B72 /* controller.cpp */,
1AC359A118CECF0B00F37B72 /* controller.h */,
1AC359A218CECF0B00F37B72 /* CurlTest */,
1AC359A518CECF0B00F37B72 /* CurrentLanguageTest */,
1AC359A818CECF0B00F37B72 /* DataVisitorTest */,
1AC359AB18CECF0B00F37B72 /* DrawPrimitivesTest */,
1AC359AE18CECF0B00F37B72 /* EffectsAdvancedTest */,
1AC359B118CECF0B00F37B72 /* EffectsTest */,
1AC359B418CECF0B00F37B72 /* ExtensionsTest */,
1AC35A8F18CECF0B00F37B72 /* FileUtilsTest */,
1AC35A9218CECF0B00F37B72 /* FontTest */,
1AC35A9518CECF0B00F37B72 /* InputTest */,
1AC35A9818CECF0B00F37B72 /* IntervalTest */,
1AC35AA118CECF0B00F37B72 /* LabelTest */,
1AC35AA618CECF0C00F37B72 /* LayerTest */,
1AC35AA918CECF0C00F37B72 /* MenuTest */,
1AC35AAC18CECF0C00F37B72 /* MotionStreakTest */,
1AC35AAF18CECF0C00F37B72 /* MutiTouchTest */,
1AC35AB218CECF0C00F37B72 /* NewEventDispatcherTest */,
1AC35AB518CECF0C00F37B72 /* NewRendererTest */,
1AC35AB818CECF0C00F37B72 /* NodeTest */,
1AC35ABB18CECF0C00F37B72 /* ParallaxTest */,
1AC35ABE18CECF0C00F37B72 /* ParticleTest */,
1AC35AC118CECF0C00F37B72 /* PerformanceTest */,
1AC35ADA18CECF0C00F37B72 /* PhysicsTest */,
1AC35ADD18CECF0C00F37B72 /* ReleasePoolTest */,
1AC35AE018CECF0C00F37B72 /* RenderTextureTest */,
1AC35AE318CECF0C00F37B72 /* RotateWorldTest */,
1AC35AE618CECF0C00F37B72 /* SceneTest */,
1AC35AE918CECF0C00F37B72 /* SchedulerTest */,
1AC35AEC18CECF0C00F37B72 /* ShaderTest */,
1AC35AF118CECF0C00F37B72 /* SpineTest */,
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
3E92EA7D1921A0C60094CD21 /* Sprite3DTest */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35AF418CECF0C00F37B72 /* SpriteTest */,
1AC35AF718CECF0C00F37B72 /* testBasic.cpp */,
1AC35AF818CECF0C00F37B72 /* testBasic.h */,
1AC35AF918CECF0C00F37B72 /* testResource.h */,
1AC35AFA18CECF0C00F37B72 /* tests.h */,
1AC35AFB18CECF0C00F37B72 /* TextInputTest */,
1AC35AFE18CECF0C00F37B72 /* Texture2dTest */,
1AC35B0118CECF0C00F37B72 /* TextureCacheTest */,
1AC35B0418CECF0C00F37B72 /* TexturePackerEncryptionTest */,
1AC35B0718CECF0C00F37B72 /* TileMapTest */,
1AC35B0A18CECF0C00F37B72 /* TouchesTest */,
1AC35B1118CECF0C00F37B72 /* TransitionsTest */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D17191B571F0066F8DF /* UITest */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B1418CECF0C00F37B72 /* UnitTest */,
1AC35B1718CECF0C00F37B72 /* UserDefaultTest */,
1AC35B1A18CECF0C00F37B72 /* VisibleRect.cpp */,
1AC35B1B18CECF0C00F37B72 /* VisibleRect.h */,
1AC35B1C18CECF0C00F37B72 /* ZwoptexTest */,
);
name = Classes;
path = "../tests/cpp-tests/Classes";
sourceTree = "<group>";
};
1AC3592818CECF0A00F37B72 /* ActionManagerTest */ = {
isa = PBXGroup;
children = (
1AC3592918CECF0A00F37B72 /* ActionManagerTest.cpp */,
1AC3592A18CECF0A00F37B72 /* ActionManagerTest.h */,
);
path = ActionManagerTest;
sourceTree = "<group>";
};
1AC3592B18CECF0A00F37B72 /* ActionsEaseTest */ = {
isa = PBXGroup;
children = (
1AC3592C18CECF0A00F37B72 /* ActionsEaseTest.cpp */,
1AC3592D18CECF0A00F37B72 /* ActionsEaseTest.h */,
);
path = ActionsEaseTest;
sourceTree = "<group>";
};
1AC3592E18CECF0A00F37B72 /* ActionsProgressTest */ = {
isa = PBXGroup;
children = (
1AC3592F18CECF0A00F37B72 /* ActionsProgressTest.cpp */,
1AC3593018CECF0A00F37B72 /* ActionsProgressTest.h */,
);
path = ActionsProgressTest;
sourceTree = "<group>";
};
1AC3593118CECF0A00F37B72 /* ActionsTest */ = {
isa = PBXGroup;
children = (
1AC3593218CECF0A00F37B72 /* ActionsTest.cpp */,
1AC3593318CECF0A00F37B72 /* ActionsTest.h */,
);
path = ActionsTest;
sourceTree = "<group>";
};
1AC3593818CECF0A00F37B72 /* Box2DTest */ = {
isa = PBXGroup;
children = (
1AC3593918CECF0A00F37B72 /* Box2dTest.cpp */,
1AC3593A18CECF0A00F37B72 /* Box2dTest.h */,
);
path = Box2DTest;
sourceTree = "<group>";
};
1AC3593B18CECF0A00F37B72 /* Box2DTestBed */ = {
isa = PBXGroup;
children = (
1AC3593C18CECF0A00F37B72 /* Box2dView.cpp */,
1AC3593D18CECF0A00F37B72 /* Box2dView.h */,
1AC3593E18CECF0A00F37B72 /* GLES-Render.cpp */,
1AC3593F18CECF0A00F37B72 /* GLES-Render.h */,
1AC3594018CECF0A00F37B72 /* Test.cpp */,
1AC3594118CECF0A00F37B72 /* Test.h */,
1AC3594218CECF0A00F37B72 /* TestEntries.cpp */,
1AC3594318CECF0A00F37B72 /* Tests */,
);
path = Box2DTestBed;
sourceTree = "<group>";
};
1AC3594318CECF0A00F37B72 /* Tests */ = {
isa = PBXGroup;
children = (
1AC3594418CECF0B00F37B72 /* AddPair.h */,
1AC3594518CECF0B00F37B72 /* ApplyForce.h */,
1AC3594618CECF0B00F37B72 /* BodyTypes.h */,
1AC3594718CECF0B00F37B72 /* Breakable.h */,
1AC3594818CECF0B00F37B72 /* Bridge.h */,
1AC3594918CECF0B00F37B72 /* BulletTest.h */,
1AC3594A18CECF0B00F37B72 /* Cantilever.h */,
1AC3594B18CECF0B00F37B72 /* Car.h */,
1AC3594C18CECF0B00F37B72 /* Chain.h */,
1AC3594D18CECF0B00F37B72 /* CharacterCollision.h */,
1AC3594E18CECF0B00F37B72 /* CollisionFiltering.h */,
1AC3594F18CECF0B00F37B72 /* CollisionProcessing.h */,
1AC3595018CECF0B00F37B72 /* CompoundShapes.h */,
1AC3595118CECF0B00F37B72 /* Confined.h */,
1AC3595218CECF0B00F37B72 /* ContinuousTest.h */,
1AC3595318CECF0B00F37B72 /* ConvexHull.h */,
1AC3595418CECF0B00F37B72 /* ConveyorBelt.h */,
1AC3595518CECF0B00F37B72 /* DistanceTest.h */,
1AC3595618CECF0B00F37B72 /* Dominos.h */,
1AC3595718CECF0B00F37B72 /* DumpShell.h */,
1AC3595818CECF0B00F37B72 /* DynamicTreeTest.h */,
1AC3595918CECF0B00F37B72 /* EdgeShapes.h */,
1AC3595A18CECF0B00F37B72 /* EdgeTest.h */,
1AC3595B18CECF0B00F37B72 /* Gears.h */,
1AC3595C18CECF0B00F37B72 /* Mobile.h */,
1AC3595D18CECF0B00F37B72 /* MobileBalanced.h */,
1AC3595E18CECF0B00F37B72 /* MotorJoint.h */,
1AC3595F18CECF0B00F37B72 /* OneSidedPlatform.h */,
1AC3596018CECF0B00F37B72 /* Pinball.h */,
1AC3596118CECF0B00F37B72 /* PolyCollision.h */,
1AC3596218CECF0B00F37B72 /* PolyShapes.h */,
1AC3596318CECF0B00F37B72 /* Prismatic.h */,
1AC3596418CECF0B00F37B72 /* Pulleys.h */,
1AC3596518CECF0B00F37B72 /* Pyramid.h */,
1AC3596618CECF0B00F37B72 /* RayCast.h */,
1AC3596718CECF0B00F37B72 /* Revolute.h */,
1AC3596818CECF0B00F37B72 /* Rope.h */,
1AC3596918CECF0B00F37B72 /* RopeJoint.h */,
1AC3596A18CECF0B00F37B72 /* SensorTest.h */,
1AC3596B18CECF0B00F37B72 /* ShapeEditing.h */,
1AC3596C18CECF0B00F37B72 /* SliderCrank.h */,
1AC3596D18CECF0B00F37B72 /* SphereStack.h */,
1AC3596E18CECF0B00F37B72 /* TheoJansen.h */,
1AC3596F18CECF0B00F37B72 /* Tiles.h */,
1AC3597018CECF0B00F37B72 /* TimeOfImpact.h */,
1AC3597118CECF0B00F37B72 /* Tumbler.h */,
1AC3597218CECF0B00F37B72 /* VaryingFriction.h */,
1AC3597318CECF0B00F37B72 /* VaryingRestitution.h */,
1AC3597418CECF0B00F37B72 /* VerticalStack.h */,
1AC3597518CECF0B00F37B72 /* Web.h */,
);
path = Tests;
sourceTree = "<group>";
};
1AC3597618CECF0B00F37B72 /* BugsTest */ = {
isa = PBXGroup;
children = (
1AC3597718CECF0B00F37B72 /* Bug-1159.cpp */,
1AC3597818CECF0B00F37B72 /* Bug-1159.h */,
1AC3597918CECF0B00F37B72 /* Bug-1174.cpp */,
1AC3597A18CECF0B00F37B72 /* Bug-1174.h */,
1AC3597B18CECF0B00F37B72 /* Bug-350.cpp */,
1AC3597C18CECF0B00F37B72 /* Bug-350.h */,
1AC3597D18CECF0B00F37B72 /* Bug-422.cpp */,
1AC3597E18CECF0B00F37B72 /* Bug-422.h */,
1AC3597F18CECF0B00F37B72 /* Bug-458 */,
1AC3598418CECF0B00F37B72 /* Bug-624.cpp */,
1AC3598518CECF0B00F37B72 /* Bug-624.h */,
1AC3598618CECF0B00F37B72 /* Bug-886.cpp */,
1AC3598718CECF0B00F37B72 /* Bug-886.h */,
1AC3598818CECF0B00F37B72 /* Bug-899.cpp */,
1AC3598918CECF0B00F37B72 /* Bug-899.h */,
1AC3598A18CECF0B00F37B72 /* Bug-914.cpp */,
1AC3598B18CECF0B00F37B72 /* Bug-914.h */,
1AC3598C18CECF0B00F37B72 /* BugsTest.cpp */,
1AC3598D18CECF0B00F37B72 /* BugsTest.h */,
add TestCase for reparentChildren bug
2014-05-13 13:50:31 +08:00
59620E8D1921E5CF002021B6 /* Bug-Child.cpp */,
59620E8E1921E5CF002021B6 /* Bug-Child.h */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
path = BugsTest;
sourceTree = "<group>";
};
1AC3597F18CECF0B00F37B72 /* Bug-458 */ = {
isa = PBXGroup;
children = (
1AC3598018CECF0B00F37B72 /* Bug-458.cpp */,
1AC3598118CECF0B00F37B72 /* Bug-458.h */,
1AC3598218CECF0B00F37B72 /* QuestionContainerSprite.cpp */,
1AC3598318CECF0B00F37B72 /* QuestionContainerSprite.h */,
);
path = "Bug-458";
sourceTree = "<group>";
};
1AC3598E18CECF0B00F37B72 /* ChipmunkTest */ = {
isa = PBXGroup;
children = (
1AC3598F18CECF0B00F37B72 /* ChipmunkTest.cpp */,
1AC3599018CECF0B00F37B72 /* ChipmunkTest.h */,
);
path = ChipmunkTest;
sourceTree = "<group>";
};
1AC3599118CECF0B00F37B72 /* ClickAndMoveTest */ = {
isa = PBXGroup;
children = (
1AC3599218CECF0B00F37B72 /* ClickAndMoveTest.cpp */,
1AC3599318CECF0B00F37B72 /* ClickAndMoveTest.h */,
);
path = ClickAndMoveTest;
sourceTree = "<group>";
};
1AC3599418CECF0B00F37B72 /* ClippingNodeTest */ = {
isa = PBXGroup;
children = (
1AC3599518CECF0B00F37B72 /* ClippingNodeTest.cpp */,
1AC3599618CECF0B00F37B72 /* ClippingNodeTest.h */,
);
path = ClippingNodeTest;
sourceTree = "<group>";
};
1AC3599718CECF0B00F37B72 /* CocosDenshionTest */ = {
isa = PBXGroup;
children = (
1AC3599818CECF0B00F37B72 /* CocosDenshionTest.cpp */,
1AC3599918CECF0B00F37B72 /* CocosDenshionTest.h */,
);
path = CocosDenshionTest;
sourceTree = "<group>";
};
1AC3599A18CECF0B00F37B72 /* ConfigurationTest */ = {
isa = PBXGroup;
children = (
1AC3599B18CECF0B00F37B72 /* ConfigurationTest.cpp */,
1AC3599C18CECF0B00F37B72 /* ConfigurationTest.h */,
);
path = ConfigurationTest;
sourceTree = "<group>";
};
1AC3599D18CECF0B00F37B72 /* ConsoleTest */ = {
isa = PBXGroup;
children = (
1AC3599E18CECF0B00F37B72 /* ConsoleTest.cpp */,
1AC3599F18CECF0B00F37B72 /* ConsoleTest.h */,
);
path = ConsoleTest;
sourceTree = "<group>";
};
1AC359A218CECF0B00F37B72 /* CurlTest */ = {
isa = PBXGroup;
children = (
1AC359A318CECF0B00F37B72 /* CurlTest.cpp */,
1AC359A418CECF0B00F37B72 /* CurlTest.h */,
);
path = CurlTest;
sourceTree = "<group>";
};
1AC359A518CECF0B00F37B72 /* CurrentLanguageTest */ = {
isa = PBXGroup;
children = (
1AC359A618CECF0B00F37B72 /* CurrentLanguageTest.cpp */,
1AC359A718CECF0B00F37B72 /* CurrentLanguageTest.h */,
);
path = CurrentLanguageTest;
sourceTree = "<group>";
};
1AC359A818CECF0B00F37B72 /* DataVisitorTest */ = {
isa = PBXGroup;
children = (
1AC359A918CECF0B00F37B72 /* DataVisitorTest.cpp */,
1AC359AA18CECF0B00F37B72 /* DataVisitorTest.h */,
);
path = DataVisitorTest;
sourceTree = "<group>";
};
1AC359AB18CECF0B00F37B72 /* DrawPrimitivesTest */ = {
isa = PBXGroup;
children = (
1AC359AC18CECF0B00F37B72 /* DrawPrimitivesTest.cpp */,
1AC359AD18CECF0B00F37B72 /* DrawPrimitivesTest.h */,
);
path = DrawPrimitivesTest;
sourceTree = "<group>";
};
1AC359AE18CECF0B00F37B72 /* EffectsAdvancedTest */ = {
isa = PBXGroup;
children = (
1AC359AF18CECF0B00F37B72 /* EffectsAdvancedTest.cpp */,
1AC359B018CECF0B00F37B72 /* EffectsAdvancedTest.h */,
);
path = EffectsAdvancedTest;
sourceTree = "<group>";
};
1AC359B118CECF0B00F37B72 /* EffectsTest */ = {
isa = PBXGroup;
children = (
1AC359B218CECF0B00F37B72 /* EffectsTest.cpp */,
1AC359B318CECF0B00F37B72 /* EffectsTest.h */,
);
path = EffectsTest;
sourceTree = "<group>";
};
1AC359B418CECF0B00F37B72 /* ExtensionsTest */ = {
isa = PBXGroup;
children = (
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E70194AEBE100FF2BE4 /* CocoStudioActionTimelineTest */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC359B518CECF0B00F37B72 /* CocosBuilderTest */,
1AC359DC18CECF0B00F37B72 /* CocoStudioArmatureTest */,
1AC359DF18CECF0B00F37B72 /* CocoStudioComponentsTest */,
1AC35A5818CECF0B00F37B72 /* CocoStudioSceneTest */,
1AC35A6118CECF0B00F37B72 /* ControlExtensionTest */,
1AC35A7818CECF0B00F37B72 /* EditBoxTest */,
1AC35A7B18CECF0B00F37B72 /* ExtensionsTest.cpp */,
1AC35A7C18CECF0B00F37B72 /* ExtensionsTest.h */,
1AC35A7D18CECF0B00F37B72 /* NetworkTest */,
1AC35A8418CECF0B00F37B72 /* NotificationCenterTest */,
1AC35A8718CECF0B00F37B72 /* Scale9SpriteTest */,
1AC35A8A18CECF0B00F37B72 /* TableViewTest */,
);
path = ExtensionsTest;
sourceTree = "<group>";
};
1AC359B518CECF0B00F37B72 /* CocosBuilderTest */ = {
isa = PBXGroup;
children = (
1AC359B618CECF0B00F37B72 /* AnimationsTest */,
1AC359BA18CECF0B00F37B72 /* ButtonTest */,
1AC359BE18CECF0B00F37B72 /* CocosBuilderTest.cpp */,
1AC359BF18CECF0B00F37B72 /* CocosBuilderTest.h */,
1AC359C018CECF0B00F37B72 /* HelloCocosBuilder */,
1AC359C418CECF0B00F37B72 /* LabelTest */,
1AC359C718CECF0B00F37B72 /* MenuTest */,
1AC359CB18CECF0B00F37B72 /* ParticleSystemTest */,
1AC359CE18CECF0B00F37B72 /* ScrollViewTest */,
1AC359D118CECF0B00F37B72 /* SpriteTest */,
1AC359D418CECF0B00F37B72 /* TestHeader */,
1AC359D818CECF0B00F37B72 /* TimelineCallbackTest */,
);
path = CocosBuilderTest;
sourceTree = "<group>";
};
1AC359B618CECF0B00F37B72 /* AnimationsTest */ = {
isa = PBXGroup;
children = (
1AC359B718CECF0B00F37B72 /* AnimationsLayerLoader.h */,
1AC359B818CECF0B00F37B72 /* AnimationsTestLayer.cpp */,
1AC359B918CECF0B00F37B72 /* AnimationsTestLayer.h */,
);
path = AnimationsTest;
sourceTree = "<group>";
};
1AC359BA18CECF0B00F37B72 /* ButtonTest */ = {
isa = PBXGroup;
children = (
1AC359BB18CECF0B00F37B72 /* ButtonTestLayer.cpp */,
1AC359BC18CECF0B00F37B72 /* ButtonTestLayer.h */,
1AC359BD18CECF0B00F37B72 /* ButtonTestLayerLoader.h */,
);
path = ButtonTest;
sourceTree = "<group>";
};
1AC359C018CECF0B00F37B72 /* HelloCocosBuilder */ = {
isa = PBXGroup;
children = (
1AC359C118CECF0B00F37B72 /* HelloCocosBuilderLayer.cpp */,
1AC359C218CECF0B00F37B72 /* HelloCocosBuilderLayer.h */,
1AC359C318CECF0B00F37B72 /* HelloCocosBuilderLayerLoader.h */,
);
path = HelloCocosBuilder;
sourceTree = "<group>";
};
1AC359C418CECF0B00F37B72 /* LabelTest */ = {
isa = PBXGroup;
children = (
1AC359C518CECF0B00F37B72 /* LabelTestLayer.h */,
1AC359C618CECF0B00F37B72 /* LabelTestLayerLoader.h */,
);
path = LabelTest;
sourceTree = "<group>";
};
1AC359C718CECF0B00F37B72 /* MenuTest */ = {
isa = PBXGroup;
children = (
1AC359C818CECF0B00F37B72 /* MenuTestLayer.cpp */,
1AC359C918CECF0B00F37B72 /* MenuTestLayer.h */,
1AC359CA18CECF0B00F37B72 /* MenuTestLayerLoader.h */,
);
path = MenuTest;
sourceTree = "<group>";
};
1AC359CB18CECF0B00F37B72 /* ParticleSystemTest */ = {
isa = PBXGroup;
children = (
1AC359CC18CECF0B00F37B72 /* ParticleSystemTestLayer.h */,
1AC359CD18CECF0B00F37B72 /* ParticleSystemTestLayerLoader.h */,
);
path = ParticleSystemTest;
sourceTree = "<group>";
};
1AC359CE18CECF0B00F37B72 /* ScrollViewTest */ = {
isa = PBXGroup;
children = (
1AC359CF18CECF0B00F37B72 /* ScrollViewTestLayer.h */,
1AC359D018CECF0B00F37B72 /* ScrollViewTestLayerLoader.h */,
);
path = ScrollViewTest;
sourceTree = "<group>";
};
1AC359D118CECF0B00F37B72 /* SpriteTest */ = {
isa = PBXGroup;
children = (
1AC359D218CECF0B00F37B72 /* SpriteTestLayer.h */,
1AC359D318CECF0B00F37B72 /* SpriteTestLayerLoader.h */,
);
path = SpriteTest;
sourceTree = "<group>";
};
1AC359D418CECF0B00F37B72 /* TestHeader */ = {
isa = PBXGroup;
children = (
1AC359D518CECF0B00F37B72 /* TestHeaderLayer.cpp */,
1AC359D618CECF0B00F37B72 /* TestHeaderLayer.h */,
1AC359D718CECF0B00F37B72 /* TestHeaderLayerLoader.h */,
);
path = TestHeader;
sourceTree = "<group>";
};
1AC359D818CECF0B00F37B72 /* TimelineCallbackTest */ = {
isa = PBXGroup;
children = (
1AC359D918CECF0B00F37B72 /* TimelineCallbackLayerLoader.h */,
1AC359DA18CECF0B00F37B72 /* TimelineCallbackTestLayer.cpp */,
1AC359DB18CECF0B00F37B72 /* TimelineCallbackTestLayer.h */,
);
path = TimelineCallbackTest;
sourceTree = "<group>";
};
1AC359DC18CECF0B00F37B72 /* CocoStudioArmatureTest */ = {
isa = PBXGroup;
children = (
1AC359DD18CECF0B00F37B72 /* ArmatureScene.cpp */,
1AC359DE18CECF0B00F37B72 /* ArmatureScene.h */,
);
path = CocoStudioArmatureTest;
sourceTree = "<group>";
};
1AC359DF18CECF0B00F37B72 /* CocoStudioComponentsTest */ = {
isa = PBXGroup;
children = (
1AC359E018CECF0B00F37B72 /* ComponentsTestScene.cpp */,
1AC359E118CECF0B00F37B72 /* ComponentsTestScene.h */,
1AC359E218CECF0B00F37B72 /* EnemyController.cpp */,
1AC359E318CECF0B00F37B72 /* EnemyController.h */,
1AC359E418CECF0B00F37B72 /* GameOverScene.cpp */,
1AC359E518CECF0B00F37B72 /* GameOverScene.h */,
1AC359E618CECF0B00F37B72 /* PlayerController.cpp */,
1AC359E718CECF0B00F37B72 /* PlayerController.h */,
1AC359E818CECF0B00F37B72 /* ProjectileController.cpp */,
1AC359E918CECF0B00F37B72 /* ProjectileController.h */,
1AC359EA18CECF0B00F37B72 /* SceneController.cpp */,
1AC359EB18CECF0B00F37B72 /* SceneController.h */,
);
path = CocoStudioComponentsTest;
sourceTree = "<group>";
};
1AC35A5818CECF0B00F37B72 /* CocoStudioSceneTest */ = {
isa = PBXGroup;
children = (
1AC35A5918CECF0B00F37B72 /* SceneEditorTest.cpp */,
1AC35A5A18CECF0B00F37B72 /* SceneEditorTest.h */,
1AC35A5B18CECF0B00F37B72 /* TriggerCode */,
);
path = CocoStudioSceneTest;
sourceTree = "<group>";
};
1AC35A5B18CECF0B00F37B72 /* TriggerCode */ = {
isa = PBXGroup;
children = (
1AC35A5C18CECF0B00F37B72 /* acts.cpp */,
1AC35A5D18CECF0B00F37B72 /* acts.h */,
1AC35A5E18CECF0B00F37B72 /* cons.cpp */,
1AC35A5F18CECF0B00F37B72 /* cons.h */,
1AC35A6018CECF0B00F37B72 /* EventDef.h */,
);
path = TriggerCode;
sourceTree = "<group>";
};
1AC35A6118CECF0B00F37B72 /* ControlExtensionTest */ = {
isa = PBXGroup;
children = (
1AC35A6218CECF0B00F37B72 /* CCControlButtonTest */,
1AC35A6518CECF0B00F37B72 /* CCControlColourPicker */,
1AC35A6818CECF0B00F37B72 /* CCControlPotentiometerTest */,
1AC35A6B18CECF0B00F37B72 /* CCControlScene.cpp */,
1AC35A6C18CECF0B00F37B72 /* CCControlScene.h */,
1AC35A6D18CECF0B00F37B72 /* CCControlSceneManager.cpp */,
1AC35A6E18CECF0B00F37B72 /* CCControlSceneManager.h */,
1AC35A6F18CECF0B00F37B72 /* CCControlSliderTest */,
1AC35A7218CECF0B00F37B72 /* CCControlStepperTest */,
1AC35A7518CECF0B00F37B72 /* CCControlSwitchTest */,
);
path = ControlExtensionTest;
sourceTree = "<group>";
};
1AC35A6218CECF0B00F37B72 /* CCControlButtonTest */ = {
isa = PBXGroup;
children = (
1AC35A6318CECF0B00F37B72 /* CCControlButtonTest.cpp */,
1AC35A6418CECF0B00F37B72 /* CCControlButtonTest.h */,
);
path = CCControlButtonTest;
sourceTree = "<group>";
};
1AC35A6518CECF0B00F37B72 /* CCControlColourPicker */ = {
isa = PBXGroup;
children = (
1AC35A6618CECF0B00F37B72 /* CCControlColourPickerTest.cpp */,
1AC35A6718CECF0B00F37B72 /* CCControlColourPickerTest.h */,
);
path = CCControlColourPicker;
sourceTree = "<group>";
};
1AC35A6818CECF0B00F37B72 /* CCControlPotentiometerTest */ = {
isa = PBXGroup;
children = (
1AC35A6918CECF0B00F37B72 /* CCControlPotentiometerTest.cpp */,
1AC35A6A18CECF0B00F37B72 /* CCControlPotentiometerTest.h */,
);
path = CCControlPotentiometerTest;
sourceTree = "<group>";
};
1AC35A6F18CECF0B00F37B72 /* CCControlSliderTest */ = {
isa = PBXGroup;
children = (
1AC35A7018CECF0B00F37B72 /* CCControlSliderTest.cpp */,
1AC35A7118CECF0B00F37B72 /* CCControlSliderTest.h */,
);
path = CCControlSliderTest;
sourceTree = "<group>";
};
1AC35A7218CECF0B00F37B72 /* CCControlStepperTest */ = {
isa = PBXGroup;
children = (
1AC35A7318CECF0B00F37B72 /* CCControlStepperTest.cpp */,
1AC35A7418CECF0B00F37B72 /* CCControlStepperTest.h */,
);
path = CCControlStepperTest;
sourceTree = "<group>";
};
1AC35A7518CECF0B00F37B72 /* CCControlSwitchTest */ = {
isa = PBXGroup;
children = (
1AC35A7618CECF0B00F37B72 /* CCControlSwitchTest.cpp */,
1AC35A7718CECF0B00F37B72 /* CCControlSwitchTest.h */,
);
path = CCControlSwitchTest;
sourceTree = "<group>";
};
1AC35A7818CECF0B00F37B72 /* EditBoxTest */ = {
isa = PBXGroup;
children = (
1AC35A7918CECF0B00F37B72 /* EditBoxTest.cpp */,
1AC35A7A18CECF0B00F37B72 /* EditBoxTest.h */,
);
path = EditBoxTest;
sourceTree = "<group>";
};
1AC35A7D18CECF0B00F37B72 /* NetworkTest */ = {
isa = PBXGroup;
children = (
1AC35A7E18CECF0B00F37B72 /* HttpClientTest.cpp */,
1AC35A7F18CECF0B00F37B72 /* HttpClientTest.h */,
1AC35A8018CECF0B00F37B72 /* SocketIOTest.cpp */,
1AC35A8118CECF0B00F37B72 /* SocketIOTest.h */,
1AC35A8218CECF0B00F37B72 /* WebSocketTest.cpp */,
1AC35A8318CECF0B00F37B72 /* WebSocketTest.h */,
);
path = NetworkTest;
sourceTree = "<group>";
};
1AC35A8418CECF0B00F37B72 /* NotificationCenterTest */ = {
isa = PBXGroup;
children = (
1AC35A8518CECF0B00F37B72 /* NotificationCenterTest.cpp */,
1AC35A8618CECF0B00F37B72 /* NotificationCenterTest.h */,
);
path = NotificationCenterTest;
sourceTree = "<group>";
};
1AC35A8718CECF0B00F37B72 /* Scale9SpriteTest */ = {
isa = PBXGroup;
children = (
1AC35A8818CECF0B00F37B72 /* Scale9SpriteTest.cpp */,
1AC35A8918CECF0B00F37B72 /* Scale9SpriteTest.h */,
);
path = Scale9SpriteTest;
sourceTree = "<group>";
};
1AC35A8A18CECF0B00F37B72 /* TableViewTest */ = {
isa = PBXGroup;
children = (
1AC35A8B18CECF0B00F37B72 /* CustomTableViewCell.cpp */,
1AC35A8C18CECF0B00F37B72 /* CustomTableViewCell.h */,
1AC35A8D18CECF0B00F37B72 /* TableViewTestScene.cpp */,
1AC35A8E18CECF0B00F37B72 /* TableViewTestScene.h */,
);
path = TableViewTest;
sourceTree = "<group>";
};
1AC35A8F18CECF0B00F37B72 /* FileUtilsTest */ = {
isa = PBXGroup;
children = (
1AC35A9018CECF0B00F37B72 /* FileUtilsTest.cpp */,
1AC35A9118CECF0B00F37B72 /* FileUtilsTest.h */,
);
path = FileUtilsTest;
sourceTree = "<group>";
};
1AC35A9218CECF0B00F37B72 /* FontTest */ = {
isa = PBXGroup;
children = (
1AC35A9318CECF0B00F37B72 /* FontTest.cpp */,
1AC35A9418CECF0B00F37B72 /* FontTest.h */,
);
path = FontTest;
sourceTree = "<group>";
};
1AC35A9518CECF0B00F37B72 /* InputTest */ = {
isa = PBXGroup;
children = (
1AC35A9618CECF0B00F37B72 /* MouseTest.cpp */,
1AC35A9718CECF0B00F37B72 /* MouseTest.h */,
);
path = InputTest;
sourceTree = "<group>";
};
1AC35A9818CECF0B00F37B72 /* IntervalTest */ = {
isa = PBXGroup;
children = (
1AC35A9918CECF0B00F37B72 /* IntervalTest.cpp */,
1AC35A9A18CECF0B00F37B72 /* IntervalTest.h */,
);
path = IntervalTest;
sourceTree = "<group>";
};
1AC35AA118CECF0B00F37B72 /* LabelTest */ = {
isa = PBXGroup;
children = (
1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */,
1AC35AA318CECF0C00F37B72 /* LabelTest.h */,
1AC35AA418CECF0C00F37B72 /* LabelTestNew.cpp */,
1AC35AA518CECF0C00F37B72 /* LabelTestNew.h */,
);
path = LabelTest;
sourceTree = "<group>";
};
1AC35AA618CECF0C00F37B72 /* LayerTest */ = {
isa = PBXGroup;
children = (
1AC35AA718CECF0C00F37B72 /* LayerTest.cpp */,
1AC35AA818CECF0C00F37B72 /* LayerTest.h */,
);
path = LayerTest;
sourceTree = "<group>";
};
1AC35AA918CECF0C00F37B72 /* MenuTest */ = {
isa = PBXGroup;
children = (
1AC35AAA18CECF0C00F37B72 /* MenuTest.cpp */,
1AC35AAB18CECF0C00F37B72 /* MenuTest.h */,
);
path = MenuTest;
sourceTree = "<group>";
};
1AC35AAC18CECF0C00F37B72 /* MotionStreakTest */ = {
isa = PBXGroup;
children = (
1AC35AAD18CECF0C00F37B72 /* MotionStreakTest.cpp */,
1AC35AAE18CECF0C00F37B72 /* MotionStreakTest.h */,
);
path = MotionStreakTest;
sourceTree = "<group>";
};
1AC35AAF18CECF0C00F37B72 /* MutiTouchTest */ = {
isa = PBXGroup;
children = (
1AC35AB018CECF0C00F37B72 /* MutiTouchTest.cpp */,
1AC35AB118CECF0C00F37B72 /* MutiTouchTest.h */,
);
path = MutiTouchTest;
sourceTree = "<group>";
};
1AC35AB218CECF0C00F37B72 /* NewEventDispatcherTest */ = {
isa = PBXGroup;
children = (
1AC35AB318CECF0C00F37B72 /* NewEventDispatcherTest.cpp */,
1AC35AB418CECF0C00F37B72 /* NewEventDispatcherTest.h */,
);
path = NewEventDispatcherTest;
sourceTree = "<group>";
};
1AC35AB518CECF0C00F37B72 /* NewRendererTest */ = {
isa = PBXGroup;
children = (
1AC35AB618CECF0C00F37B72 /* NewRendererTest.cpp */,
1AC35AB718CECF0C00F37B72 /* NewRendererTest.h */,
);
path = NewRendererTest;
sourceTree = "<group>";
};
1AC35AB818CECF0C00F37B72 /* NodeTest */ = {
isa = PBXGroup;
children = (
1AC35AB918CECF0C00F37B72 /* NodeTest.cpp */,
1AC35ABA18CECF0C00F37B72 /* NodeTest.h */,
);
path = NodeTest;
sourceTree = "<group>";
};
1AC35ABB18CECF0C00F37B72 /* ParallaxTest */ = {
isa = PBXGroup;
children = (
1AC35ABC18CECF0C00F37B72 /* ParallaxTest.cpp */,
1AC35ABD18CECF0C00F37B72 /* ParallaxTest.h */,
);
path = ParallaxTest;
sourceTree = "<group>";
};
1AC35ABE18CECF0C00F37B72 /* ParticleTest */ = {
isa = PBXGroup;
children = (
1AC35ABF18CECF0C00F37B72 /* ParticleTest.cpp */,
1AC35AC018CECF0C00F37B72 /* ParticleTest.h */,
);
path = ParticleTest;
sourceTree = "<group>";
};
1AC35AC118CECF0C00F37B72 /* PerformanceTest */ = {
isa = PBXGroup;
children = (
1AC35AC218CECF0C00F37B72 /* PerformanceAllocTest.cpp */,
1AC35AC318CECF0C00F37B72 /* PerformanceAllocTest.h */,
1AC35AC418CECF0C00F37B72 /* PerformanceContainerTest.cpp */,
1AC35AC518CECF0C00F37B72 /* PerformanceContainerTest.h */,
1AC35AC618CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp */,
1AC35AC718CECF0C00F37B72 /* PerformanceEventDispatcherTest.h */,
1AC35AC818CECF0C00F37B72 /* PerformanceLabelTest.cpp */,
1AC35AC918CECF0C00F37B72 /* PerformanceLabelTest.h */,
1AC35ACA18CECF0C00F37B72 /* PerformanceNodeChildrenTest.cpp */,
1AC35ACB18CECF0C00F37B72 /* PerformanceNodeChildrenTest.h */,
1AC35ACC18CECF0C00F37B72 /* PerformanceParticleTest.cpp */,
1AC35ACD18CECF0C00F37B72 /* PerformanceParticleTest.h */,
1AC35ACE18CECF0C00F37B72 /* PerformanceRendererTest.cpp */,
1AC35ACF18CECF0C00F37B72 /* PerformanceRendererTest.h */,
1AC35AD018CECF0C00F37B72 /* PerformanceScenarioTest.cpp */,
1AC35AD118CECF0C00F37B72 /* PerformanceScenarioTest.h */,
1AC35AD218CECF0C00F37B72 /* PerformanceSpriteTest.cpp */,
1AC35AD318CECF0C00F37B72 /* PerformanceSpriteTest.h */,
1AC35AD418CECF0C00F37B72 /* PerformanceTest.cpp */,
1AC35AD518CECF0C00F37B72 /* PerformanceTest.h */,
1AC35AD618CECF0C00F37B72 /* PerformanceTextureTest.cpp */,
1AC35AD718CECF0C00F37B72 /* PerformanceTextureTest.h */,
1AC35AD818CECF0C00F37B72 /* PerformanceTouchesTest.cpp */,
1AC35AD918CECF0C00F37B72 /* PerformanceTouchesTest.h */,
1AF152D718FD252A00A52F3D /* PerformanceCallbackTest.cpp */,
1AF152D818FD252A00A52F3D /* PerformanceCallbackTest.h */,
);
path = PerformanceTest;
sourceTree = "<group>";
};
1AC35ADA18CECF0C00F37B72 /* PhysicsTest */ = {
isa = PBXGroup;
children = (
1AC35ADB18CECF0C00F37B72 /* PhysicsTest.cpp */,
1AC35ADC18CECF0C00F37B72 /* PhysicsTest.h */,
);
path = PhysicsTest;
sourceTree = "<group>";
};
1AC35ADD18CECF0C00F37B72 /* ReleasePoolTest */ = {
isa = PBXGroup;
children = (
1AC35ADE18CECF0C00F37B72 /* ReleasePoolTest.cpp */,
1AC35ADF18CECF0C00F37B72 /* ReleasePoolTest.h */,
);
path = ReleasePoolTest;
sourceTree = "<group>";
};
1AC35AE018CECF0C00F37B72 /* RenderTextureTest */ = {
isa = PBXGroup;
children = (
1AC35AE118CECF0C00F37B72 /* RenderTextureTest.cpp */,
1AC35AE218CECF0C00F37B72 /* RenderTextureTest.h */,
);
path = RenderTextureTest;
sourceTree = "<group>";
};
1AC35AE318CECF0C00F37B72 /* RotateWorldTest */ = {
isa = PBXGroup;
children = (
1AC35AE418CECF0C00F37B72 /* RotateWorldTest.cpp */,
1AC35AE518CECF0C00F37B72 /* RotateWorldTest.h */,
);
path = RotateWorldTest;
sourceTree = "<group>";
};
1AC35AE618CECF0C00F37B72 /* SceneTest */ = {
isa = PBXGroup;
children = (
1AC35AE718CECF0C00F37B72 /* SceneTest.cpp */,
1AC35AE818CECF0C00F37B72 /* SceneTest.h */,
);
path = SceneTest;
sourceTree = "<group>";
};
1AC35AE918CECF0C00F37B72 /* SchedulerTest */ = {
isa = PBXGroup;
children = (
1AC35AEA18CECF0C00F37B72 /* SchedulerTest.cpp */,
1AC35AEB18CECF0C00F37B72 /* SchedulerTest.h */,
);
path = SchedulerTest;
sourceTree = "<group>";
};
1AC35AEC18CECF0C00F37B72 /* ShaderTest */ = {
isa = PBXGroup;
children = (
1AC35AED18CECF0C00F37B72 /* ShaderTest.cpp */,
1AC35AEE18CECF0C00F37B72 /* ShaderTest.h */,
1AC35AEF18CECF0C00F37B72 /* ShaderTest2.cpp */,
1AC35AF018CECF0C00F37B72 /* ShaderTest2.h */,
Add ShaderTest sample and shader code
2014-05-10 02:48:11 +08:00
70A7F72D191D3E4900F0F206 /* shaderTest.psh.h */,
70A7F730191D421B00F0F206 /* ShaderTest.vsh.h */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
path = ShaderTest;
sourceTree = "<group>";
};
1AC35AF118CECF0C00F37B72 /* SpineTest */ = {
isa = PBXGroup;
children = (
1AC35AF218CECF0C00F37B72 /* SpineTest.cpp */,
1AC35AF318CECF0C00F37B72 /* SpineTest.h */,
);
path = SpineTest;
sourceTree = "<group>";
};
1AC35AF418CECF0C00F37B72 /* SpriteTest */ = {
isa = PBXGroup;
children = (
1AC35AF518CECF0C00F37B72 /* SpriteTest.cpp */,
1AC35AF618CECF0C00F37B72 /* SpriteTest.h */,
);
path = SpriteTest;
sourceTree = "<group>";
};
1AC35AFB18CECF0C00F37B72 /* TextInputTest */ = {
isa = PBXGroup;
children = (
1AC35AFC18CECF0C00F37B72 /* TextInputTest.cpp */,
1AC35AFD18CECF0C00F37B72 /* TextInputTest.h */,
);
path = TextInputTest;
sourceTree = "<group>";
};
1AC35AFE18CECF0C00F37B72 /* Texture2dTest */ = {
isa = PBXGroup;
children = (
1AC35AFF18CECF0C00F37B72 /* Texture2dTest.cpp */,
1AC35B0018CECF0C00F37B72 /* Texture2dTest.h */,
);
path = Texture2dTest;
sourceTree = "<group>";
};
1AC35B0118CECF0C00F37B72 /* TextureCacheTest */ = {
isa = PBXGroup;
children = (
1AC35B0218CECF0C00F37B72 /* TextureCacheTest.cpp */,
1AC35B0318CECF0C00F37B72 /* TextureCacheTest.h */,
);
path = TextureCacheTest;
sourceTree = "<group>";
};
1AC35B0418CECF0C00F37B72 /* TexturePackerEncryptionTest */ = {
isa = PBXGroup;
children = (
1AC35B0518CECF0C00F37B72 /* TextureAtlasEncryptionTest.cpp */,
1AC35B0618CECF0C00F37B72 /* TextureAtlasEncryptionTest.h */,
);
path = TexturePackerEncryptionTest;
sourceTree = "<group>";
};
1AC35B0718CECF0C00F37B72 /* TileMapTest */ = {
isa = PBXGroup;
children = (
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
C04F93581941B05400E9FEAB /* TileMapTest2.cpp */,
C04F93591941B05400E9FEAB /* TileMapTest2.h */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B0818CECF0C00F37B72 /* TileMapTest.cpp */,
1AC35B0918CECF0C00F37B72 /* TileMapTest.h */,
);
path = TileMapTest;
sourceTree = "<group>";
};
1AC35B0A18CECF0C00F37B72 /* TouchesTest */ = {
isa = PBXGroup;
children = (
1AC35B0B18CECF0C00F37B72 /* Ball.cpp */,
1AC35B0C18CECF0C00F37B72 /* Ball.h */,
1AC35B0D18CECF0C00F37B72 /* Paddle.cpp */,
1AC35B0E18CECF0C00F37B72 /* Paddle.h */,
1AC35B0F18CECF0C00F37B72 /* TouchesTest.cpp */,
1AC35B1018CECF0C00F37B72 /* TouchesTest.h */,
);
path = TouchesTest;
sourceTree = "<group>";
};
1AC35B1118CECF0C00F37B72 /* TransitionsTest */ = {
isa = PBXGroup;
children = (
1AC35B1218CECF0C00F37B72 /* TransitionsTest.cpp */,
1AC35B1318CECF0C00F37B72 /* TransitionsTest.h */,
);
path = TransitionsTest;
sourceTree = "<group>";
};
1AC35B1418CECF0C00F37B72 /* UnitTest */ = {
isa = PBXGroup;
children = (
1F33634D18E37E840074764D /* RefPtrTest.cpp */,
1F33634E18E37E840074764D /* RefPtrTest.h */,
1AC35B1518CECF0C00F37B72 /* UnitTest.cpp */,
1AC35B1618CECF0C00F37B72 /* UnitTest.h */,
);
path = UnitTest;
sourceTree = "<group>";
};
1AC35B1718CECF0C00F37B72 /* UserDefaultTest */ = {
isa = PBXGroup;
children = (
1AC35B1818CECF0C00F37B72 /* UserDefaultTest.cpp */,
1AC35B1918CECF0C00F37B72 /* UserDefaultTest.h */,
);
path = UserDefaultTest;
sourceTree = "<group>";
};
1AC35B1C18CECF0C00F37B72 /* ZwoptexTest */ = {
isa = PBXGroup;
children = (
1AC35B1D18CECF0C00F37B72 /* ZwoptexTest.cpp */,
1AC35B1E18CECF0C00F37B72 /* ZwoptexTest.h */,
);
path = ZwoptexTest;
sourceTree = "<group>";
};
1AC35C6D18CECF1400F37B72 /* proj.ios */ = {
isa = PBXGroup;
children = (
1AC35C6E18CECF1400F37B72 /* Classes */,
1AC35C7318CECF1400F37B72 /* Default-568h@2x.png */,
1AC35C7418CECF1400F37B72 /* Default.png */,
1AC35C7518CECF1400F37B72 /* Default@2x.png */,
1AC35C7618CECF1400F37B72 /* Icon-100.png */,
1AC35C7718CECF1400F37B72 /* Icon-114.png */,
1AC35C7818CECF1400F37B72 /* Icon-120.png */,
1AC35C7918CECF1400F37B72 /* Icon-144.png */,
1AC35C7A18CECF1400F37B72 /* Icon-152.png */,
1AC35C7B18CECF1400F37B72 /* Icon-29.png */,
1AC35C7C18CECF1400F37B72 /* Icon-40.png */,
1AC35C7D18CECF1400F37B72 /* Icon-50.png */,
1AC35C7E18CECF1400F37B72 /* Icon-57.png */,
1AC35C7F18CECF1400F37B72 /* Icon-58.png */,
1AC35C8018CECF1400F37B72 /* Icon-72.png */,
1AC35C8118CECF1400F37B72 /* Icon-76.png */,
1AC35C8218CECF1400F37B72 /* Icon-80.png */,
1AC35D0E18CED89E00F37B72 /* Info.plist */,
1AC35C8418CECF1400F37B72 /* main.m */,
);
name = proj.ios;
path = "../tests/cpp-tests/proj.ios";
sourceTree = "<group>";
};
1AC35C6E18CECF1400F37B72 /* Classes */ = {
isa = PBXGroup;
children = (
1AC35C6F18CECF1400F37B72 /* RootViewController.h */,
1AC35C7018CECF1400F37B72 /* RootViewController.mm */,
1AC35C7118CECF1400F37B72 /* testsAppDelegate.h */,
1AC35C7218CECF1400F37B72 /* testsAppDelegate.mm */,
);
path = Classes;
sourceTree = "<group>";
};
1AC35C9A18CECF1E00F37B72 /* proj.mac */ = {
isa = PBXGroup;
children = (
1AC35D0C18CED89100F37B72 /* Info.plist */,
1AC35C9B18CECF1E00F37B72 /* InfoPlist.strings */,
1AC35C9D18CECF1E00F37B72 /* MainMenu.xib */,
1AC35C9F18CECF1E00F37B72 /* Icon.icns */,
1AC35CA018CECF1E00F37B72 /* main.cpp */,
);
name = proj.mac;
path = "../tests/cpp-tests/proj.mac";
sourceTree = "<group>";
};
1AC35CA818CED83500F37B72 /* Resources */ = {
isa = PBXGroup;
children = (
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E75194AECF800FF2BE4 /* ActionTimeline */,
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
B2507B6A192589AF00FA4972 /* Shaders3D */,
3E92EA841921A7720094CD21 /* Sprite3DTest */,
Update XCode project.pbxproj for add files related to VideoWidget.
2014-05-08 18:28:28 +08:00
3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35CA918CED84500F37B72 /* animations */,
1AC35CAE18CED84500F37B72 /* ccb */,
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
1A221C9B191771E300FD2BE4 /* ccs-res */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35CB318CED84500F37B72 /* components */,
1AC35CB418CED84500F37B72 /* configs */,
1AC35CB818CED84500F37B72 /* extensions */,
1AC35CBA18CED84500F37B72 /* fonts */,
1AC35CBC18CED84500F37B72 /* hd */,
1AC35CBE18CED84500F37B72 /* Images */,
1AC35CC118CED84500F37B72 /* Misc */,
1AC35CC318CED84500F37B72 /* Particles */,
1AC35CC618CED84500F37B72 /* Shaders */,
1AC35CC718CED84500F37B72 /* spine */,
1AC35CC818CED84500F37B72 /* TileMaps */,
1AC35CC918CED84500F37B72 /* zwoptex */,
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
C08689C018D370C90093E810 /* background.caf */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35CAF18CED84500F37B72 /* CocosBuilderExample.ccbproj */,
1AC35CB018CED84500F37B72 /* CocosBuilderExample.ccbresourcelog */,
1AC35CC218CED84500F37B72 /* music.mid */,
1AC35CAC18CED84500F37B72 /* background.mp3 */,
1AC35CAD18CED84500F37B72 /* background.ogg */,
1AC35CB718CED84500F37B72 /* effect2.ogg */,
1AC35CB918CED84500F37B72 /* fileLookup.plist */,
1AC35CBD18CED84500F37B72 /* Hello.png */,
1AC35CB518CED84500F37B72 /* effect1.raw */,
1AC35CB618CED84500F37B72 /* effect1.wav */,
1AC35CC418CED84500F37B72 /* pew-pew-lei.wav */,
);
name = Resources;
sourceTree = "<group>";
};
1AC35D2418CEDE5600F37B72 /* lua-empty-test */ = {
isa = PBXGroup;
children = (
1AC35D2D18CEDE7D00F37B72 /* project */,
1AC35D2718CEDE7200F37B72 /* res */,
1AC35D2818CEDE7200F37B72 /* src */,
);
name = "lua-empty-test";
sourceTree = "<group>";
};
1AC35D2D18CEDE7D00F37B72 /* project */ = {
isa = PBXGroup;
children = (
1AC35D2E18CEDE8B00F37B72 /* Classes */,
1AC35D3318CEDE9400F37B72 /* proj.ios */,
1AC35D5318CEDE9E00F37B72 /* proj.mac */,
);
name = project;
sourceTree = "<group>";
};
1AC35D2E18CEDE8B00F37B72 /* Classes */ = {
isa = PBXGroup;
children = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B77198B843300DC375D /* lua_module_register.h */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D2F18CEDE8B00F37B72 /* AppDelegate.cpp */,
1AC35D3018CEDE8B00F37B72 /* AppDelegate.h */,
);
name = Classes;
path = "../tests/lua-empty-test/project/Classes";
sourceTree = "<group>";
};
1AC35D3318CEDE9400F37B72 /* proj.ios */ = {
isa = PBXGroup;
children = (
1AC35D3418CEDE9400F37B72 /* AppController.h */,
1AC35D3518CEDE9400F37B72 /* AppController.mm */,
1AC35D3618CEDE9400F37B72 /* Default-568h@2x.png */,
1AC35D3718CEDE9400F37B72 /* Default.png */,
1AC35D3818CEDE9400F37B72 /* Default@2x.png */,
1AC35D3918CEDE9400F37B72 /* HelloLua_Prefix.pch */,
1AC35D3A18CEDE9400F37B72 /* Icon-114.png */,
1AC35D3B18CEDE9400F37B72 /* Icon-120.png */,
1AC35D3C18CEDE9400F37B72 /* Icon-144.png */,
1AC35D3D18CEDE9400F37B72 /* Icon-152.png */,
1AC35D3E18CEDE9400F37B72 /* Icon-57.png */,
1AC35D3F18CEDE9400F37B72 /* Icon-72.png */,
1AC35D4018CEDE9400F37B72 /* Icon-76.png */,
1AC35D4118CEDE9400F37B72 /* Info.plist */,
1AC35D4218CEDE9400F37B72 /* main.m */,
1AC35D4318CEDE9400F37B72 /* RootViewController.h */,
1AC35D4418CEDE9400F37B72 /* RootViewController.mm */,
);
name = proj.ios;
path = "../tests/lua-empty-test/project/proj.ios";
sourceTree = "<group>";
};
1AC35D5318CEDE9E00F37B72 /* proj.mac */ = {
isa = PBXGroup;
children = (
1AC35D5418CEDE9E00F37B72 /* InfoPlist.strings */,
1AC35D5618CEDE9E00F37B72 /* MainMenu.xib */,
1AC35D5818CEDE9E00F37B72 /* HelloLua_Prefix.pch */,
1AC35D5918CEDE9E00F37B72 /* Icon.icns */,
1AC35D5A18CEDE9E00F37B72 /* Info.plist */,
1AC35D5B18CEDE9E00F37B72 /* main.cpp */,
);
name = proj.mac;
path = "../tests/lua-empty-test/project/proj.mac";
sourceTree = "<group>";
};
1AC35D7118CEE4AE00F37B72 /* lua-tests */ = {
isa = PBXGroup;
children = (
1AC35D7B18CEE5A100F37B72 /* project */,
1AC35D7718CEE58D00F37B72 /* res */,
1AC35D7418CEE58500F37B72 /* src */,
);
name = "lua-tests";
sourceTree = "<group>";
};
1AC35D7718CEE58D00F37B72 /* res */ = {
isa = PBXGroup;
children = (
1AC35D7818CEE59900F37B72 /* cocosbuilderRes */,
);
name = res;
sourceTree = "<group>";
};
1AC35D7B18CEE5A100F37B72 /* project */ = {
isa = PBXGroup;
children = (
1AC35D7C18CEE5B100F37B72 /* Classes */,
1AC35D8518CEE5D100F37B72 /* ios */,
1AC35DA718CEE5DA00F37B72 /* mac */,
);
name = project;
sourceTree = "<group>";
};
1AC35D7C18CEE5B100F37B72 /* Classes */ = {
isa = PBXGroup;
children = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B76198B750300DC375D /* lua_module_register.h */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D7D18CEE5B100F37B72 /* AppDelegate.cpp */,
1AC35D7E18CEE5B100F37B72 /* AppDelegate.h */,
1AC35D7F18CEE5B100F37B72 /* lua_assetsmanager_test_sample.cpp */,
1AC35D8018CEE5B100F37B72 /* lua_assetsmanager_test_sample.h */,
);
name = Classes;
path = "../tests/lua-tests/project/Classes";
sourceTree = "<group>";
};
1AC35D8518CEE5D100F37B72 /* ios */ = {
isa = PBXGroup;
children = (
1AC35D8618CEE5D100F37B72 /* AppController.h */,
1AC35D8718CEE5D100F37B72 /* AppController.mm */,
1AC35D8818CEE5D100F37B72 /* Default-568h@2x.png */,
1AC35D8918CEE5D100F37B72 /* Default.png */,
1AC35D8A18CEE5D100F37B72 /* Default@2x.png */,
1AC35D8B18CEE5D100F37B72 /* Icon-114.png */,
1AC35D8C18CEE5D100F37B72 /* Icon-120.png */,
1AC35D8D18CEE5D100F37B72 /* Icon-144.png */,
1AC35D8E18CEE5D100F37B72 /* Icon-152.png */,
1AC35D8F18CEE5D100F37B72 /* Icon-57.png */,
1AC35D9018CEE5D100F37B72 /* Icon-72.png */,
1AC35D9118CEE5D100F37B72 /* Icon-76.png */,
1AC35D9218CEE5D100F37B72 /* Info.plist */,
1AC35D9318CEE5D100F37B72 /* LuaObjectCBridgeTest.h */,
1AC35D9418CEE5D100F37B72 /* LuaObjectCBridgeTest.mm */,
1AC35D9518CEE5D100F37B72 /* main.m */,
1AC35D9618CEE5D100F37B72 /* RootViewController.h */,
1AC35D9718CEE5D100F37B72 /* RootViewController.mm */,
);
name = ios;
path = "../tests/lua-tests/project/proj.ios_mac/ios";
sourceTree = "<group>";
};
1AC35DA718CEE5DA00F37B72 /* mac */ = {
isa = PBXGroup;
children = (
1AC35DA818CEE5DA00F37B72 /* InfoPlist.strings */,
1AC35DAA18CEE5DA00F37B72 /* MainMenu.xib */,
1AC35DAC18CEE5DA00F37B72 /* Icon.icns */,
1AC35DAD18CEE5DA00F37B72 /* Info.plist */,
1AC35DAE18CEE5DA00F37B72 /* LuaObjectCBridgeTest.h */,
1AC35DAF18CEE5DA00F37B72 /* LuaObjectCBridgeTest.mm */,
1AC35DB018CEE5DA00F37B72 /* main.cpp */,
);
name = mac;
path = "../tests/lua-tests/project/proj.ios_mac/mac";
sourceTree = "<group>";
};
1AC35E0318CEE78300F37B72 /* tests */ = {
isa = PBXGroup;
children = (
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA087196EE66D005877BB /* lua-game-controller-test */,
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6176B51960FA6300DE83F5 /* game-controller-test */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC358B618CEC19F00F37B72 /* cpp-empty-test */,
1AC3592118CECEFF00F37B72 /* cpp-tests */,
1AC35D2418CEDE5600F37B72 /* lua-empty-test */,
1AC35D7118CEE4AE00F37B72 /* lua-tests */,
);
name = tests;
sourceTree = "<group>";
};
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D17191B571F0066F8DF /* UITest */ = {
isa = PBXGroup;
children = (
29080D1E191B595E0066F8DF /* CocoStudioGUITest */,
);
name = UITest;
sourceTree = "<group>";
};
29080D1E191B595E0066F8DF /* CocoStudioGUITest */ = {
isa = PBXGroup;
children = (
add cocostudio parser test template
2014-07-07 17:38:11 +08:00
29080D1A191B574B0066F8DF /* UITest.cpp */,
29080D1B191B574B0066F8DF /* UITest.h */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D21191B595E0066F8DF /* CocoStudioGUITest.cpp */,
29080D22191B595E0066F8DF /* CocoStudioGUITest.h */,
add cocostudio parser test template
2014-07-07 17:38:11 +08:00
29FBBC00196A9F0D00E65826 /* UIAndEditorTests */,
29FBBBFB196A9ECD00E65826 /* CocostudioParserTest */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D25191B595E0066F8DF /* CustomTest */,
);
name = CocoStudioGUITest;
path = UITest/CocoStudioGUITest;
sourceTree = "<group>";
};
29080D25191B595E0066F8DF /* CustomTest */ = {
isa = PBXGroup;
children = (
update ccs-res and add custom ImageView and custom particle widget support
2014-07-09 11:35:53 +08:00
29080D2C191B595E0066F8DF /* CustomWidget */,
add cocostudio parser test template
2014-07-07 17:38:11 +08:00
29080D23191B595E0066F8DF /* CustomGUIScene.cpp */,
29080D24191B595E0066F8DF /* CustomGUIScene.h */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D26191B595E0066F8DF /* CustomImageTest */,
29080D29191B595E0066F8DF /* CustomParticleWidgetTest */,
);
path = CustomTest;
sourceTree = "<group>";
};
29080D26191B595E0066F8DF /* CustomImageTest */ = {
isa = PBXGroup;
children = (
29080D27191B595E0066F8DF /* CustomImageTest.cpp */,
29080D28191B595E0066F8DF /* CustomImageTest.h */,
);
path = CustomImageTest;
sourceTree = "<group>";
};
29080D29191B595E0066F8DF /* CustomParticleWidgetTest */ = {
isa = PBXGroup;
children = (
29080D2A191B595E0066F8DF /* CustomParticleWidgetTest.cpp */,
29080D2B191B595E0066F8DF /* CustomParticleWidgetTest.h */,
);
path = CustomParticleWidgetTest;
sourceTree = "<group>";
};
29080D2C191B595E0066F8DF /* CustomWidget */ = {
issue #4861. add a horizontal focus test
2014-05-04 16:31:24 +08:00
isa = PBXGroup;
children = (
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D2D191B595E0066F8DF /* CustomImageView.cpp */,
29080D2E191B595E0066F8DF /* CustomImageView.h */,
29080D2F191B595E0066F8DF /* CustomImageViewReader.cpp */,
29080D30191B595E0066F8DF /* CustomImageViewReader.h */,
29080D31191B595E0066F8DF /* CustomParticleWidget.cpp */,
29080D32191B595E0066F8DF /* CustomParticleWidget.h */,
29080D33191B595E0066F8DF /* CustomParticleWidgetReader.cpp */,
29080D34191B595E0066F8DF /* CustomParticleWidgetReader.h */,
29080D35191B595E0066F8DF /* CustomReader.cpp */,
29080D36191B595E0066F8DF /* CustomReader.h */,
);
update ccs-res and add custom ImageView and custom particle widget support
2014-07-09 11:35:53 +08:00
name = CustomWidget;
path = ../CustomWidget;
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
sourceTree = "<group>";
};
29080D39191B595E0066F8DF /* UIButtonTest */ = {
isa = PBXGroup;
children = (
29080D3A191B595E0066F8DF /* UIButtonTest.cpp */,
29080D3B191B595E0066F8DF /* UIButtonTest.h */,
29080D3C191B595E0066F8DF /* UIButtonTest_Editor.cpp */,
29080D3D191B595E0066F8DF /* UIButtonTest_Editor.h */,
);
path = UIButtonTest;
sourceTree = "<group>";
};
29080D3E191B595E0066F8DF /* UICheckBoxTest */ = {
isa = PBXGroup;
children = (
29080D3F191B595E0066F8DF /* UICheckBoxTest.cpp */,
29080D40191B595E0066F8DF /* UICheckBoxTest.h */,
29080D41191B595E0066F8DF /* UICheckBoxTest_Editor.cpp */,
29080D42191B595E0066F8DF /* UICheckBoxTest_Editor.h */,
);
path = UICheckBoxTest;
sourceTree = "<group>";
};
29080D43191B595E0066F8DF /* UIFocusTest */ = {
isa = PBXGroup;
children = (
29080D44191B595E0066F8DF /* UIFocusTest.cpp */,
29080D45191B595E0066F8DF /* UIFocusTest.h */,
issue #4861. add a horizontal focus test
2014-05-04 16:31:24 +08:00
);
issue #4861, Merge branch 'v3' into focus3861 Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj
2014-05-05 17:40:28 +08:00
path = UIFocusTest;
issue #4861. add a horizontal focus test
2014-05-04 16:31:24 +08:00
sourceTree = "<group>";
};
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D46191B595E0066F8DF /* UIImageViewTest */ = {
isa = PBXGroup;
children = (
29080D47191B595E0066F8DF /* UIImageViewTest.cpp */,
29080D48191B595E0066F8DF /* UIImageViewTest.h */,
29080D49191B595E0066F8DF /* UIImageViewTest_Editor.cpp */,
29080D4A191B595E0066F8DF /* UIImageViewTest_Editor.h */,
);
path = UIImageViewTest;
sourceTree = "<group>";
};
29080D4B191B595E0066F8DF /* UILayoutTest */ = {
isa = PBXGroup;
children = (
29080D4C191B595E0066F8DF /* UILayoutTest.cpp */,
29080D4D191B595E0066F8DF /* UILayoutTest.h */,
29080D4E191B595E0066F8DF /* UILayoutTest_Editor.cpp */,
29080D4F191B595E0066F8DF /* UILayoutTest_Editor.h */,
);
path = UILayoutTest;
sourceTree = "<group>";
};
29080D50191B595E0066F8DF /* UIListViewTest */ = {
isa = PBXGroup;
children = (
29080D51191B595E0066F8DF /* UIListViewTest.cpp */,
29080D52191B595E0066F8DF /* UIListViewTest.h */,
29080D53191B595E0066F8DF /* UIListViewTest_Editor.cpp */,
29080D54191B595E0066F8DF /* UIListViewTest_Editor.h */,
);
path = UIListViewTest;
sourceTree = "<group>";
};
29080D55191B595E0066F8DF /* UILoadingBarTest */ = {
isa = PBXGroup;
children = (
29080D56191B595E0066F8DF /* UILoadingBarTest.cpp */,
29080D57191B595E0066F8DF /* UILoadingBarTest.h */,
29080D58191B595E0066F8DF /* UILoadingBarTest_Editor.cpp */,
29080D59191B595E0066F8DF /* UILoadingBarTest_Editor.h */,
);
path = UILoadingBarTest;
sourceTree = "<group>";
};
29080D5A191B595E0066F8DF /* UIPageViewTest */ = {
isa = PBXGroup;
children = (
29080D5B191B595E0066F8DF /* UIPageViewTest.cpp */,
29080D5C191B595E0066F8DF /* UIPageViewTest.h */,
29080D5D191B595E0066F8DF /* UIPageViewTest_Editor.cpp */,
29080D5E191B595E0066F8DF /* UIPageViewTest_Editor.h */,
);
path = UIPageViewTest;
sourceTree = "<group>";
};
29080D5F191B595E0066F8DF /* UIRichTextTest */ = {
isa = PBXGroup;
children = (
29080D60191B595E0066F8DF /* UIRichTextTest.cpp */,
29080D61191B595E0066F8DF /* UIRichTextTest.h */,
);
path = UIRichTextTest;
sourceTree = "<group>";
};
29080D6A191B595E0066F8DF /* UIScrollViewTest */ = {
isa = PBXGroup;
children = (
29080D6B191B595E0066F8DF /* UIScrollViewTest.cpp */,
29080D6C191B595E0066F8DF /* UIScrollViewTest.h */,
29080D6D191B595E0066F8DF /* UIScrollViewTest_Editor.cpp */,
29080D6E191B595E0066F8DF /* UIScrollViewTest_Editor.h */,
);
path = UIScrollViewTest;
sourceTree = "<group>";
};
29080D6F191B595E0066F8DF /* UISliderTest */ = {
isa = PBXGroup;
children = (
29080D70191B595E0066F8DF /* UISliderTest.cpp */,
29080D71191B595E0066F8DF /* UISliderTest.h */,
29080D72191B595E0066F8DF /* UISliderTest_Editor.cpp */,
29080D73191B595E0066F8DF /* UISliderTest_Editor.h */,
);
path = UISliderTest;
sourceTree = "<group>";
};
29080D74191B595E0066F8DF /* UITextAtlasTest */ = {
isa = PBXGroup;
children = (
29080D75191B595E0066F8DF /* UITextAtlasTest.cpp */,
29080D76191B595E0066F8DF /* UITextAtlasTest.h */,
29080D77191B595E0066F8DF /* UITextAtlasTest_Editor.cpp */,
29080D78191B595E0066F8DF /* UITextAtlasTest_Editor.h */,
);
path = UITextAtlasTest;
sourceTree = "<group>";
};
29080D79191B595E0066F8DF /* UITextBMFontTest */ = {
isa = PBXGroup;
children = (
29080D7A191B595E0066F8DF /* UITextBMFontTest.cpp */,
29080D7B191B595E0066F8DF /* UITextBMFontTest.h */,
29080D7C191B595E0066F8DF /* UITextBMFontTest_Editor.cpp */,
29080D7D191B595E0066F8DF /* UITextBMFontTest_Editor.h */,
);
path = UITextBMFontTest;
sourceTree = "<group>";
};
29080D7E191B595E0066F8DF /* UITextFieldTest */ = {
isa = PBXGroup;
children = (
29080D7F191B595E0066F8DF /* UITextFieldTest.cpp */,
29080D80191B595E0066F8DF /* UITextFieldTest.h */,
29080D81191B595E0066F8DF /* UITextFieldTest_Editor.cpp */,
29080D82191B595E0066F8DF /* UITextFieldTest_Editor.h */,
);
path = UITextFieldTest;
sourceTree = "<group>";
};
29080D83191B595E0066F8DF /* UITextTest */ = {
isa = PBXGroup;
children = (
29080D84191B595E0066F8DF /* UITextTest.cpp */,
29080D85191B595E0066F8DF /* UITextTest.h */,
29080D86191B595E0066F8DF /* UITextTest_Editor.cpp */,
29080D87191B595E0066F8DF /* UITextTest_Editor.h */,
);
path = UITextTest;
sourceTree = "<group>";
};
29080D88191B595E0066F8DF /* UIWidgetAddNodeTest */ = {
isa = PBXGroup;
children = (
29080D89191B595E0066F8DF /* UIWidgetAddNodeTest.cpp */,
29080D8A191B595E0066F8DF /* UIWidgetAddNodeTest.h */,
29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */,
29080D8C191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.h */,
);
path = UIWidgetAddNodeTest;
sourceTree = "<group>";
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */,
1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
1ABCA36418CD9E060087CE3A /* Lua Common */,
19C28FACFE9D520D11CA2CBB /* Products */,
1AC35E0318CEE78300F37B72 /* tests */,
);
name = CustomTemplate;
sourceTree = "<group>";
};
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
15EE465A19A7200300AF29F1 /* libcurl.a */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA9DC196EEAA6005877BB /* libz.dylib */,
15CBA9DA196EEA90005877BB /* CoreMotion.framework */,
15CBA9D8196EEA7D005877BB /* QuartzCore.framework */,
15CBA9D6196EEA63005877BB /* AudioToolbox.framework */,
15CBA9D3196EEA33005877BB /* OpenAL.framework */,
15CBA9C8196EE97F005877BB /* CoreGraphics.framework */,
15CBA9C6196EE971005877BB /* OpenGLES.framework */,
15CBA9C4196EE962005877BB /* UIKit.framework */,
15CBA9C2196EE951005877BB /* AVFoundation.framework */,
15CBA9C0196EE943005877BB /* Foundation.framework */,
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E61773C1960FBD100DE83F5 /* GameController.framework */,
3E61773A1960FBC300DE83F5 /* CFNetwork.framework */,
3E6177381960FBB800DE83F5 /* SystemConfiguration.framework */,
Update XCode project.pbxproj for add files related to VideoWidget.
2014-05-08 18:28:28 +08:00
3EA0FB65191B933000B170C8 /* MediaPlayer.framework */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1ABCA3AF18CDA06D0087CE3A /* libz.dylib */,
1ABCA3A818CD9F130087CE3A /* AudioToolbox.framework */,
1ABCA3A618CD9F0D0087CE3A /* OpenAL.framework */,
1ABCA3A418CD9F060087CE3A /* QuartzCore.framework */,
1ABCA3A218CD9EFE0087CE3A /* CoreGraphics.framework */,
1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */,
1ABCA39E18CD9EE50087CE3A /* UIKit.framework */,
1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */,
1ABCA36018CD9AC00087CE3A /* libz.dylib */,
1ABCA35C18CD9A9E0087CE3A /* AudioToolbox.framework */,
1ABCA35A18CD9A950087CE3A /* ApplicationServices.framework */,
1ABCA35818CD9A8F0087CE3A /* OpenAL.framework */,
1ABCA35618CD9A890087CE3A /* QuartzCore.framework */,
1ABCA35418CD9A820087CE3A /* OpenGL.framework */,
D60AE43317F7FFE100757E4B /* CoreMotion.framework */,
A035A71117822E9E00987F6C /* libsqlite3.dylib */,
1A9F808C177E98A600D9A1CB /* libcurl.dylib */,
15C6482E165F399D007D4F18 /* libz.dylib */,
EDCC747E17C455FD007B692C /* IOKit.framework */,
A07A52C11783B01F0073F6A7 /* AVFoundation.framework */,
A07A52BB1783AEB80073F6A7 /* CoreGraphics.framework */,
A07A52B91783AE900073F6A7 /* OpenGLES.framework */,
A07A52B71783AE6D0073F6A7 /* UIKit.framework */,
15C6482C165F3988007D4F18 /* AudioToolbox.framework */,
15C6482A165F3979007D4F18 /* ApplicationServices.framework */,
15C64828165F396B007D4F18 /* OpenAL.framework */,
15C64826165F394E007D4F18 /* QuartzCore.framework */,
15C64824165F3934007D4F18 /* OpenGL.framework */,
15C64822165F391E007D4F18 /* Cocoa.framework */,
15C64832165F3AFD007D4F18 /* Foundation.framework */,
1ABCA2A518CD91520087CE3A /* XCTest.framework */,
1ABCA28818CD91510087CE3A /* Other Frameworks */,
);
name = Frameworks;
sourceTree = "<group>";
};
add cocostudio parser test template
2014-07-07 17:38:11 +08:00
29FBBBFB196A9ECD00E65826 /* CocostudioParserTest */ = {
isa = PBXGroup;
children = (
fix ios project bug
2014-07-11 14:55:00 +08:00
290E94B3196FC16900694919 /* CocostudioParserTest.cpp */,
290E94B4196FC16900694919 /* CocostudioParserTest.h */,
add Cocostudio 1.3,1.4, 1.5 ui tests
2014-07-08 17:02:50 +08:00
29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */,
29FBBBFD196A9ECD00E65826 /* CocostudioParserJsonTest.h */,
add cocostudio parser test template
2014-07-07 17:38:11 +08:00
);
path = CocostudioParserTest;
sourceTree = "<group>";
};
29FBBC00196A9F0D00E65826 /* UIAndEditorTests */ = {
isa = PBXGroup;
children = (
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
295824571987415900F9746D /* UIScale9SpriteTest.cpp */,
295824581987415900F9746D /* UIScale9SpriteTest.h */,
add cocostudio parser test template
2014-07-07 17:38:11 +08:00
29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */,
29080D20191B595E0066F8DF /* CocosGUIScene.h */,
29080D37191B595E0066F8DF /* GUIEditorTest.cpp */,
29080D38191B595E0066F8DF /* GUIEditorTest.h */,
29080D62191B595E0066F8DF /* UIScene.cpp */,
29080D63191B595E0066F8DF /* UIScene.h */,
29080D64191B595E0066F8DF /* UIScene_Editor.cpp */,
29080D65191B595E0066F8DF /* UIScene_Editor.h */,
29080D66191B595E0066F8DF /* UISceneManager.cpp */,
29080D67191B595E0066F8DF /* UISceneManager.h */,
29080D68191B595E0066F8DF /* UISceneManager_Editor.cpp */,
29080D69191B595E0066F8DF /* UISceneManager_Editor.h */,
29080D6A191B595E0066F8DF /* UIScrollViewTest */,
29080D6F191B595E0066F8DF /* UISliderTest */,
29080D74191B595E0066F8DF /* UITextAtlasTest */,
29080D79191B595E0066F8DF /* UITextBMFontTest */,
29080D7E191B595E0066F8DF /* UITextFieldTest */,
29080D83191B595E0066F8DF /* UITextTest */,
29080D88191B595E0066F8DF /* UIWidgetAddNodeTest */,
29080D39191B595E0066F8DF /* UIButtonTest */,
29080D3E191B595E0066F8DF /* UICheckBoxTest */,
29080D43191B595E0066F8DF /* UIFocusTest */,
29080D46191B595E0066F8DF /* UIImageViewTest */,
29080D4B191B595E0066F8DF /* UILayoutTest */,
29080D50191B595E0066F8DF /* UIListViewTest */,
29080D55191B595E0066F8DF /* UILoadingBarTest */,
29080D5A191B595E0066F8DF /* UIPageViewTest */,
29080D5F191B595E0066F8DF /* UIRichTextTest */,
3EA0FB6F191C844400B170C8 /* UIVideoPlayerTest */,
);
name = UIAndEditorTests;
sourceTree = "<group>";
};
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E70194AEBE100FF2BE4 /* CocoStudioActionTimelineTest */ = {
add TimeLineAction into project
2014-06-12 16:27:45 +08:00
isa = PBXGroup;
children = (
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */,
38FA2E72194AEBE100FF2BE4 /* ActionTimelineTestScene.h */,
add TimeLineAction into project
2014-06-12 16:27:45 +08:00
);
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
path = CocoStudioActionTimelineTest;
add TimeLineAction into project
2014-06-12 16:27:45 +08:00
sourceTree = "<group>";
};
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6176B51960FA6300DE83F5 /* game-controller-test */ = {
isa = PBXGroup;
children = (
3E6177EF1960FEE300DE83F5 /* Resource */,
3E6176B61960FA6300DE83F5 /* Classes */,
3E6176DC1960FA6300DE83F5 /* proj.ios */,
);
name = "game-controller-test";
path = "../tests/game-controller-test";
sourceTree = "<group>";
};
3E6176B61960FA6300DE83F5 /* Classes */ = {
isa = PBXGroup;
children = (
3E6176B71960FA6300DE83F5 /* AppDelegate.cpp */,
3E6176B81960FA6300DE83F5 /* AppDelegate.h */,
3E6176B91960FA6300DE83F5 /* AppMacros.h */,
3E6176BA1960FA6300DE83F5 /* GameControllerTest.cpp */,
3E6176BB1960FA6300DE83F5 /* GameControllerTest.h */,
);
path = Classes;
sourceTree = "<group>";
};
3E6176DC1960FA6300DE83F5 /* proj.ios */ = {
isa = PBXGroup;
children = (
3E6176DD1960FA6300DE83F5 /* AppController.h */,
3E6176DE1960FA6300DE83F5 /* AppController.mm */,
3E6176DF1960FA6300DE83F5 /* Default-568h@2x.png */,
3E6176E01960FA6300DE83F5 /* Default.png */,
3E6176E11960FA6300DE83F5 /* Default@2x.png */,
3E6176E21960FA6300DE83F5 /* Icon-100.png */,
3E6176E31960FA6300DE83F5 /* Icon-114.png */,
3E6176E41960FA6300DE83F5 /* Icon-120.png */,
3E6176E51960FA6300DE83F5 /* Icon-144.png */,
3E6176E61960FA6300DE83F5 /* Icon-152.png */,
3E6176E71960FA6300DE83F5 /* Icon-40.png */,
3E6176E81960FA6300DE83F5 /* Icon-57.png */,
3E6176E91960FA6300DE83F5 /* Icon-58.png */,
3E6176EA1960FA6300DE83F5 /* Icon-72.png */,
3E6176EB1960FA6300DE83F5 /* Icon-76.png */,
3E6176EC1960FA6300DE83F5 /* Icon-80.png */,
3E6176ED1960FA6300DE83F5 /* Info.plist */,
3E6176EE1960FA6300DE83F5 /* main.m */,
3E6176EF1960FA6300DE83F5 /* RootViewController.h */,
3E6176F01960FA6300DE83F5 /* RootViewController.mm */,
);
path = proj.ios;
sourceTree = "<group>";
};
3E6177EF1960FEE300DE83F5 /* Resource */ = {
isa = PBXGroup;
children = (
3E6177F01960FEFE00DE83F5 /* fonts */,
3E6177F11960FEFE00DE83F5 /* ipad */,
3E6177F21960FEFE00DE83F5 /* ipadhd */,
3E6177F31960FEFE00DE83F5 /* iphone */,
);
name = Resource;
sourceTree = "<group>";
};
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
3E92EA7D1921A0C60094CD21 /* Sprite3DTest */ = {
isa = PBXGroup;
children = (
1. move drawnode3d to Sprite3DTest 2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
5EBEECAE1995247000429821 /* DrawNode3D.cpp */,
5EBEECAF1995247000429821 /* DrawNode3D.h */,
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */,
3E92EA811921A1400094CD21 /* Sprite3DTest.h */,
);
name = Sprite3DTest;
sourceTree = "<group>";
};
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
3E9E75CB199324A8005B7047 /* Camera3DTest */ = {
isa = PBXGroup;
children = (
3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */,
3E9E75CF199324CB005B7047 /* Camera3DTest.h */,
);
name = Camera3DTest;
sourceTree = "<group>";
};
update XCode project.pbxproj
2014-05-09 11:37:14 +08:00
3EA0FB6F191C844400B170C8 /* UIVideoPlayerTest */ = {
Update XCode project.pbxproj for add files related to VideoWidget.
2014-05-08 18:28:28 +08:00
isa = PBXGroup;
children = (
update XCode project.pbxproj
2014-05-09 11:37:14 +08:00
3EA0FB70191C844400B170C8 /* UIVideoPlayerTest.cpp */,
3EA0FB71191C844400B170C8 /* UIVideoPlayerTest.h */,
Update XCode project.pbxproj for add files related to VideoWidget.
2014-05-08 18:28:28 +08:00
);
update XCode project.pbxproj
2014-05-09 11:37:14 +08:00
path = UIVideoPlayerTest;
Update XCode project.pbxproj for add files related to VideoWidget.
2014-05-08 18:28:28 +08:00
sourceTree = "<group>";
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
46A15F9D1807A4F8005B8026 /* Products */ = {
isa = PBXGroup;
children = (
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */,
46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA015196EE56C005877BB /* lua-game-controller-test iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 15CBA060196EE56C005877BB /* Build configuration list for PBXNativeTarget "lua-game-controller-test iOS" */;
buildPhases = (
15CBA020196EE56C005877BB /* Sources */,
15CBA025196EE56C005877BB /* Frameworks */,
15CBA036196EE56C005877BB /* Resources */,
);
buildRules = (
);
dependencies = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B9D198B8C0500DC375D /* PBXTargetDependency */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA016196EE56C005877BB /* PBXTargetDependency */,
);
name = "lua-game-controller-test iOS";
productName = "Test lua iOS";
productReference = 15CBA063196EE56C005877BB /* lua-game-controller-test iOS.app */;
productType = "com.apple.product-type.application";
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE1C618CDF6DA004CD58F /* cpp-empty-test Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1A0EE2AF18CDF6DA004CD58F /* Build configuration list for PBXNativeTarget "cpp-empty-test Mac" */;
buildPhases = (
1A0EE1D118CDF6DA004CD58F /* Resources */,
1A0EE1F618CDF6DA004CD58F /* Sources */,
1A0EE29F18CDF6DA004CD58F /* Frameworks */,
);
buildRules = (
);
dependencies = (
1A0EE1C718CDF6DA004CD58F /* PBXTargetDependency */,
);
name = "cpp-empty-test Mac";
productName = iphone;
productReference = 1A0EE2B218CDF6DA004CD58F /* cpp-empty-test Mac.app */;
productType = "com.apple.product-type.application";
};
1A0EE2B818CDF733004CD58F /* lua-empty-test Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1A0EE31118CDF733004CD58F /* Build configuration list for PBXNativeTarget "lua-empty-test Mac" */;
buildPhases = (
1A0EE2C318CDF733004CD58F /* Sources */,
1A0EE2C818CDF733004CD58F /* Frameworks */,
1A0EE2D818CDF733004CD58F /* Resources */,
);
buildRules = (
);
dependencies = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427BA5198B8C2E00DC375D /* PBXTargetDependency */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE2BB18CDF733004CD58F /* PBXTargetDependency */,
);
name = "lua-empty-test Mac";
productName = "Test lua Mac";
productReference = 1A0EE31418CDF733004CD58F /* lua-empty-test Mac.app */;
productType = "com.apple.product-type.application";
};
1A0EE31818CDF775004CD58F /* cpp-empty-test iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1A0EE41018CDF775004CD58F /* Build configuration list for PBXNativeTarget "cpp-empty-test iOS" */;
buildPhases = (
1A0EE32318CDF775004CD58F /* Resources */,
1A0EE35518CDF775004CD58F /* Sources */,
1A0EE40018CDF775004CD58F /* Frameworks */,
);
buildRules = (
);
dependencies = (
1A0EE31918CDF775004CD58F /* PBXTargetDependency */,
);
name = "cpp-empty-test iOS";
productName = iphone;
productReference = 1A0EE41318CDF775004CD58F /* cpp-empty-test iOS.app */;
productType = "com.apple.product-type.application";
};
1A0EE41918CDF799004CD58F /* lua-empty-test iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1A0EE47B18CDF799004CD58F /* Build configuration list for PBXNativeTarget "lua-empty-test iOS" */;
buildPhases = (
1A0EE42418CDF799004CD58F /* Sources */,
1A0EE42B18CDF799004CD58F /* Frameworks */,
1A0EE43B18CDF799004CD58F /* Resources */,
);
buildRules = (
);
dependencies = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B99198B8BDE00DC375D /* PBXTargetDependency */,
15427B85198B8ACB00DC375D /* PBXTargetDependency */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
name = "lua-empty-test iOS";
productName = "Test lua iOS";
productReference = 1A0EE47E18CDF799004CD58F /* lua-empty-test iOS.app */;
productType = "com.apple.product-type.application";
};
1ABCA28518CD91510087CE3A /* lua-tests Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1ABCA2B218CD91520087CE3A /* Build configuration list for PBXNativeTarget "lua-tests Mac" */;
buildPhases = (
1ABCA28218CD91510087CE3A /* Sources */,
1ABCA28318CD91510087CE3A /* Frameworks */,
1ABCA28418CD91510087CE3A /* Resources */,
);
buildRules = (
);
dependencies = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427BB5198B8C5000DC375D /* PBXTargetDependency */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1ABCA2B918CD92230087CE3A /* PBXTargetDependency */,
);
name = "lua-tests Mac";
productName = "Test lua Mac";
productReference = 1ABCA28618CD91510087CE3A /* lua-tests Mac.app */;
productType = "com.apple.product-type.application";
};
1ABCA2CC18CD93580087CE3A /* lua-tests iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1ABCA2F118CD93590087CE3A /* Build configuration list for PBXNativeTarget "lua-tests iOS" */;
buildPhases = (
1ABCA2C918CD93580087CE3A /* Sources */,
1ABCA2CA18CD93580087CE3A /* Frameworks */,
1ABCA2CB18CD93580087CE3A /* Resources */,
);
buildRules = (
);
dependencies = (
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B95198B8BB400DC375D /* PBXTargetDependency */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1ABCA2F818CD93850087CE3A /* PBXTargetDependency */,
);
name = "lua-tests iOS";
productName = "Test lua iOS";
productReference = 1ABCA2CD18CD93580087CE3A /* lua-tests iOS.app */;
productType = "com.apple.product-type.application";
};
1D6058900D05DD3D006BFB54 /* cpp-tests Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "cpp-tests Mac" */;
buildPhases = (
1D60588D0D05DD3D006BFB54 /* Resources */,
1D60588E0D05DD3D006BFB54 /* Sources */,
1D60588F0D05DD3D006BFB54 /* Frameworks */,
);
buildRules = (
);
dependencies = (
1AAF5342180E2F41000584C8 /* PBXTargetDependency */,
);
name = "cpp-tests Mac";
productName = iphone;
productReference = 1D6058910D05DD3D006BFB54 /* cpp-tests Mac.app */;
productType = "com.apple.product-type.application";
};
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6176FF1960FAED00DE83F5 /* game-controller-test IOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 3E61772E1960FAED00DE83F5 /* Build configuration list for PBXNativeTarget "game-controller-test IOS" */;
buildPhases = (
3E6177061960FAED00DE83F5 /* Resources */,
3E61771A1960FAED00DE83F5 /* Sources */,
3E6177201960FAED00DE83F5 /* Frameworks */,
);
buildRules = (
);
dependencies = (
3E6177001960FAED00DE83F5 /* PBXTargetDependency */,
);
name = "game-controller-test IOS";
productName = iphone;
productReference = 3E6177311960FAED00DE83F5 /* game-controller-test IOS.app */;
productType = "com.apple.product-type.application";
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
A07A517F1783A1D20073F6A7 /* cpp-tests iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = A07A52261783A1D20073F6A7 /* Build configuration list for PBXNativeTarget "cpp-tests iOS" */;
buildPhases = (
A07A518A1783A1D20073F6A7 /* Resources */,
A07A51AD1783A1D20073F6A7 /* Sources */,
A07A52171783A1D20073F6A7 /* Frameworks */,
);
buildRules = (
);
dependencies = (
1AAF53F5180E39C6000584C8 /* PBXTargetDependency */,
);
name = "cpp-tests iOS";
productName = iphone;
productReference = A07A52291783A1D20073F6A7 /* cpp-tests iOS.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0510;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "cocos2d_tests" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
en,
Base,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 46A15F9D1807A4F8005B8026 /* Products */;
ProjectRef = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */;
},
{
ProductGroup = 1ABCA27718CD90A40087CE3A /* Products */;
ProjectRef = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */;
},
);
projectRoot = "";
targets = (
A035ACBB1782469700987F6C /* build all tests Mac */,
1D6058900D05DD3D006BFB54 /* cpp-tests Mac */,
1A0EE1C618CDF6DA004CD58F /* cpp-empty-test Mac */,
1ABCA28518CD91510087CE3A /* lua-tests Mac */,
1A0EE2B818CDF733004CD58F /* lua-empty-test Mac */,
A07A517B1783A1CC0073F6A7 /* build all tests iOS */,
A07A517F1783A1D20073F6A7 /* cpp-tests iOS */,
1A0EE31818CDF775004CD58F /* cpp-empty-test iOS */,
1ABCA2CC18CD93580087CE3A /* lua-tests iOS */,
1A0EE41918CDF799004CD58F /* lua-empty-test iOS */,
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6176FF1960FAED00DE83F5 /* game-controller-test IOS */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA015196EE56C005877BB /* lua-game-controller-test iOS */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libluacocos2d Mac.a";
remoteRef = 15EFA257198A4A24000C57D3 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */ = {
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
isa = PBXReferenceProxy;
fileType = archive.ar;
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
path = "libluacocos2d iOS.a";
remoteRef = 15EFA664198B33EE000C57D3 /* PBXContainerItemProxy */;
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
sourceTree = BUILT_PRODUCTS_DIR;
};
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */ = {
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
isa = PBXReferenceProxy;
fileType = archive.ar;
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
path = "libcocos2d Mac.a";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
remoteRef = 46A15FAF1807A4F9005B8026 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */ = {
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
isa = PBXReferenceProxy;
fileType = archive.ar;
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
path = "libcocos2d iOS.a";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
remoteRef = 46A15FBD1807A4F9005B8026 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA036196EE56C005877BB /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
15CBA9B3196EE824005877BB /* src in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD311998637C00302043 /* OpenglConstants.lua in Resources */,
15D1FD131998637C00302043 /* DrawPrimitives.lua in Resources */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA9AF196EE80B005877BB /* fonts in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD2C1998637C00302043 /* Opengl.lua in Resources */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA9B0196EE80B005877BB /* ipad in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD221998637C00302043 /* luaj.lua in Resources */,
15D1FD0E1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA9B1196EE80B005877BB /* ipadhd in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD091998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
15D1FCFF1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */,
15D1FCF01998637C00302043 /* bitExtend.lua in Resources */,
15D1FD041998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
15D1FD1D1998637C00302043 /* json.lua in Resources */,
15D1FD181998637C00302043 /* extern.lua in Resources */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA9B2196EE80B005877BB /* iphone in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD271998637C00302043 /* luaoc.lua in Resources */,
15D1FCFA1998637C00302043 /* Cocos2dConstants.lua in Resources */,
15D1FCF51998637C00302043 /* Cocos2d.lua in Resources */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
);
runOnlyForDeploymentPostprocessing = 0;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE1D118CDF6DA004CD58F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC3590918CEC1FB00F37B72 /* ipadhd in Resources */,
1AC358F518CEC1D400F37B72 /* InfoPlist.strings in Resources */,
1AC3590318CEC1FB00F37B72 /* bang.png in Resources */,
1AC3590718CEC1FB00F37B72 /* ipad in Resources */,
1AC3590B18CEC1FB00F37B72 /* iphone in Resources */,
1AC358F818CEC1D400F37B72 /* Icon.icns in Resources */,
1AC3590518CEC1FB00F37B72 /* fonts in Resources */,
1AC358F618CEC1D400F37B72 /* MainMenu.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1A0EE2D818CDF733004CD58F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC35D5C18CEDE9E00F37B72 /* InfoPlist.strings in Resources */,
1AC35D5D18CEDE9E00F37B72 /* MainMenu.xib in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FABD18DA8B6C00F6518C /* mime.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD2E1998637C00302043 /* OpenglConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FAC518DA8B6C00F6518C /* url.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD1F1998637C00302043 /* luaj.lua in Resources */,
15D1FCED1998637C00302043 /* bitExtend.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FABF18DA8B6C00F6518C /* smtp.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD291998637C00302043 /* Opengl.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FAB318DA8B6C00F6518C /* ftp.lua in Resources */,
1503FAB718DA8B6C00F6518C /* http.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FAC118DA8B6C00F6518C /* socket.lua in Resources */,
1503FAB918DA8B6C00F6518C /* ltn12.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
15D1FD241998637C00302043 /* luaoc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D5E18CEDE9E00F37B72 /* Icon.icns in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCF21998637C00302043 /* Cocos2d.lua in Resources */,
15D1FD061998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FABB18DA8B6C00F6518C /* mbox.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD151998637C00302043 /* extern.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FAB518DA8B6C00F6518C /* headers.lua in Resources */,
1503FAC318DA8B6C00F6518C /* tp.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD5E1998641200302043 /* DeprecatedNetworkClass.lua in Resources */,
15D1FD6A1998641200302043 /* NetworkConstants.lua in Resources */,
15D1FD011998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
15D1FD1A1998637C00302043 /* json.lua in Resources */,
15D1FD101998637C00302043 /* DrawPrimitives.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D2918CEDE7200F37B72 /* res in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCFC1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D2B18CEDE7200F37B72 /* src in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1A0EE32318CDF775004CD58F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC358E118CEC1CB00F37B72 /* Icon-120.png in Resources */,
1AC358DD18CEC1CB00F37B72 /* Default@2x.png in Resources */,
1AC358E018CEC1CB00F37B72 /* Icon-114.png in Resources */,
1AC3590418CEC1FB00F37B72 /* bang.png in Resources */,
1AC3590A18CEC1FB00F37B72 /* ipadhd in Resources */,
1AC3590C18CEC1FB00F37B72 /* iphone in Resources */,
1AC358E818CEC1CB00F37B72 /* Icon-76.png in Resources */,
1AC358E418CEC1CB00F37B72 /* Icon-40.png in Resources */,
1AC358E618CEC1CB00F37B72 /* Icon-58.png in Resources */,
1AC358DB18CEC1CB00F37B72 /* Default-568h@2x.png in Resources */,
1AC358DF18CEC1CB00F37B72 /* Icon-100.png in Resources */,
1AC358E218CEC1CB00F37B72 /* Icon-144.png in Resources */,
1AC3590618CEC1FB00F37B72 /* fonts in Resources */,
1AC358E718CEC1CB00F37B72 /* Icon-72.png in Resources */,
1AC358E918CEC1CB00F37B72 /* Icon-80.png in Resources */,
1AC3590818CEC1FB00F37B72 /* ipad in Resources */,
1AC358E318CEC1CB00F37B72 /* Icon-152.png in Resources */,
1AC358E518CEC1CB00F37B72 /* Icon-57.png in Resources */,
1AC358DC18CEC1CB00F37B72 /* Default.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1A0EE43B18CDF799004CD58F /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD171998637C00302043 /* extern.lua in Resources */,
15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D4A18CEDE9400F37B72 /* Icon-120.png in Resources */,
1503FAC018DA8B6C00F6518C /* smtp.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D4D18CEDE9400F37B72 /* Icon-57.png in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD121998637C00302043 /* DrawPrimitives.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FAB818DA8B6C00F6518C /* http.lua in Resources */,
1AC35D4B18CEDE9400F37B72 /* Icon-144.png in Resources */,
1503FAC618DA8B6C00F6518C /* url.lua in Resources */,
1AC35D4618CEDE9400F37B72 /* Default-568h@2x.png in Resources */,
1AC35D4818CEDE9400F37B72 /* Default@2x.png in Resources */,
1503FAC418DA8B6C00F6518C /* tp.lua in Resources */,
1503FABA18DA8B6C00F6518C /* ltn12.lua in Resources */,
1503FABE18DA8B6C00F6518C /* mime.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */,
15D1FD2B1998637C00302043 /* Opengl.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D4E18CEDE9400F37B72 /* Icon-72.png in Resources */,
1AC35D4F18CEDE9400F37B72 /* Icon-76.png in Resources */,
1503FAC218DA8B6C00F6518C /* socket.lua in Resources */,
1503FABC18DA8B6C00F6518C /* mbox.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD1C1998637C00302043 /* json.lua in Resources */,
15D1FCF91998637C00302043 /* Cocos2dConstants.lua in Resources */,
15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1503FAB618DA8B6C00F6518C /* headers.lua in Resources */,
1AC35D4918CEDE9400F37B72 /* Icon-114.png in Resources */,
1503FAB418DA8B6C00F6518C /* ftp.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D2A18CEDE7200F37B72 /* res in Resources */,
1AC35D2C18CEDE7200F37B72 /* src in Resources */,
1AC35D4C18CEDE9400F37B72 /* Icon-152.png in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD031998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
15D1FD211998637C00302043 /* luaj.lua in Resources */,
15D1FCFE1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */,
15D1FD6C1998641200302043 /* NetworkConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D4718CEDE9400F37B72 /* Default.png in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD261998637C00302043 /* luaoc.lua in Resources */,
15D1FD081998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
15D1FD0D1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
runOnlyForDeploymentPostprocessing = 0;
};
1ABCA28418CD91510087CE3A /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */,
Fix the actionTimelineTest crash on mac platform
2014-07-17 17:38:53 +08:00
156EAE071977D0BD00F53709 /* ActionTimeline in Resources */,
Move `setSearchPat` operation from cpp to script
2014-05-22 14:00:39 +08:00
15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD001998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
15D1FD2D1998637C00302043 /* OpenglConstants.lua in Resources */,
15D1FCF11998637C00302043 /* Cocos2d.lua in Resources */,
15D1FD47199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DC318CEE65100F37B72 /* Misc in Resources */,
1AC35DC618CEE65100F37B72 /* Shaders in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD141998637C00302043 /* extern.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DBB18CEE65100F37B72 /* components in Resources */,
1AC35DE218CEE65900F37B72 /* effect2.ogg in Resources */,
15C90B4318E66C1700D69802 /* mime.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DB118CEE5DA00F37B72 /* InfoPlist.strings in Resources */,
1AC35DDD18CEE65900F37B72 /* CocosBuilderExample.ccbproj in Resources */,
1AC35DB218CEE5DA00F37B72 /* MainMenu.xib in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD53199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DBF18CEE65100F37B72 /* hd in Resources */,
1AC35DC818CEE65100F37B72 /* TileMaps in Resources */,
1AC35DBE18CEE65100F37B72 /* fonts in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD691998641200302043 /* NetworkConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DDE18CEE65900F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DBC18CEE65100F37B72 /* configs in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD611998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DE118CEE65900F37B72 /* background.ogg in Resources */,
15C90B4B18E66C2F00D69802 /* url.lua in Resources */,
1AC35DDF18CEE65900F37B72 /* music.mid in Resources */,
1AC35D7518CEE58500F37B72 /* src in Resources */,
1AC35DE018CEE65900F37B72 /* background.mp3 in Resources */,
Lua xcode project fix
2014-05-08 14:58:53 +08:00
1A1645A6191B6281008C7C7F /* ccs-res in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
C08689C218D370C90093E810 /* background.caf in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C90B4918E66C2A00D69802 /* tp.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD281998637C00302043 /* Opengl.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DE918CEE65900F37B72 /* effect1.wav in Resources */,
15C90B3F18E66C0C00D69802 /* ltn12.lua in Resources */,
15C90B4718E66C2400D69802 /* socket.lua in Resources */,
15C90B3A18E66BE200D69802 /* ftp.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD57199863F900302043 /* ExtensionConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DE518CEE65900F37B72 /* Hello.png in Resources */,
1AC35DEA18CEE65900F37B72 /* pew-pew-lei.wav in Resources */,
1AC35DC418CEE65100F37B72 /* Particles in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */,
15D1FD191998637C00302043 /* json.lua in Resources */,
15D1FD4B199863E800302043 /* StudioConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DB918CEE65100F37B72 /* ccb in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD49199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C90B4118E66C1100D69802 /* mbox.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */,
15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */,
15D1FD231998637C00302043 /* luaoc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DB318CEE5DA00F37B72 /* Icon.icns in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD051998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
15D1FD3D199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */,
15D1FD731998642800302043 /* DeprecatedUIFunc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DE318CEE65900F37B72 /* fileLookup.plist in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD36199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C90B3D18E66BF100D69802 /* http.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCF61998637C00302043 /* Cocos2dConstants.lua in Resources */,
15D1FD0F1998637C00302043 /* DrawPrimitives.lua in Resources */,
15D1FD711998642800302043 /* DeprecatedUIEnum.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DE618CEE65900F37B72 /* effect1.raw in Resources */,
1AC35DC018CEE65100F37B72 /* Images in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD5D1998641200302043 /* DeprecatedNetworkClass.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D7918CEE59900F37B72 /* cocosbuilderRes in Resources */,
15C90B3B18E66BEB00D69802 /* headers.lua in Resources */,
1AC35DC918CEE65100F37B72 /* zwoptex in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCEC1998637C00302043 /* bitExtend.lua in Resources */,
15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DBD18CEE65100F37B72 /* extensions in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD771998642800302043 /* GuiConstants.lua in Resources */,
15D1FD45199863E800302043 /* CocoStudio.lua in Resources */,
15D1FD1E1998637C00302043 /* luaj.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DC718CEE65100F37B72 /* spine in Resources */,
15C90B4518E66C1E00D69802 /* smtp.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCFB1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DB718CEE65100F37B72 /* animations in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1ABCA2CB18CD93580087CE3A /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
Add VideoPlayer Test for Lua
2014-06-27 13:56:39 +08:00
15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */,
Add Lua binding for ActionTimeline related and related test cases
2014-06-26 09:51:32 +08:00
15B0870D195AD52000D6F62B /* ActionTimeline in Resources */,
issue #5255:Remove Sprite3D effect test
2014-05-22 10:22:10 +08:00
15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD58199863F900302043 /* ExtensionConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C90B4418E66C1800D69802 /* mime.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD111998637C00302043 /* DrawPrimitives.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C90B4C18E66C3100D69802 /* url.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD1B1998637C00302043 /* json.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DD618CEE65200F37B72 /* Misc in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DF718CEE65B00F37B72 /* effect1.wav in Resources */,
C08689C418D370C90093E810 /* background.caf in Resources */,
1AC35DD118CEE65200F37B72 /* fonts in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD4C199863E800302043 /* StudioConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DCC18CEE65200F37B72 /* ccb in Resources */,
1AC35DD218CEE65200F37B72 /* hd in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD251998637C00302043 /* luaoc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DD718CEE65200F37B72 /* Particles in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D9D18CEE5D100F37B72 /* Icon-120.png in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD781998642800302043 /* GuiConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C90B3E18E66BF200D69802 /* http.lua in Resources */,
1AC35DA018CEE5D100F37B72 /* Icon-57.png in Resources */,
1AC35DF118CEE65B00F37B72 /* fileLookup.plist in Resources */,
1AC35DEF18CEE65B00F37B72 /* background.ogg in Resources */,
1AC35D9E18CEE5D100F37B72 /* Icon-144.png in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DF818CEE65B00F37B72 /* pew-pew-lei.wav in Resources */,
1AC35D9918CEE5D100F37B72 /* Default-568h@2x.png in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD4A199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */,
15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C90B4218E66C1200D69802 /* mbox.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD201998637C00302043 /* luaj.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D9B18CEE5D100F37B72 /* Default@2x.png in Resources */,
15C90B3718E66BE000D69802 /* ftp.lua in Resources */,
1AC35DCE18CEE65200F37B72 /* components in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD631998641200302043 /* DeprecatedNetworkEnum.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D7618CEE58500F37B72 /* src in Resources */,
15C90B4A18E66C2B00D69802 /* tp.lua in Resources */,
1AC35DDC18CEE65200F37B72 /* zwoptex in Resources */,
1AC35DEC18CEE65B00F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */,
15C90B4618E66C1F00D69802 /* smtp.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD3C199863CA00302043 /* AudioEngine.lua in Resources */,
15D1FD35199863BA00302043 /* CCBReaderLoad.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DED18CEE65B00F37B72 /* music.mid in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCFD1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */,
15D1FD721998642800302043 /* DeprecatedUIEnum.lua in Resources */,
15D1FD5F1998641200302043 /* DeprecatedNetworkClass.lua in Resources */,
15D1FD0C1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */,
15D1FD6B1998641200302043 /* NetworkConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DD018CEE65200F37B72 /* extensions in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD2A1998637C00302043 /* Opengl.lua in Resources */,
15D1FCF81998637C00302043 /* Cocos2dConstants.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DD318CEE65200F37B72 /* Images in Resources */,
1AC35DF018CEE65B00F37B72 /* effect2.ogg in Resources */,
1AC35DEB18CEE65B00F37B72 /* CocosBuilderExample.ccbproj in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD56199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DCA18CEE65200F37B72 /* animations in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD54199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */,
15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */,
15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */,
Lua xcode project fix
2014-05-08 14:58:53 +08:00
1A1645A9191B6283008C7C7F /* ccs-res in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD46199863E800302043 /* CocoStudio.lua in Resources */,
15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DA118CEE5D100F37B72 /* Icon-72.png in Resources */,
15C90B4018E66C0D00D69802 /* ltn12.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD48199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */,
15D1FD161998637C00302043 /* extern.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DA218CEE5D100F37B72 /* Icon-76.png in Resources */,
15C90B4818E66C2500D69802 /* socket.lua in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
15C90B3C18E66BEC00D69802 /* headers.lua in Resources */,
1AC35DF418CEE65B00F37B72 /* effect1.raw in Resources */,
1AC35DD918CEE65200F37B72 /* Shaders in Resources */,
1AC35DCF18CEE65200F37B72 /* configs in Resources */,
1AC35DDA18CEE65200F37B72 /* spine in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD741998642800302043 /* DeprecatedUIFunc.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DDB18CEE65200F37B72 /* TileMaps in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCEE1998637C00302043 /* bitExtend.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35DF318CEE65B00F37B72 /* Hello.png in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FCF31998637C00302043 /* Cocos2d.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D7A18CEE59900F37B72 /* cocosbuilderRes in Resources */,
1AC35D9C18CEE5D100F37B72 /* Icon-114.png in Resources */,
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D9F18CEE5D100F37B72 /* Icon-152.png in Resources */,
1AC35DEE18CEE65B00F37B72 /* background.mp3 in Resources */,
1AC35D9A18CEE5D100F37B72 /* Default.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1D60588D0D05DD3D006BFB54 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC35CFE18CED84500F37B72 /* Particles in Resources */,
1AC35CF418CED84500F37B72 /* Images in Resources */,
1AC35CE018CED84500F37B72 /* configs in Resources */,
1AC35CE618CED84500F37B72 /* effect2.ogg in Resources */,
1AC35CFA18CED84500F37B72 /* Misc in Resources */,
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E76194AECF800FF2BE4 /* ActionTimeline in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D0418CED84500F37B72 /* Shaders in Resources */,
1AC35CD818CED84500F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */,
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
B2507B6B192589AF00FA4972 /* Shaders3D in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35D0618CED84500F37B72 /* spine in Resources */,
1AC35CE818CED84500F37B72 /* extensions in Resources */,
1AC35CDE18CED84500F37B72 /* components in Resources */,
1AC35D0818CED84500F37B72 /* TileMaps in Resources */,
1AC35CE218CED84500F37B72 /* effect1.raw in Resources */,
1AC35CF218CED84500F37B72 /* Hello.png in Resources */,
1AC35CA518CECF1E00F37B72 /* Icon.icns in Resources */,
1AC35CEC18CED84500F37B72 /* fonts in Resources */,
1AC35CCA18CED84500F37B72 /* animations in Resources */,
1AC35CEA18CED84500F37B72 /* fileLookup.plist in Resources */,
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
1A221C9C191771E300FD2BE4 /* ccs-res in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35CF018CED84500F37B72 /* hd in Resources */,
1AC35CFC18CED84500F37B72 /* music.mid in Resources */,
1AC35D0A18CED84500F37B72 /* zwoptex in Resources */,
1AC35CD218CED84500F37B72 /* background.ogg in Resources */,
1AC35D0018CED84500F37B72 /* pew-pew-lei.wav in Resources */,
1AC35CD018CED84500F37B72 /* background.mp3 in Resources */,
1AC35CD618CED84500F37B72 /* CocosBuilderExample.ccbproj in Resources */,
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
3E92EA851921A7720094CD21 /* Sprite3DTest in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35CA318CECF1E00F37B72 /* InfoPlist.strings in Resources */,
1AC35CA418CECF1E00F37B72 /* MainMenu.xib in Resources */,
1AC35CD418CED84500F37B72 /* ccb in Resources */,
C08689C118D370C90093E810 /* background.caf in Resources */,
1AC35CE418CED84500F37B72 /* effect1.wav in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6177061960FAED00DE83F5 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3E6177F61960FEFE00DE83F5 /* ipadhd in Resources */,
3E6177FF1960FF1800DE83F5 /* Icon-152.png in Resources */,
3E6178051960FF1800DE83F5 /* Icon-80.png in Resources */,
3E6177F91960FF1800DE83F5 /* Default.png in Resources */,
3E6177F71960FEFE00DE83F5 /* iphone in Resources */,
3E6178011960FF1800DE83F5 /* Icon-57.png in Resources */,
3E6177F51960FEFE00DE83F5 /* ipad in Resources */,
3E6177F81960FF1800DE83F5 /* Default-568h@2x.png in Resources */,
3E6177FA1960FF1800DE83F5 /* Default@2x.png in Resources */,
3E6177FB1960FF1800DE83F5 /* Icon-100.png in Resources */,
3E6178001960FF1800DE83F5 /* Icon-40.png in Resources */,
3E6177FE1960FF1800DE83F5 /* Icon-144.png in Resources */,
3E6177FC1960FF1800DE83F5 /* Icon-114.png in Resources */,
3E6178041960FF1800DE83F5 /* Icon-76.png in Resources */,
3E6177FD1960FF1800DE83F5 /* Icon-120.png in Resources */,
3E6178031960FF1800DE83F5 /* Icon-72.png in Resources */,
3E6177F41960FEFE00DE83F5 /* fonts in Resources */,
3E6178021960FF1800DE83F5 /* Icon-58.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
A07A518A1783A1D20073F6A7 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC35CDF18CED84500F37B72 /* components in Resources */,
1AC35C8E18CECF1400F37B72 /* Icon-144.png in Resources */,
1AC35C9218CECF1400F37B72 /* Icon-50.png in Resources */,
1AC35CE518CED84500F37B72 /* effect1.wav in Resources */,
1AC35C9618CECF1400F37B72 /* Icon-76.png in Resources */,
1AC35C8A18CECF1400F37B72 /* Default@2x.png in Resources */,
1AC35CE318CED84500F37B72 /* effect1.raw in Resources */,
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
1A221C9D191771E400FD2BE4 /* ccs-res in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C9018CECF1400F37B72 /* Icon-29.png in Resources */,
1AC35D0918CED84500F37B72 /* TileMaps in Resources */,
1AC35CFF18CED84500F37B72 /* Particles in Resources */,
1AC35C8818CECF1400F37B72 /* Default-568h@2x.png in Resources */,
1AC35CD518CED84500F37B72 /* ccb in Resources */,
1AC35CE118CED84500F37B72 /* configs in Resources */,
1AC35CE918CED84500F37B72 /* extensions in Resources */,
C08689C318D370C90093E810 /* background.caf in Resources */,
1AC35C9518CECF1400F37B72 /* Icon-72.png in Resources */,
1AC35D0B18CED84500F37B72 /* zwoptex in Resources */,
1AC35CF518CED84500F37B72 /* Images in Resources */,
1AC35C9118CECF1400F37B72 /* Icon-40.png in Resources */,
1AC35C8B18CECF1400F37B72 /* Icon-100.png in Resources */,
1AC35D0118CED84500F37B72 /* pew-pew-lei.wav in Resources */,
1AC35D0518CED84500F37B72 /* Shaders in Resources */,
1AC35CD318CED84500F37B72 /* background.ogg in Resources */,
1AC35CCB18CED84500F37B72 /* animations in Resources */,
Update XCode project.pbxproj for add files related to VideoWidget.
2014-05-08 18:28:28 +08:00
3EA0FB5E191B92F100B170C8 /* cocosvideo.mp4 in Resources */,
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
3E92EA861921A7720094CD21 /* Sprite3DTest in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C8C18CECF1400F37B72 /* Icon-114.png in Resources */,
1AC35CF118CED84500F37B72 /* hd in Resources */,
1AC35C9318CECF1400F37B72 /* Icon-57.png in Resources */,
1AC35CFB18CED84500F37B72 /* Misc in Resources */,
1AC35CF318CED84500F37B72 /* Hello.png in Resources */,
1AC35C8F18CECF1400F37B72 /* Icon-152.png in Resources */,
1AC35CE718CED84500F37B72 /* effect2.ogg in Resources */,
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E77194AECF800FF2BE4 /* ActionTimeline in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C9718CECF1400F37B72 /* Icon-80.png in Resources */,
1AC35CEB18CED84500F37B72 /* fileLookup.plist in Resources */,
1AC35CFD18CED84500F37B72 /* music.mid in Resources */,
1AC35D0718CED84500F37B72 /* spine in Resources */,
1AC35C8D18CECF1400F37B72 /* Icon-120.png in Resources */,
1AC35C9418CECF1400F37B72 /* Icon-58.png in Resources */,
1AC35CD118CED84500F37B72 /* background.mp3 in Resources */,
1AC35CD918CED84500F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */,
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
B2507B6C192589AF00FA4972 /* Shaders3D in Resources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35CED18CED84500F37B72 /* fonts in Resources */,
1AC35CD718CED84500F37B72 /* CocosBuilderExample.ccbproj in Resources */,
1AC35C8918CECF1400F37B72 /* Default.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA020196EE56C005877BB /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
15CBA9B7196EE8D9005877BB /* AppController.mm in Sources */,
15CBA9B8196EE8D9005877BB /* main.m in Sources */,
15CBA9B9196EE8D9005877BB /* RootViewController.mm in Sources */,
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */,
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA9ED196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp in Sources */,
15CBA9B4196EE8A0005877BB /* AppDelegate.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE1F618CDF6DA004CD58F /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC358C218CEC1BF00F37B72 /* HelloWorldScene.cpp in Sources */,
1AC358C018CEC1BF00F37B72 /* AppDelegate.cpp in Sources */,
1AC358F918CEC1D400F37B72 /* main.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1A0EE2C318CDF733004CD58F /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC35D6018CEDE9E00F37B72 /* main.cpp in Sources */,
1AC35D3118CEDE8B00F37B72 /* AppDelegate.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1A0EE35518CDF775004CD58F /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC358DA18CEC1CB00F37B72 /* AppController.mm in Sources */,
1AC358EB18CEC1CB00F37B72 /* RootViewController.mm in Sources */,
1AC358C318CEC1BF00F37B72 /* HelloWorldScene.cpp in Sources */,
1AC358EA18CEC1CB00F37B72 /* main.m in Sources */,
1AC358C118CEC1BF00F37B72 /* AppDelegate.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1A0EE42418CDF799004CD58F /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC35D5218CEDE9400F37B72 /* RootViewController.mm in Sources */,
1AC35D3218CEDE8B00F37B72 /* AppDelegate.cpp in Sources */,
1AC35D5118CEDE9400F37B72 /* main.m in Sources */,
1AC35D4518CEDE9400F37B72 /* AppController.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1ABCA28218CD91510087CE3A /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC35D8118CEE5B100F37B72 /* AppDelegate.cpp in Sources */,
1AC35DB518CEE5DA00F37B72 /* LuaObjectCBridgeTest.mm in Sources */,
1AC35DB618CEE5DA00F37B72 /* main.cpp in Sources */,
1AC35D8318CEE5B100F37B72 /* lua_assetsmanager_test_sample.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1ABCA2C918CD93580087CE3A /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC35DA518CEE5D100F37B72 /* main.m in Sources */,
1AC35DA418CEE5D100F37B72 /* LuaObjectCBridgeTest.mm in Sources */,
1AC35D9818CEE5D100F37B72 /* AppController.mm in Sources */,
1AC35D8218CEE5B100F37B72 /* AppDelegate.cpp in Sources */,
1AC35DA618CEE5D100F37B72 /* RootViewController.mm in Sources */,
1AC35D8418CEE5B100F37B72 /* lua_assetsmanager_test_sample.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
1D60588E0D05DD3D006BFB54 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC35B3118CECF0C00F37B72 /* GLES-Render.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DE1191B595E0066F8DF /* UITextTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C5318CECF0C00F37B72 /* TextInputTest.cpp in Sources */,
1AC35B4518CECF0C00F37B72 /* Bug-886.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DCB191B595E0066F8DF /* UIScrollViewTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BE118CECF0C00F37B72 /* CCControlButtonTest.cpp in Sources */,
1AC35BEB18CECF0C00F37B72 /* CCControlSliderTest.cpp in Sources */,
1AC35C4D18CECF0C00F37B72 /* SpineTest.cpp in Sources */,
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
3E92EA821921A1400094CD21 /* Sprite3DTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C1D18CECF0C00F37B72 /* NewRendererTest.cpp in Sources */,
1AC35B6718CECF0C00F37B72 /* AnimationsTestLayer.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DB7191B595E0066F8DF /* UIListViewTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BF918CECF0C00F37B72 /* WebSocketTest.cpp in Sources */,
1AC35BF118CECF0C00F37B72 /* EditBoxTest.cpp in Sources */,
1AC35B3918CECF0C00F37B72 /* Bug-1174.cpp in Sources */,
1AC35BE318CECF0C00F37B72 /* CCControlColourPickerTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DB1191B595E0066F8DF /* UILayoutTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B2318CECF0C00F37B72 /* ActionsEaseTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DE5191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C1918CECF0C00F37B72 /* MutiTouchTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DBD191B595E0066F8DF /* UIPageViewTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B2918CECF0C00F37B72 /* AppDelegate.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DA1191B595E0066F8DF /* GUIEditorTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B3718CECF0C00F37B72 /* Bug-1159.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D1C191B574B0066F8DF /* UITest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C3118CECF0C00F37B72 /* PerformanceRendererTest.cpp in Sources */,
1AC35C4518CECF0C00F37B72 /* SceneTest.cpp in Sources */,
1AC35B6F18CECF0C00F37B72 /* MenuTestLayer.cpp in Sources */,
add TestCase for reparentChildren bug
2014-05-13 13:50:31 +08:00
59620E8F1921E5CF002021B6 /* Bug-Child.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DCD191B595E0066F8DF /* UIScrollViewTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B5118CECF0C00F37B72 /* ClippingNodeTest.cpp in Sources */,
1AC35C1318CECF0C00F37B72 /* LayerTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D97191B595E0066F8DF /* CustomImageView.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C1F18CECF0C00F37B72 /* NodeTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D95191B595E0066F8DF /* CustomParticleWidgetTest.cpp in Sources */,
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
C04F935A1941B05400E9FEAB /* TileMapTest2.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C4118CECF0C00F37B72 /* RenderTextureTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DE3191B595E0066F8DF /* UIWidgetAddNodeTest.cpp in Sources */,
29080DBB191B595E0066F8DF /* UILoadingBarTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C1518CECF0C00F37B72 /* MenuTest.cpp in Sources */,
1AC35C6718CECF0C00F37B72 /* UserDefaultTest.cpp in Sources */,
1AC35C2118CECF0C00F37B72 /* ParallaxTest.cpp in Sources */,
1AC35C6B18CECF0C00F37B72 /* ZwoptexTest.cpp in Sources */,
1AC35B7718CECF0C00F37B72 /* ComponentsTestScene.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DC7191B595E0066F8DF /* UISceneManager.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C2F18CECF0C00F37B72 /* PerformanceParticleTest.cpp in Sources */,
1AC35B4918CECF0C00F37B72 /* Bug-914.cpp in Sources */,
1AC35B6318CECF0C00F37B72 /* EffectsAdvancedTest.cpp in Sources */,
1AC35C5F18CECF0C00F37B72 /* Paddle.cpp in Sources */,
1AC35BDB18CECF0C00F37B72 /* SceneEditorTest.cpp in Sources */,
1AC35B4B18CECF0C00F37B72 /* BugsTest.cpp in Sources */,
1AC35C5118CECF0C00F37B72 /* testBasic.cpp in Sources */,
1AC35B7918CECF0C00F37B72 /* EnemyController.cpp in Sources */,
1AC35B6B18CECF0C00F37B72 /* CocosBuilderTest.cpp in Sources */,
add Cocostudio 1.3,1.4, 1.5 ui tests
2014-07-08 17:02:50 +08:00
29FBBBFE196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B4118CECF0C00F37B72 /* QuestionContainerSprite.cpp in Sources */,
1AC35B6118CECF0C00F37B72 /* DrawPrimitivesTest.cpp in Sources */,
1AC35C1718CECF0C00F37B72 /* MotionStreakTest.cpp in Sources */,
1AC35C0518CECF0C00F37B72 /* FontTest.cpp in Sources */,
1AC35C3718CECF0C00F37B72 /* PerformanceTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D99191B595E0066F8DF /* CustomImageViewReader.cpp in Sources */,
29080DD1191B595E0066F8DF /* UISliderTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B2718CECF0C00F37B72 /* ActionsTest.cpp in Sources */,
1AC35C4918CECF0C00F37B72 /* ShaderTest.cpp in Sources */,
1AC35BFD18CECF0C00F37B72 /* Scale9SpriteTest.cpp in Sources */,
1AC35B4318CECF0C00F37B72 /* Bug-624.cpp in Sources */,
1AC35BF718CECF0C00F37B72 /* SocketIOTest.cpp in Sources */,
1AC35C4F18CECF0C00F37B72 /* SpriteTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D9D191B595E0066F8DF /* CustomParticleWidgetReader.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C0318CECF0C00F37B72 /* FileUtilsTest.cpp in Sources */,
1AC35B5B18CECF0C00F37B72 /* CurlTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DD5191B595E0066F8DF /* UITextAtlasTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BFF18CECF0C00F37B72 /* CustomTableViewCell.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DDF191B595E0066F8DF /* UITextTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C2718CECF0C00F37B72 /* PerformanceContainerTest.cpp in Sources */,
1AC35BEF18CECF0C00F37B72 /* CCControlSwitchTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D91191B595E0066F8DF /* CustomGUIScene.cpp in Sources */,
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
3E9E75D0199324CB005B7047 /* Camera3DTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DC1191B595E0066F8DF /* UIRichTextTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B2B18CECF0C00F37B72 /* BaseTest.cpp in Sources */,
1AC35B7D18CECF0C00F37B72 /* PlayerController.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D9F191B595E0066F8DF /* CustomReader.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BE718CECF0C00F37B72 /* CCControlScene.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DBF191B595E0066F8DF /* UIPageViewTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B5F18CECF0C00F37B72 /* DataVisitorTest.cpp in Sources */,
1AC35B5D18CECF0C00F37B72 /* CurrentLanguageTest.cpp in Sources */,
1AC35B3B18CECF0C00F37B72 /* Bug-350.cpp in Sources */,
1AC35C4718CECF0C00F37B72 /* SchedulerTest.cpp in Sources */,
1AF152D918FD252A00A52F3D /* PerformanceCallbackTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DA3191B595E0066F8DF /* UIButtonTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C5518CECF0C00F37B72 /* Texture2dTest.cpp in Sources */,
1AC35C0718CECF0C00F37B72 /* MouseTest.cpp in Sources */,
1AC35C5D18CECF0C00F37B72 /* Ball.cpp in Sources */,
1AC35B7B18CECF0C00F37B72 /* GameOverScene.cpp in Sources */,
1AC35BF318CECF0C00F37B72 /* ExtensionsTest.cpp in Sources */,
1AC35B3518CECF0C00F37B72 /* TestEntries.cpp in Sources */,
1AC35B2D18CECF0C00F37B72 /* Box2dTest.cpp in Sources */,
fix ios project bug
2014-07-11 14:55:00 +08:00
290E94B5196FC16900694919 /* CocostudioParserTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DDB191B595E0066F8DF /* UITextFieldTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C1118CECF0C00F37B72 /* LabelTestNew.cpp in Sources */,
1AC35B4D18CECF0C00F37B72 /* ChipmunkTest.cpp in Sources */,
1AC35BDF18CECF0C00F37B72 /* cons.cpp in Sources */,
1AC35B5718CECF0C00F37B72 /* ConsoleTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DA7191B595E0066F8DF /* UICheckBoxTest.cpp in Sources */,
29080DDD191B595E0066F8DF /* UITextFieldTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C0918CECF0C00F37B72 /* IntervalTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DA5191B595E0066F8DF /* UIButtonTest_Editor.cpp in Sources */,
29080DC3191B595E0066F8DF /* UIScene.cpp in Sources */,
29080D9B191B595E0066F8DF /* CustomParticleWidget.cpp in Sources */,
29080D8D191B595E0066F8DF /* CocosGUIScene.cpp in Sources */,
1. move drawnode3d to Sprite3DTest 2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
5EBEECB01995247000429821 /* DrawNode3D.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BED18CECF0C00F37B72 /* CCControlStepperTest.cpp in Sources */,
1AC35C3318CECF0C00F37B72 /* PerformanceScenarioTest.cpp in Sources */,
1AC35C5918CECF0C00F37B72 /* TextureAtlasEncryptionTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DA9191B595E0066F8DF /* UICheckBoxTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B5518CECF0C00F37B72 /* ConfigurationTest.cpp in Sources */,
1AC35BE518CECF0C00F37B72 /* CCControlPotentiometerTest.cpp in Sources */,
1AC35C5B18CECF0C00F37B72 /* TileMapTest.cpp in Sources */,
1AC35B4718CECF0C00F37B72 /* Bug-899.cpp in Sources */,
1AC35C1B18CECF0C00F37B72 /* NewEventDispatcherTest.cpp in Sources */,
1AC35C2D18CECF0C00F37B72 /* PerformanceNodeChildrenTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DC5191B595E0066F8DF /* UIScene_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BDD18CECF0C00F37B72 /* acts.cpp in Sources */,
1AC35B7518CECF0C00F37B72 /* ArmatureScene.cpp in Sources */,
1AC35B8118CECF0C00F37B72 /* SceneController.cpp in Sources */,
1AC35B3318CECF0C00F37B72 /* Test.cpp in Sources */,
1AC35C2318CECF0C00F37B72 /* ParticleTest.cpp in Sources */,
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
295824591987415900F9746D /* UIScale9SpriteTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C6118CECF0C00F37B72 /* TouchesTest.cpp in Sources */,
1AC35C6318CECF0C00F37B72 /* TransitionsTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DB3191B595E0066F8DF /* UILayoutTest_Editor.cpp in Sources */,
29080DB9191B595E0066F8DF /* UILoadingBarTest.cpp in Sources */,
29080DAF191B595E0066F8DF /* UIImageViewTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C4318CECF0C00F37B72 /* RotateWorldTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DD7191B595E0066F8DF /* UITextBMFontTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B2518CECF0C00F37B72 /* ActionsProgressTest.cpp in Sources */,
1AC35B6518CECF0C00F37B72 /* EffectsTest.cpp in Sources */,
1AC35B7118CECF0C00F37B72 /* TestHeaderLayer.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D93191B595E0066F8DF /* CustomImageTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B2118CECF0C00F37B72 /* ActionManagerTest.cpp in Sources */,
1AC35C3D18CECF0C00F37B72 /* PhysicsTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DAD191B595E0066F8DF /* UIImageViewTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B6918CECF0C00F37B72 /* ButtonTestLayer.cpp in Sources */,
1AC35B2F18CECF0C00F37B72 /* Box2dView.cpp in Sources */,
1AC35C0F18CECF0C00F37B72 /* LabelTest.cpp in Sources */,
1AC35C6918CECF0C00F37B72 /* VisibleRect.cpp in Sources */,
1F33634F18E37E840074764D /* RefPtrTest.cpp in Sources */,
1AC35C3F18CECF0C00F37B72 /* ReleasePoolTest.cpp in Sources */,
1AC35C5718CECF0C00F37B72 /* TextureCacheTest.cpp in Sources */,
1AC35B6D18CECF0C00F37B72 /* HelloCocosBuilderLayer.cpp in Sources */,
1AC35C2B18CECF0C00F37B72 /* PerformanceLabelTest.cpp in Sources */,
1AC35C0118CECF0C00F37B72 /* TableViewTestScene.cpp in Sources */,
1AC35C4B18CECF0C00F37B72 /* ShaderTest2.cpp in Sources */,
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E73194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C6518CECF0C00F37B72 /* UnitTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DC9191B595E0066F8DF /* UISceneManager_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B3F18CECF0C00F37B72 /* Bug-458.cpp in Sources */,
1AC35C3918CECF0C00F37B72 /* PerformanceTextureTest.cpp in Sources */,
1AC35B5318CECF0C00F37B72 /* CocosDenshionTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DD3191B595E0066F8DF /* UITextAtlasTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B7F18CECF0C00F37B72 /* ProjectileController.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DB5191B595E0066F8DF /* UIListViewTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C2518CECF0C00F37B72 /* PerformanceAllocTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DAB191B595E0066F8DF /* UIFocusTest.cpp in Sources */,
29080DD9191B595E0066F8DF /* UITextBMFontTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B5918CECF0C00F37B72 /* controller.cpp in Sources */,
1AC35C2918CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp in Sources */,
1AC35CA618CECF1E00F37B72 /* main.cpp in Sources */,
1AC35BE918CECF0C00F37B72 /* CCControlSceneManager.cpp in Sources */,
1AC35B7318CECF0C00F37B72 /* TimelineCallbackTestLayer.cpp in Sources */,
1AC35BFB18CECF0C00F37B72 /* NotificationCenterTest.cpp in Sources */,
1AC35C3518CECF0C00F37B72 /* PerformanceSpriteTest.cpp in Sources */,
1AC35C3B18CECF0C00F37B72 /* PerformanceTouchesTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D8F191B595E0066F8DF /* CocoStudioGUITest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B3D18CECF0C00F37B72 /* Bug-422.cpp in Sources */,
1AC35BF518CECF0C00F37B72 /* HttpClientTest.cpp in Sources */,
1AC35B4F18CECF0C00F37B72 /* ClickAndMoveTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DCF191B595E0066F8DF /* UISliderTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
);
runOnlyForDeploymentPostprocessing = 0;
};
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E61771A1960FAED00DE83F5 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3E6177351960FB4000DE83F5 /* AppController.mm in Sources */,
3E6177371960FB5E00DE83F5 /* RootViewController.mm in Sources */,
3E6177331960FB3500DE83F5 /* AppDelegate.cpp in Sources */,
3E6177361960FB5A00DE83F5 /* main.m in Sources */,
3E6177341960FB3900DE83F5 /* GameControllerTest.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
A07A51AD1783A1D20073F6A7 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1AC35B3218CECF0C00F37B72 /* GLES-Render.cpp in Sources */,
1AC35C5418CECF0C00F37B72 /* TextInputTest.cpp in Sources */,
1AC35B4618CECF0C00F37B72 /* Bug-886.cpp in Sources */,
1AC35BE218CECF0C00F37B72 /* CCControlButtonTest.cpp in Sources */,
1AC35BEC18CECF0C00F37B72 /* CCControlSliderTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DB4191B595E0066F8DF /* UILayoutTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C4E18CECF0C00F37B72 /* SpineTest.cpp in Sources */,
1AC35C1E18CECF0C00F37B72 /* NewRendererTest.cpp in Sources */,
1. move drawnode3d to Sprite3DTest 2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
5EBEECB11995247000429821 /* DrawNode3D.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B6818CECF0C00F37B72 /* AnimationsTestLayer.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D8E191B595E0066F8DF /* CocosGUIScene.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BFA18CECF0C00F37B72 /* WebSocketTest.cpp in Sources */,
1AC35BF218CECF0C00F37B72 /* EditBoxTest.cpp in Sources */,
adjust project.pbxproj and files associated with ActionTimeLine
2014-06-13 16:33:07 +08:00
38FA2E74194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */,
add UIScale9Sprite tests
2014-07-29 14:33:22 +08:00
2958245A1987415900F9746D /* UIScale9SpriteTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B3A18CECF0C00F37B72 /* Bug-1174.cpp in Sources */,
1AC35BE418CECF0C00F37B72 /* CCControlColourPickerTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DD4191B595E0066F8DF /* UITextAtlasTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B2418CECF0C00F37B72 /* ActionsEaseTest.cpp in Sources */,
1AC35C1A18CECF0C00F37B72 /* MutiTouchTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DB8191B595E0066F8DF /* UIListViewTest_Editor.cpp in Sources */,
29080DBC191B595E0066F8DF /* UILoadingBarTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C8718CECF1400F37B72 /* testsAppDelegate.mm in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D98191B595E0066F8DF /* CustomImageView.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B2A18CECF0C00F37B72 /* AppDelegate.cpp in Sources */,
1AC35B3818CECF0C00F37B72 /* Bug-1159.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DBA191B595E0066F8DF /* UILoadingBarTest.cpp in Sources */,
29080D9C191B595E0066F8DF /* CustomParticleWidget.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C3218CECF0C00F37B72 /* PerformanceRendererTest.cpp in Sources */,
1AC35C4618CECF0C00F37B72 /* SceneTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D9A191B595E0066F8DF /* CustomImageViewReader.cpp in Sources */,
29080DD6191B595E0066F8DF /* UITextAtlasTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B7018CECF0C00F37B72 /* MenuTestLayer.cpp in Sources */,
1AC35B5218CECF0C00F37B72 /* ClippingNodeTest.cpp in Sources */,
1AC35C1418CECF0C00F37B72 /* LayerTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DD8191B595E0066F8DF /* UITextBMFontTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C2018CECF0C00F37B72 /* NodeTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DE4191B595E0066F8DF /* UIWidgetAddNodeTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C4218CECF0C00F37B72 /* RenderTextureTest.cpp in Sources */,
1AC35C1618CECF0C00F37B72 /* MenuTest.cpp in Sources */,
1AC35C6818CECF0C00F37B72 /* UserDefaultTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D1D191B574B0066F8DF /* UITest.cpp in Sources */,
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
3E9E75D1199324CB005B7047 /* Camera3DTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AF152DA18FD252A00A52F3D /* PerformanceCallbackTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DA0191B595E0066F8DF /* CustomReader.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C2218CECF0C00F37B72 /* ParallaxTest.cpp in Sources */,
1AC35C6C18CECF0C00F37B72 /* ZwoptexTest.cpp in Sources */,
1AC35B7818CECF0C00F37B72 /* ComponentsTestScene.cpp in Sources */,
1AC35C3018CECF0C00F37B72 /* PerformanceParticleTest.cpp in Sources */,
1AC35B4A18CECF0C00F37B72 /* Bug-914.cpp in Sources */,
1AC35B6418CECF0C00F37B72 /* EffectsAdvancedTest.cpp in Sources */,
1AC35C6018CECF0C00F37B72 /* Paddle.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DBE191B595E0066F8DF /* UIPageViewTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BDC18CECF0C00F37B72 /* SceneEditorTest.cpp in Sources */,
1AC35B4C18CECF0C00F37B72 /* BugsTest.cpp in Sources */,
1AC35C5218CECF0C00F37B72 /* testBasic.cpp in Sources */,
1AC35B7A18CECF0C00F37B72 /* EnemyController.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DE6191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B6C18CECF0C00F37B72 /* CocosBuilderTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DDE191B595E0066F8DF /* UITextFieldTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B4218CECF0C00F37B72 /* QuestionContainerSprite.cpp in Sources */,
1AC35B6218CECF0C00F37B72 /* DrawPrimitivesTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DDC191B595E0066F8DF /* UITextFieldTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C1818CECF0C00F37B72 /* MotionStreakTest.cpp in Sources */,
1AC35C0618CECF0C00F37B72 /* FontTest.cpp in Sources */,
1AC35C3818CECF0C00F37B72 /* PerformanceTest.cpp in Sources */,
1F33635018E37E840074764D /* RefPtrTest.cpp in Sources */,
1AC35B2818CECF0C00F37B72 /* ActionsTest.cpp in Sources */,
1AC35C4A18CECF0C00F37B72 /* ShaderTest.cpp in Sources */,
1AC35BFE18CECF0C00F37B72 /* Scale9SpriteTest.cpp in Sources */,
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
C04F935B1941B05400E9FEAB /* TileMapTest2.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B4418CECF0C00F37B72 /* Bug-624.cpp in Sources */,
1AC35BF818CECF0C00F37B72 /* SocketIOTest.cpp in Sources */,
1AC35C5018CECF0C00F37B72 /* SpriteTest.cpp in Sources */,
1AC35C0418CECF0C00F37B72 /* FileUtilsTest.cpp in Sources */,
1AC35B5C18CECF0C00F37B72 /* CurlTest.cpp in Sources */,
1AC35C0018CECF0C00F37B72 /* CustomTableViewCell.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D92191B595E0066F8DF /* CustomGUIScene.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C2818CECF0C00F37B72 /* PerformanceContainerTest.cpp in Sources */,
1AC35BF018CECF0C00F37B72 /* CCControlSwitchTest.cpp in Sources */,
1AC35B2C18CECF0C00F37B72 /* BaseTest.cpp in Sources */,
1AC35B7E18CECF0C00F37B72 /* PlayerController.cpp in Sources */,
1AC35C9818CECF1400F37B72 /* main.m in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DCC191B595E0066F8DF /* UIScrollViewTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BE818CECF0C00F37B72 /* CCControlScene.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DAA191B595E0066F8DF /* UICheckBoxTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B6018CECF0C00F37B72 /* DataVisitorTest.cpp in Sources */,
1AC35B5E18CECF0C00F37B72 /* CurrentLanguageTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DE2191B595E0066F8DF /* UITextTest_Editor.cpp in Sources */,
29080DA8191B595E0066F8DF /* UICheckBoxTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B3C18CECF0C00F37B72 /* Bug-350.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DDA191B595E0066F8DF /* UITextBMFontTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C4818CECF0C00F37B72 /* SchedulerTest.cpp in Sources */,
1AC35C5618CECF0C00F37B72 /* Texture2dTest.cpp in Sources */,
1AC35C0818CECF0C00F37B72 /* MouseTest.cpp in Sources */,
1AC35C5E18CECF0C00F37B72 /* Ball.cpp in Sources */,
1AC35B7C18CECF0C00F37B72 /* GameOverScene.cpp in Sources */,
1AC35BF418CECF0C00F37B72 /* ExtensionsTest.cpp in Sources */,
1AC35B3618CECF0C00F37B72 /* TestEntries.cpp in Sources */,
1AC35B2E18CECF0C00F37B72 /* Box2dTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DCA191B595E0066F8DF /* UISceneManager_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C1218CECF0C00F37B72 /* LabelTestNew.cpp in Sources */,
1AC35B4E18CECF0C00F37B72 /* ChipmunkTest.cpp in Sources */,
1AC35BE018CECF0C00F37B72 /* cons.cpp in Sources */,
1AC35B5818CECF0C00F37B72 /* ConsoleTest.cpp in Sources */,
1AC35C0A18CECF0C00F37B72 /* IntervalTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DD0191B595E0066F8DF /* UISliderTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BEE18CECF0C00F37B72 /* CCControlStepperTest.cpp in Sources */,
1AC35C3418CECF0C00F37B72 /* PerformanceScenarioTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DA4191B595E0066F8DF /* UIButtonTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C5A18CECF0C00F37B72 /* TextureAtlasEncryptionTest.cpp in Sources */,
1AC35B5618CECF0C00F37B72 /* ConfigurationTest.cpp in Sources */,
1AC35BE618CECF0C00F37B72 /* CCControlPotentiometerTest.cpp in Sources */,
1AC35C8618CECF1400F37B72 /* RootViewController.mm in Sources */,
1AC35C5C18CECF0C00F37B72 /* TileMapTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DC2191B595E0066F8DF /* UIRichTextTest.cpp in Sources */,
update XCode project.pbxproj
2014-05-09 11:37:14 +08:00
3EA0FB72191C844400B170C8 /* UIVideoPlayerTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B4818CECF0C00F37B72 /* Bug-899.cpp in Sources */,
1AC35C1C18CECF0C00F37B72 /* NewEventDispatcherTest.cpp in Sources */,
1AC35C2E18CECF0C00F37B72 /* PerformanceNodeChildrenTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DCE191B595E0066F8DF /* UIScrollViewTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BDE18CECF0C00F37B72 /* acts.cpp in Sources */,
1AC35B7618CECF0C00F37B72 /* ArmatureScene.cpp in Sources */,
1AC35B8218CECF0C00F37B72 /* SceneController.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DD2191B595E0066F8DF /* UISliderTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B3418CECF0C00F37B72 /* Test.cpp in Sources */,
1AC35C2418CECF0C00F37B72 /* ParticleTest.cpp in Sources */,
1AC35C6218CECF0C00F37B72 /* TouchesTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DB0191B595E0066F8DF /* UIImageViewTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C6418CECF0C00F37B72 /* TransitionsTest.cpp in Sources */,
1AC35C4418CECF0C00F37B72 /* RotateWorldTest.cpp in Sources */,
1AC35B2618CECF0C00F37B72 /* ActionsProgressTest.cpp in Sources */,
1AC35B6618CECF0C00F37B72 /* EffectsTest.cpp in Sources */,
1AC35B7218CECF0C00F37B72 /* TestHeaderLayer.cpp in Sources */,
1AC35B2218CECF0C00F37B72 /* ActionManagerTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D90191B595E0066F8DF /* CocoStudioGUITest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C3E18CECF0C00F37B72 /* PhysicsTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DC6191B595E0066F8DF /* UIScene_Editor.cpp in Sources */,
29080DB2191B595E0066F8DF /* UILayoutTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B6A18CECF0C00F37B72 /* ButtonTestLayer.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DB6191B595E0066F8DF /* UIListViewTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B3018CECF0C00F37B72 /* Box2dView.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DAE191B595E0066F8DF /* UIImageViewTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C1018CECF0C00F37B72 /* LabelTest.cpp in Sources */,
add TestCase for reparentChildren bug
2014-05-13 13:50:31 +08:00
59620E901921E5CF002021B6 /* Bug-Child.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DC8191B595E0066F8DF /* UISceneManager.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C6A18CECF0C00F37B72 /* VisibleRect.cpp in Sources */,
1AC35C4018CECF0C00F37B72 /* ReleasePoolTest.cpp in Sources */,
1AC35C5818CECF0C00F37B72 /* TextureCacheTest.cpp in Sources */,
1AC35B6E18CECF0C00F37B72 /* HelloCocosBuilderLayer.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D96191B595E0066F8DF /* CustomParticleWidgetTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C2C18CECF0C00F37B72 /* PerformanceLabelTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DE0191B595E0066F8DF /* UITextTest.cpp in Sources */,
29080DC0191B595E0066F8DF /* UIPageViewTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C0218CECF0C00F37B72 /* TableViewTestScene.cpp in Sources */,
1AC35C4C18CECF0C00F37B72 /* ShaderTest2.cpp in Sources */,
1AC35C6618CECF0C00F37B72 /* UnitTest.cpp in Sources */,
fix ios project bug
2014-07-11 14:55:00 +08:00
290E94B6196FC16900694919 /* CocostudioParserTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B4018CECF0C00F37B72 /* Bug-458.cpp in Sources */,
1AC35C3A18CECF0C00F37B72 /* PerformanceTextureTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DC4191B595E0066F8DF /* UIScene.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B5418CECF0C00F37B72 /* CocosDenshionTest.cpp in Sources */,
1AC35B8018CECF0C00F37B72 /* ProjectileController.cpp in Sources */,
1AC35C2618CECF0C00F37B72 /* PerformanceAllocTest.cpp in Sources */,
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
3E92EA831921A1400094CD21 /* Sprite3DTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B5A18CECF0C00F37B72 /* controller.cpp in Sources */,
1AC35C2A18CECF0C00F37B72 /* PerformanceEventDispatcherTest.cpp in Sources */,
1AC35BEA18CECF0C00F37B72 /* CCControlSceneManager.cpp in Sources */,
1AC35B7418CECF0C00F37B72 /* TimelineCallbackTestLayer.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080D9E191B595E0066F8DF /* CustomParticleWidgetReader.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BFC18CECF0C00F37B72 /* NotificationCenterTest.cpp in Sources */,
add Cocostudio 1.3,1.4, 1.5 ui tests
2014-07-08 17:02:50 +08:00
29FBBBFF196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35C3618CECF0C00F37B72 /* PerformanceSpriteTest.cpp in Sources */,
1AC35C3C18CECF0C00F37B72 /* PerformanceTouchesTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DA2191B595E0066F8DF /* GUIEditorTest.cpp in Sources */,
29080D94191B595E0066F8DF /* CustomImageTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B3E18CECF0C00F37B72 /* Bug-422.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DAC191B595E0066F8DF /* UIFocusTest.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35BF618CECF0C00F37B72 /* HttpClientTest.cpp in Sources */,
issue #5056. move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
29080DA6191B595E0066F8DF /* UIButtonTest_Editor.cpp in Sources */,
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1AC35B5018CECF0C00F37B72 /* ClickAndMoveTest.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B85198B8ACB00DC375D /* PBXTargetDependency */ = {
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
isa = PBXTargetDependency;
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
name = "libluacocos2d iOS";
targetProxy = 15427B84198B8ACB00DC375D /* PBXContainerItemProxy */;
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
};
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427B95198B8BB400DC375D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluacocos2d iOS";
targetProxy = 15427B94198B8BB400DC375D /* PBXContainerItemProxy */;
};
15427B99198B8BDE00DC375D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libcocos2d iOS";
targetProxy = 15427B98198B8BDE00DC375D /* PBXContainerItemProxy */;
};
15427B9D198B8C0500DC375D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluacocos2d iOS";
targetProxy = 15427B9C198B8C0500DC375D /* PBXContainerItemProxy */;
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
};
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
15427BA5198B8C2E00DC375D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluacocos2d Mac";
targetProxy = 15427BA4198B8C2E00DC375D /* PBXContainerItemProxy */;
};
15427BB5198B8C5000DC375D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libluacocos2d Mac";
targetProxy = 15427BB4198B8C5000DC375D /* PBXContainerItemProxy */;
};
15CBA016196EE56C005877BB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx iOS";
targetProxy = 15CBA017196EE56C005877BB /* PBXContainerItemProxy */;
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE1C718CDF6DA004CD58F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx Mac";
targetProxy = 1A0EE1C818CDF6DA004CD58F /* PBXContainerItemProxy */;
};
1A0EE2BB18CDF733004CD58F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx Mac";
targetProxy = 1A0EE2BC18CDF733004CD58F /* PBXContainerItemProxy */;
};
1A0EE31918CDF775004CD58F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx iOS";
targetProxy = 1A0EE31A18CDF775004CD58F /* PBXContainerItemProxy */;
};
1AAF5342180E2F41000584C8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx Mac";
targetProxy = 1AAF5341180E2F41000584C8 /* PBXContainerItemProxy */;
};
1AAF53F5180E39C6000584C8 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx iOS";
targetProxy = 1AAF53F4180E39C6000584C8 /* PBXContainerItemProxy */;
};
1ABCA2B918CD92230087CE3A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx Mac";
targetProxy = 1ABCA2B818CD92230087CE3A /* PBXContainerItemProxy */;
};
1ABCA2F818CD93850087CE3A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx iOS";
targetProxy = 1ABCA2F718CD93850087CE3A /* PBXContainerItemProxy */;
};
1ADA8BA418CF277400AE24B9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1A0EE1C618CDF6DA004CD58F /* cpp-empty-test Mac */;
targetProxy = 1ADA8BA318CF277400AE24B9 /* PBXContainerItemProxy */;
};
1ADA8BA618CF277400AE24B9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1ABCA28518CD91510087CE3A /* lua-tests Mac */;
targetProxy = 1ADA8BA518CF277400AE24B9 /* PBXContainerItemProxy */;
};
1ADA8BA818CF277400AE24B9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1A0EE2B818CDF733004CD58F /* lua-empty-test Mac */;
targetProxy = 1ADA8BA718CF277400AE24B9 /* PBXContainerItemProxy */;
};
1ADA8BAC18CF277C00AE24B9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1A0EE31818CDF775004CD58F /* cpp-empty-test iOS */;
targetProxy = 1ADA8BAB18CF277C00AE24B9 /* PBXContainerItemProxy */;
};
1ADA8BAE18CF277C00AE24B9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1ABCA2CC18CD93580087CE3A /* lua-tests iOS */;
targetProxy = 1ADA8BAD18CF277C00AE24B9 /* PBXContainerItemProxy */;
};
1ADA8BB018CF277C00AE24B9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1A0EE41918CDF799004CD58F /* lua-empty-test iOS */;
targetProxy = 1ADA8BAF18CF277C00AE24B9 /* PBXContainerItemProxy */;
};
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E6177001960FAED00DE83F5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx iOS";
targetProxy = 3E6177011960FAED00DE83F5 /* PBXContainerItemProxy */;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
A035ACC0178246BD00987F6C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 1D6058900D05DD3D006BFB54 /* cpp-tests Mac */;
targetProxy = A035ACBF178246BD00987F6C /* PBXContainerItemProxy */;
};
A07A526D1783AB980073F6A7 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = A07A517F1783A1D20073F6A7 /* cpp-tests iOS */;
targetProxy = A07A526C1783AB980073F6A7 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
1AC358ED18CEC1D400F37B72 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
1AC358EE18CEC1D400F37B72 /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
1AC358EF18CEC1D400F37B72 /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
1AC358F018CEC1D400F37B72 /* en */,
);
name = MainMenu.xib;
sourceTree = "<group>";
};
1AC35C9B18CECF1E00F37B72 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
1AC35C9C18CECF1E00F37B72 /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
1AC35C9D18CECF1E00F37B72 /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
1AC35C9E18CECF1E00F37B72 /* en */,
);
name = MainMenu.xib;
sourceTree = "<group>";
};
1AC35D5418CEDE9E00F37B72 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
1AC35D5518CEDE9E00F37B72 /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
1AC35D5618CEDE9E00F37B72 /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
1AC35D5718CEDE9E00F37B72 /* en */,
);
name = MainMenu.xib;
sourceTree = "<group>";
};
1AC35DA818CEE5DA00F37B72 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
1AC35DA918CEE5DA00F37B72 /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
1AC35DAA18CEE5DA00F37B72 /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
1AC35DAB18CEE5DA00F37B72 /* en */,
);
name = MainMenu.xib;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA061196EE56C005877BB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-game-controller-test/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/usr/lib",
);
PRODUCT_NAME = "lua-game-controller-test iOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto $(SRCROOT)/../cocos/base";
};
name = Debug;
};
15CBA062196EE56C005877BB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks",
);
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-game-controller-test/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/usr/lib",
);
PRODUCT_NAME = "lua-game-controller-test iOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto $(SRCROOT)/../cocos/base";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE2B018CDF6DA004CD58F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
1. remove mac 32bit 2. remove copy files for mac(because of mac use .a instead of dylib)
2014-07-31 15:46:16 +08:00
ARCHS = "$(ARCHS_STANDARD)";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist";
copy dylib to *.app bundle
2014-07-18 14:00:14 +08:00
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
name = Debug;
};
1A0EE2B118CDF6DA004CD58F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
1. remove mac 32bit 2. remove copy files for mac(because of mac use .a instead of dylib)
2014-07-31 15:46:16 +08:00
ARCHS = "$(ARCHS_STANDARD)";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist";
copy dylib to *.app bundle
2014-07-18 14:00:14 +08:00
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
VALIDATE_PRODUCT = YES;
};
name = Release;
};
1A0EE31218CDF733004CD58F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
1. remove mac 32bit 2. remove copy files for mac(because of mac use .a instead of dylib)
2014-07-31 15:46:16 +08:00
ARCHS = "$(ARCHS_STANDARD)";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.mac/Info.plist";
copy dylib to *.app bundle
2014-07-18 14:00:14 +08:00
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
OTHER_LDFLAGS = (
"-pagezero_size",
10000,
"-image_base",
100000000,
);
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
name = Debug;
};
1A0EE31318CDF733004CD58F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
1. remove mac 32bit 2. remove copy files for mac(because of mac use .a instead of dylib)
2014-07-31 15:46:16 +08:00
ARCHS = "$(ARCHS_STANDARD)";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.mac/Info.plist";
copy dylib to *.app bundle
2014-07-18 14:00:14 +08:00
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
OTHER_LDFLAGS = (
"-pagezero_size",
10000,
"-image_base",
100000000,
);
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
VALIDATE_PRODUCT = YES;
};
name = Release;
};
1A0EE41118CDF775004CD58F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
name = Debug;
};
1A0EE41218CDF775004CD58F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
VALIDATE_PRODUCT = YES;
};
name = Release;
};
1A0EE47C18CDF799004CD58F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../external/curl/prebuilt/ios",
);
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
name = Debug;
};
1A0EE47D18CDF799004CD58F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../external/curl/prebuilt/ios",
);
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
VALIDATE_PRODUCT = YES;
};
name = Release;
};
1ABCA2B318CD91520087CE3A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
1. remove mac 32bit 2. remove copy files for mac(because of mac use .a instead of dylib)
2014-07-31 15:46:16 +08:00
ARCHS = "$(ARCHS_STANDARD)";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/mac/Info.plist";
copy dylib to *.app bundle
2014-07-18 14:00:14 +08:00
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
OTHER_LDFLAGS = (
"-pagezero_size",
10000,
"-image_base",
100000000,
);
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
name = Debug;
};
1ABCA2B418CD91520087CE3A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
1. remove mac 32bit 2. remove copy files for mac(because of mac use .a instead of dylib)
2014-07-31 15:46:16 +08:00
ARCHS = "$(ARCHS_STANDARD)";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/mac/Info.plist";
copy dylib to *.app bundle
2014-07-18 14:00:14 +08:00
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
OTHER_LDFLAGS = (
"-pagezero_size",
10000,
"-image_base",
100000000,
);
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
VALIDATE_PRODUCT = YES;
};
name = Release;
};
1ABCA2F218CD93590087CE3A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
LIBRARY_SEARCH_PATHS = (
"$(SRCROOT)/../external/curl/prebuilt/ios",
"/Users/cocos2d/MyWork/cocos2d-x-develop/external/curl/prebuilt/ios",
);
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
name = Debug;
};
1ABCA2F318CD93590087CE3A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
LIBRARY_SEARCH_PATHS = (
"$(SRCROOT)/../external/curl/prebuilt/ios",
"/Users/cocos2d/MyWork/cocos2d-x-develop/external/curl/prebuilt/ios",
);
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
VALIDATE_PRODUCT = YES;
};
name = Release;
};
1D6058940D05DD3E006BFB54 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
1. remove mac 32bit 2. remove copy files for mac(because of mac use .a instead of dylib)
2014-07-31 15:46:16 +08:00
ARCHS = "$(ARCHS_STANDARD)";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist";
copy dylib to *.app bundle
2014-07-18 14:00:14 +08:00
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
name = Debug;
};
1D6058950D05DD3E006BFB54 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
1. remove mac 32bit 2. remove copy files for mac(because of mac use .a instead of dylib)
2014-07-31 15:46:16 +08:00
ARCHS = "$(ARCHS_STANDARD)";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_MAC,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist";
copy dylib to *.app bundle
2014-07-18 14:00:14 +08:00
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
VALIDATE_PRODUCT = YES;
};
name = Release;
};
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E61772F1960FAED00DE83F5 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
issue #4689: Refactoring game controller API[ios]
2014-07-04 21:24:32 +08:00
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
INFOPLIST_FILE = "$(SRCROOT)/../tests/game-controller-test/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
PRODUCT_NAME = "game-controller-test IOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
};
name = Debug;
};
3E6177301960FAED00DE83F5 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
issue #4689: Refactoring game controller API[ios]
2014-07-04 21:24:32 +08:00
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
INFOPLIST_FILE = "$(SRCROOT)/../tests/game-controller-test/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
PRODUCT_NAME = "game-controller-test IOS";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
A035ACBD1782469800987F6C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
HEADER_SEARCH_PATHS = "";
};
name = Debug;
};
A035ACBE1782469800987F6C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
HEADER_SEARCH_PATHS = "";
};
name = Release;
};
A07A517D1783A1CC0073F6A7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMPRESS_PNG_FILES = NO;
SDKROOT = iphoneos;
};
name = Debug;
};
A07A517E1783A1CC0073F6A7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMPRESS_PNG_FILES = NO;
SDKROOT = iphoneos;
};
name = Release;
};
A07A52271783A1D20073F6A7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
tests
2014-06-06 10:12:23 +08:00
DEBUG_INFORMATION_FORMAT = dwarf;
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../external/curl/prebuilt/ios",
);
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
};
name = Debug;
};
A07A52281783A1D20073F6A7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
tests
2014-06-06 10:12:23 +08:00
DEBUG_INFORMATION_FORMAT = dwarf;
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
CC_TARGET_OS_IPHONE,
);
INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../external/curl/prebuilt/ios",
);
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory
2014-05-17 05:36:00 +08:00
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios";
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
VALIDATE_PRODUCT = YES;
};
name = Release;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
COMPRESS_PNG_FILES = NO;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"COCOS2D_DEBUG=1",
USE_FILE32API,
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
Lua compiles and runs
2014-06-05 00:26:39 +08:00
MACOSX_DEPLOYMENT_TARGET = 10.7;
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk";
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
COMPRESS_PNG_FILES = NO;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_PREPROCESSOR_DEFINITIONS = (
NDEBUG,
USE_FILE32API,
"CC_ENABLE_CHIPMUNK_INTEGRATION=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
Lua compiles and runs
2014-06-05 00:26:39 +08:00
MACOSX_DEPLOYMENT_TARGET = 10.7;
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../extensions $(SRCROOT)/../external $(SRCROOT)/../external/chipmunk/include/chipmunk";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
15CBA060196EE56C005877BB /* Build configuration list for PBXNativeTarget "lua-game-controller-test iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
15CBA061196EE56C005877BB /* Debug */,
15CBA062196EE56C005877BB /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
1A0EE2AF18CDF6DA004CD58F /* Build configuration list for PBXNativeTarget "cpp-empty-test Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1A0EE2B018CDF6DA004CD58F /* Debug */,
1A0EE2B118CDF6DA004CD58F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
1A0EE31118CDF733004CD58F /* Build configuration list for PBXNativeTarget "lua-empty-test Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1A0EE31218CDF733004CD58F /* Debug */,
1A0EE31318CDF733004CD58F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
1A0EE41018CDF775004CD58F /* Build configuration list for PBXNativeTarget "cpp-empty-test iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1A0EE41118CDF775004CD58F /* Debug */,
1A0EE41218CDF775004CD58F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
1A0EE47B18CDF799004CD58F /* Build configuration list for PBXNativeTarget "lua-empty-test iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1A0EE47C18CDF799004CD58F /* Debug */,
1A0EE47D18CDF799004CD58F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
1ABCA2B218CD91520087CE3A /* Build configuration list for PBXNativeTarget "lua-tests Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1ABCA2B318CD91520087CE3A /* Debug */,
1ABCA2B418CD91520087CE3A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
1ABCA2F118CD93590087CE3A /* Build configuration list for PBXNativeTarget "lua-tests iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1ABCA2F218CD93590087CE3A /* Debug */,
1ABCA2F318CD93590087CE3A /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "cpp-tests Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
1D6058940D05DD3E006BFB54 /* Debug */,
1D6058950D05DD3E006BFB54 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
3E61772E1960FAED00DE83F5 /* Build configuration list for PBXNativeTarget "game-controller-test IOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
3E61772F1960FAED00DE83F5 /* Debug */,
3E6177301960FAED00DE83F5 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
issue #4674: Re-added deleted source files.
2014-05-04 14:37:55 +08:00
A035ACBC1782469800987F6C /* Build configuration list for PBXAggregateTarget "build all tests Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
A035ACBD1782469800987F6C /* Debug */,
A035ACBE1782469800987F6C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
A07A517C1783A1CC0073F6A7 /* Build configuration list for PBXAggregateTarget "build all tests iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
A07A517D1783A1CC0073F6A7 /* Debug */,
A07A517E1783A1CC0073F6A7 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
A07A52261783A1D20073F6A7 /* Build configuration list for PBXNativeTarget "cpp-tests iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
A07A52271783A1D20073F6A7 /* Debug */,
A07A52281783A1D20073F6A7 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "cocos2d_tests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C01FCF4F08A954540054247B /* Debug */,
C01FCF5008A954540054247B /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
/* End XCConfigurationList section */
};
rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
}